From 39a62c4b3d730fa515d6ce6b4f51e99de367381b Mon Sep 17 00:00:00 2001
From: VictorPS <victorpsilvano@gmail.com>
Date: Tue, 12 Oct 2021 06:09:55 +0100
Subject: [PATCH] Internationalize hardcoded text for videos pages (#14960)

* Translation for "on Video"

* Moving dashboard.loading to core.loading to keep code DRY

* Translations for views/videos/new.html.erb

* Reverting the changes on app/views/dashboards/_sublist.html.erb

* Adding the dashboard.loading translations back

* Fixing some merge conflicts + sorting the dashboard translations

* Fixing the contact text on views/videos/new

* Using the full path instead of the lazy load
---
 app/views/admin/articles/_individual_article.html.erb | 2 +-
 app/views/videos/index.html.erb                       | 4 ++--
 app/views/videos/new.html.erb                         | 6 ++----
 config/locales/en.yml                                 | 6 ++++++
 config/locales/fr.yml                                 | 6 ++++++
 cypress/support/commands.js                           | 1 -
 6 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/views/admin/articles/_individual_article.html.erb b/app/views/admin/articles/_individual_article.html.erb
index 2ac2b2d86..908df647d 100644
--- a/app/views/admin/articles/_individual_article.html.erb
+++ b/app/views/admin/articles/_individual_article.html.erb
@@ -25,7 +25,7 @@
       <a href="<%= article.path %>/edit" target="_blank" rel="noopener"><span class="btn btn-sm btn-primary">Edit</span></a>
 
       <a class="btn btn-sm btn-secondary" href="<%= admin_user_path(article.user_id) %>" target="_blank" rel="noopener">Manage User</a>
-      
+
       <% if decorated_article.pinned? %>
         <%= link_to(
               "Unpin Post",
diff --git a/app/views/videos/index.html.erb b/app/views/videos/index.html.erb
index 0ea3c5b6c..54664fb21 100644
--- a/app/views/videos/index.html.erb
+++ b/app/views/videos/index.html.erb
@@ -23,7 +23,7 @@
 
   <main id="main-content">
     <header class="video-page-title">
-      <h1><%= community_name %> on Video</h1>
+      <h1><%= t("core.on_video", name: community_name) %></h1>
     </header>
     <div class="video-collection" id="video-collection">
       <% @video_articles.each do |video_article| %>
@@ -38,7 +38,7 @@
     </div>
     <div class="subvideos"></div>
     <div class="loading-articles" id="loading-articles">
-      loading...
+      <%= t("core.loading") %>
     </div>
   </main>
 </div>
diff --git a/app/views/videos/new.html.erb b/app/views/videos/new.html.erb
index 166fb981e..f13a2a2f4 100644
--- a/app/views/videos/new.html.erb
+++ b/app/views/videos/new.html.erb
@@ -11,7 +11,7 @@
 </style>
 <center style="margin-top:200px">
   <%= stylesheet_link_tag "s3_direct_upload", media: "all" %>
-  <h1>🎥 Upload Video File 🙌</h1>
+  <h1><%= t("videos.new.title") %></h1>
   <%= s3_uploader_form callback_url: "/videos",
                        callback_method: "POST",
                        callback_param: "article[video]",
@@ -32,9 +32,7 @@
     </script>
   <% end %>
   <div style="margin:50px auto;max-width:80%;font-size:0.86em;">
-    <p>
-      <strong>Video is beta:</strong> <%= t("contact_prompts.if_any_questions_html") %>
-    </p>
+    <p><%= t("videos.new.beta_info_html") %> <%= t("contact_prompts.if_any_questions_html") %></p>
   </div>
 </center>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f6348b02b..ab7fa33ee 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -27,11 +27,13 @@ en:
     latest: Latest
     like: Like
     listings: Listings
+    loading: loading...
     location: Location
     log_in: Log in
     month: Month
     more_from: More from
     my_tags: My Tags
+    on_video: "%{name} on Video"
     popular_tags: Popular Tags
     post: Post
     posts: Posts
@@ -101,6 +103,10 @@ en:
       wrong_length:
         one: is the wrong length (should be 1 character)
         other: is the wrong length (should be %{count} characters)
+  videos:
+    new:
+      title: 🎥 Upload Video File 🙌
+      beta_info_html: <strong>Video is beta:</strong>
   podcasts:
     statuses:
       ssl_failed: SSL certificate verify failed while fetching podcast's feed_url
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index e60ae0f49..1d50664f2 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -27,11 +27,13 @@ fr:
     latest: Récent
     like: Aime
     listings: Annonces
+    loading: Chargement en cours...
     location: Lieu
     log_in: Se connecter
     month: Mois
     more_from: Plus de la part de
     my_tags: Mes sujets
+    on_video: "%{name} en Vidéo"
     popular_tags: Sujets populaires
     post: Publication
     posts: Publications
@@ -124,6 +126,10 @@ fr:
       wrong_length:
         one: est la mauvaise longueur (devrait être 1 caractère)
         other: est la mauvaise longueur (devrait être %{count} caractères)
+  videos:
+    new:
+      title: 🎥 Télécharger un fichier vidéo 🙌
+      beta_info_html: <strong>Vidéo est en bêta:</strong>
   podcasts:
     statuses:
       ssl_failed: Échec de la vérification du certificat SSL lors de la récupération de feed_url du podcast
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 3819c2e2e..f867ff828 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -117,7 +117,6 @@ Cypress.Commands.add('loginUser', ({ email, password }) => {
   });
 });
 
-
 /**
  * Logs in a creator with the given name, username, email, and password.
  *