From 3acd4e9deb932215403f0060f42ab965580eefac Mon Sep 17 00:00:00 2001
From: yheuhtozr <84892012+yheuhtozr@users.noreply.github.com>
Date: Fri, 31 Dec 2021 00:12:40 +0900
Subject: [PATCH] delete and add back i18n keys (#15905)

---
 app/views/articles/show.html.erb     | 5 ++++-
 app/views/users/_profile.html.erb    | 2 +-
 config/locales/views/actions/en.yml  | 1 -
 config/locales/views/actions/fr.yml  | 1 -
 config/locales/views/listings/en.yml | 3 ---
 config/locales/views/listings/fr.yml | 3 ---
 config/locales/views/main/en.yml     | 5 -----
 config/locales/views/main/fr.yml     | 5 -----
 config/locales/views/misc/en.yml     | 4 ----
 config/locales/views/misc/fr.yml     | 4 ----
 config/locales/views/tags/en.yml     | 1 -
 config/locales/views/tags/fr.yml     | 1 -
 12 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/app/views/articles/show.html.erb b/app/views/articles/show.html.erb
index 053c6d36e..a6bcc5ac2 100644
--- a/app/views/articles/show.html.erb
+++ b/app/views/articles/show.html.erb
@@ -114,7 +114,10 @@
                 <div class="pl-3 flex-1">
                   <a href="/<%= @user.username %>" class="crayons-link fw-bold"><%= @user.name %></a>
                   <% if @organization %>
-                    <span class="color-base-60">for</span> <a href="<%= @organization.path %>" class="crayons-link"><%= @organization.name %></a>
+                    <%= t("views.articles.for_org_html",
+                          start: tag("span", { class: "color-base-60" }, true),
+                          end: "</span>".html_safe,
+                          org: tag.a(@organization.name, href: @organization.path, class: "crayons-link")) %>
                   <% end %>
                   <p class="fs-xs color-base-60">
                     <% if @article.published_timestamp.present? %>
diff --git a/app/views/users/_profile.html.erb b/app/views/users/_profile.html.erb
index 1bec0a1e0..7150f795b 100644
--- a/app/views/users/_profile.html.erb
+++ b/app/views/users/_profile.html.erb
@@ -157,7 +157,7 @@
 
   <% users_setting = @user.setting %>
   <div class="crayons-card crayons-card--content-rows">
-    <h2>Branding</h2>
+    <h2><%= t("views.settings.group.Branding") %></h2>
     <div class="crayons-field ">
       <label class="crayons-field__label" for="users_setting[brand_color1]">
         <%= t("views.logo.color_1.label") %>
diff --git a/config/locales/views/actions/en.yml b/config/locales/views/actions/en.yml
index 1978e4953..2227dc7bd 100644
--- a/config/locales/views/actions/en.yml
+++ b/config/locales/views/actions/en.yml
@@ -4,7 +4,6 @@ en:
     actions:
       copy:
         text: Copied to Clipboard
-        title: Copy article link to the clipboard
         button: Copy link
       more:
         title: More...
diff --git a/config/locales/views/actions/fr.yml b/config/locales/views/actions/fr.yml
index eb8fda65c..f10e42e89 100644
--- a/config/locales/views/actions/fr.yml
+++ b/config/locales/views/actions/fr.yml
@@ -4,7 +4,6 @@ fr:
     actions:
       copy:
         text: Copied to Clipboard
-        title: Copy article link to the clipboard
         button: Copier le lien
       more:
         title: More...
diff --git a/config/locales/views/listings/en.yml b/config/locales/views/listings/en.yml
index e2c42b184..debd03171 100644
--- a/config/locales/views/listings/en.yml
+++ b/config/locales/views/listings/en.yml
@@ -44,9 +44,6 @@ en:
           label: Category
           placeholder: Conference CFP (1 Credit)
           summary: Category details/rules
-        connect:
-          subtitle: Connect messaging
-          description: Allow Users to message me via Connect.
         expiry:
           description: If applicable for time sensitive events, deadlines, etc.
         location:
diff --git a/config/locales/views/listings/fr.yml b/config/locales/views/listings/fr.yml
index 98f8c5e97..415508dce 100644
--- a/config/locales/views/listings/fr.yml
+++ b/config/locales/views/listings/fr.yml
@@ -44,9 +44,6 @@ fr:
           label: Category
           placeholder: Conference CFP (1 Credit)
           summary: Category details/rules
-        connect:
-          subtitle: Connect messaging
-          description: Allow Users to message me via Connect.
         expiry:
           description: If applicable for time sensitive events, deadlines, etc.
         location:
diff --git a/config/locales/views/main/en.yml b/config/locales/views/main/en.yml
index abb091777..cbe7bd9a4 100644
--- a/config/locales/views/main/en.yml
+++ b/config/locales/views/main/en.yml
@@ -5,9 +5,6 @@ en:
       aria_home: "%{community} Home"
       header:
         create_account: Create account
-        connect:
-          aria_label: Connect
-          icon: Connect
         login: Log in
         nav:
           aria_label: Navigation menu
@@ -25,7 +22,6 @@ en:
         login:
           aria_label: Log in
           text: Log in
-        footer: We strive for transparency and don't collect excess data.
       nav:
         admin: Admin
         dashboard: Dashboard
@@ -60,7 +56,6 @@ en:
         my_tags: My Tags
         popular_tags: Popular Tags
       footer:
-        aria_label: Site information
         built:
           text_html: Built on %{forem} — the %{opensource} software that powers %{dev} and other inclusive communities.
           forem: Forem
diff --git a/config/locales/views/main/fr.yml b/config/locales/views/main/fr.yml
index 1aadcfd66..5a740d9f4 100644
--- a/config/locales/views/main/fr.yml
+++ b/config/locales/views/main/fr.yml
@@ -5,9 +5,6 @@ fr:
       aria_home: "%{community} Home"
       header:
         create_account: Créer un profil
-        connect:
-          aria_label: Connect
-          icon: Connect
         login: Se connecter
         nav:
           aria_label: Navigation menu
@@ -25,7 +22,6 @@ fr:
         login:
           aria_label: Log in
           text: Se connecter
-        footer: We strive for transparency and don't collect excess data.
       nav:
         admin: Admin
         dashboard: Tableau de bord
@@ -60,7 +56,6 @@ fr:
         my_tags: Mes sujets
         popular_tags: Sujets populaires
       footer:
-        aria_label: Site information
         built:
           text_html: Built on %{forem} — the %{opensource} software that powers %{dev} and other inclusive communities.
           forem: Forem
diff --git a/config/locales/views/misc/en.yml b/config/locales/views/misc/en.yml
index 49916d8e7..80fd9c2ec 100644
--- a/config/locales/views/misc/en.yml
+++ b/config/locales/views/misc/en.yml
@@ -33,9 +33,6 @@ en:
         signin: sign-in
     hamburger:
       icon: Navigation menu
-      back: Back
-      forward: Forward
-      refresh: Refresh
       icon_close: Close
       icon_left: Left menu
       icon_right: Right menu
@@ -107,7 +104,6 @@ en:
         back: Back to %{user}'s Series
         empty: This series doesn't have any articles
     sponsor:
-      icon: Love
       seek: Become a sponsor
     stats:
       meta:
diff --git a/config/locales/views/misc/fr.yml b/config/locales/views/misc/fr.yml
index db6b80f21..73c729621 100644
--- a/config/locales/views/misc/fr.yml
+++ b/config/locales/views/misc/fr.yml
@@ -33,9 +33,6 @@ fr:
         signin: sign-in
     hamburger:
       icon: Navigation menu
-      back: Back
-      forward: Forward
-      refresh: Refresh
       icon_close: Close
       icon_left: Left menu
       icon_right: Right menu
@@ -107,7 +104,6 @@ fr:
         back: Back to %{user}'s Series
         empty: This series doesn't have any articles
     sponsor:
-      icon: Love
       seek: Become a sponsor
     stats:
       meta:
diff --git a/config/locales/views/tags/en.yml b/config/locales/views/tags/en.yml
index 23adbfd54..0b50117ce 100644
--- a/config/locales/views/tags/en.yml
+++ b/config/locales/views/tags/en.yml
@@ -11,7 +11,6 @@ en:
       edit:
         meta:
           title: Edit %{tag}
-        heading_html: " Editing: %{tag}"
         admin: "Admin"
         help: "Help"
         view: "View"
diff --git a/config/locales/views/tags/fr.yml b/config/locales/views/tags/fr.yml
index e7c9975e3..a1d404ce4 100644
--- a/config/locales/views/tags/fr.yml
+++ b/config/locales/views/tags/fr.yml
@@ -11,7 +11,6 @@ fr:
       edit:
         meta:
           title: Edit %{tag}
-        heading_html: " Editing: %{tag}"
         admin: "Admin"
         help: "Help"
         view: "View"