clean up views i18n entries (forem#15731)

* clean up views i18n entries * Update edit.html.erb * Update edit.html.erb
hiramatu · Dec 14, 2021 · 65fe824 · 65fe824
1 parent 2f48cd0
commit 65fe824
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 81 deletions.
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
@@ -23,7 +23,7 @@
   <div class="crayons-layout crayons-layout--header-inside crayons-layout--2-cols crayons-layout--limited-l">
     <div class="crayons-page-header">
       <% if @tab == "organization" && @organizations.present? %>
-        <h1 class="crayons-title">Settings for
+        <h1 class="crayons-title">
             <% options = @organizations.pluck(:slug, :id).each do |arr| %>
               <% arr[0] = "@#{arr[0]}" %>
               <% arr[1] = "/settings/organization/#{arr[1]}" %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -8,39 +8,16 @@ en:
     add_comment: Add comment
     beta: beta
     comment: Comment
-    comments: Comments
-    community_name_is_great: "%{community_name} is great!"
     copy_link: Copy link
-    create_account: Create account
-    dashboard: Dashboard
     edit_profile: Edit profile
     follow: Follow
     follow_back: Follow back
-    follower: Follower
     following: Following
-    joined: Joined
-    joined_on: Joined on
     like: Like
-    listings: Listings
     loading: loading...
-    location: Location
-    log_in: Log in
-    more_from: More from
-    pinned: Pinned
-    post: Post
     reaction: Reaction
-    reaction_pluralized:
-      one: reaction
-      other: reactions
-    reactions:
-      heart: Heart
-      save: Save
-      unicorn: Unicorn
-    reply: Reply
     report_abuse: Report abuse
     search: Search
-    settings: Settings
-    trending_on: Trending on
   datetime:
     distance_in_words_ago: # https://github.com/openstreetmap/openstreetmap-website/issues/2255
       about_x_hours:

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -8,39 +8,16 @@ fr:
     add_comment: Ajouter un commentaire
     beta: bêta
     comment: Commentaire
-    comments: Commentaires
-    community_name_is_great: "%{community_name} est super"
     copy_link: Copier le lien
-    create_account: Créer un profil
-    dashboard: Tableau de bord
     edit_profile: Editer le profil
     follow: Suivre
     follow_back: Suivre aussi
-    follower: Suiveur
     following: Abonné
-    joined: Rejoint
-    joined_on: Rejoint le
     like: Aime
-    listings: Annonces
     loading: Chargement en cours...
-    location: Lieu
-    log_in: Se connecter
-    more_from: Plus de la part de
-    pinned: Épinglé
-    post: Publication
     reaction: Réaction
-    reaction_pluralized:
-      one: réaction
-      other: réactions
-    reactions:
-      heart: Coeur
-      save: Sauver
-      unicorn: Licorne
-    reply: Répondre
     report_abuse: Signaler un abus
     search: Recherche
-    settings: Paramètres
-    trending_on: Populaire sur
   date:
     abbr_month_names:
     - 

diff --git a/config/locales/views/main/fr.yml b/config/locales/views/main/fr.yml
@@ -33,7 +33,7 @@ fr:
         list: Liste de lecture
         moderator_center: Centre de modération
         other: Other
-        settings: Settings
+        settings: Paramètres
       nav_name:
         About: About
         Code of Conduct: Code of Conduct

diff --git a/config/locales/views/settings/en.yml b/config/locales/views/settings/en.yml
@@ -31,7 +31,7 @@ en:
             Delete your profile, along with your authentication associations.
 
             This does not include applications permissions. You will have to remove them yourself:
-          desc1b: Delete any and all content you have, such as articles, comments, your reading list or chat messages.
+          desc1b: Delete any and all content you have, such as articles, comments, or your reading list.
           desc1c: Allow your username to become available to anyone.
           desc2_html: Please, %{provide} to fully delete your account.
           provide: provide an email
@@ -96,7 +96,7 @@ en:
         heading: Destroy your account
         desc: 'Deleting your account will:'
         desc_1_html: delete your profile, along with your Twitter and/or GitHub associations. This does not include app permissions. You will have to remove them yourself on %{twitter} and %{github}.
-        desc_2: delete any and all content you have, such as articles, comments, your reading list or chat messages.
+        desc_2: delete any and all content you have, such as articles, comments, or your reading list.
         desc_3: allow your username to become available to anyone.
         click: click here
         confirm_html: 'For confirmation, type the words: <code>%{word}</code>'
@@ -129,22 +129,14 @@ en:
           remove: Remove
           save: Save template
           saved: Saved templates
-        connect: Connect settings
         generate: Generate a personal blog from your %{community} posts
         github:
           heading: GitHub
           desc1: Pin your GitHub repositories to your profile.
           desc2: Repositories will be disappear from your profile if you remove the OAuth association with GitHub.
-        guidelines:
-          label: Open inbox guidelines/instructions
-          placeholder: Please allow a few days for a response.
         learn: Learn more
         micro: 'Receive micropayments for time spent reading your posts directly. '
         payment: Payment Pointer
-        privacy: Open your inbox to messages from people you don't follow or keep your inbox private to mutual follows.
-        open: Open
-        optional: Optional
-        private: Private
         rss:
           heading: Publishing to %{community} from RSS
           desc1_html: Posts will land in your %{dashboard} <strong>as drafts</strong>, and then you can publish from there.
@@ -161,7 +153,6 @@ en:
           referential_html: Replace self-referential links with %{community}-specific links <p class='crayons-field__description'>If you check this box, the post will automatically change any URLs included in the post to refer to the version of that article on %{community} if available. This is primarily meant for folks migrating their entire blog onto %{community}.</p>
           save: Save Feed Settings
           submit: Submit Feed Settings
-        save_connect: Save Connect Settings
         save_web: Save Web Monetization Settings
         web: Web monetization
       finalize_html: You have requested a change to %{email}. Check your inbox for the verification link to finalize the change.

diff --git a/config/locales/views/settings/fr.yml b/config/locales/views/settings/fr.yml
@@ -31,7 +31,7 @@ fr:
             Delete your profile, along with your authentication associations.
 
             This does not include applications permissions. You will have to remove them yourself:
-          desc1b: Delete any and all content you have, such as articles, comments, your reading list or chat messages.
+          desc1b: Delete any and all content you have, such as articles, comments, or your reading list.
           desc1c: Allow your username to become available to anyone.
           desc2_html: Please, %{provide} to fully delete your account.
           provide: provide an email
@@ -96,7 +96,7 @@ fr:
         heading: Destroy your account
         desc: 'Deleting your account will:'
         desc_1_html: delete your profile, along with your Twitter and/or GitHub associations. This does not include app permissions. You will have to remove them yourself on %{twitter} and %{github}.
-        desc_2: delete any and all content you have, such as articles, comments, your reading list or chat messages.
+        desc_2: delete any and all content you have, such as articles, comments, or your reading list.
         desc_3: allow your username to become available to anyone.
         click: click here
         confirm_html: 'For confirmation, type the words: <code>%{word}</code>'
@@ -129,22 +129,14 @@ fr:
           remove: Remove
           save: Save template
           saved: Saved templates
-        connect: Connect settings
         generate: Generate a personal blog from your %{community} posts
         github:
           heading: GitHub
           desc1: Pin your GitHub repositories to your profile.
           desc2: Repositories will be disappear from your profile if you remove the OAuth association with GitHub.
-        guidelines:
-          label: Open inbox guidelines/instructions
-          placeholder: Please allow a few days for a response.
         learn: Learn more
         micro: 'Receive micropayments for time spent reading your posts directly. '
         payment: Payment Pointer
-        privacy: Open your inbox to messages from people you don't follow or keep your inbox private to mutual follows.
-        open: Open
-        optional: Optional
-        private: Private
         rss:
           heading: Publishing to %{community} from RSS
           desc1_html: Posts will land in your %{dashboard} <strong>as drafts</strong>, and then you can publish from there.
@@ -161,7 +153,6 @@ fr:
           referential_html: Replace self-referential links with %{community}-specific links <p class='crayons-field__description'>If you check this box, the post will automatically change any URLs included in the post to refer to the version of that article on %{community} if available. This is primarily meant for folks migrating their entire blog onto %{community}.</p>
           save: Save Feed Settings
           submit: Submit Feed Settings
-        save_connect: Save Connect Settings
         save_web: Save Web Monetization Settings
         web: Web monetization
       finalize_html: You have requested a change to %{email}. Check your inbox for the verification link to finalize the change.

diff --git a/config/locales/views/users/en.yml b/config/locales/views/users/en.yml
@@ -68,16 +68,12 @@ en:
         heading: Are you sure you want to sign out?
         'yes': Yes, sign out
       block: Block @%{user}
-      chat: Chat
-      chat_with: Chat with %{user}
-      close: Close modal
       details: "%{user} profile details"
       dropdown: User actions
       email_icon: Email address
       empty: 404 bio not found
       flag: Flag @%{user}
       follow: Follow
-      guidelines: "%{user}'s guidelines:"
       joined:
         icon: Joined
         text_html: "Joined on\_%{date}"

diff --git a/config/locales/views/users/fr.yml b/config/locales/views/users/fr.yml
@@ -68,16 +68,12 @@ fr:
         heading: Are you sure you want to sign out?
         'yes': Yes, sign out
       block: Block @%{user}
-      chat: Chat
-      chat_with: Chat with %{user}
-      close: Close modal
       details: "%{user} profile details"
       dropdown: User actions
       email_icon: Email address
       empty: 404 bio not found
       flag: Flag @%{user}
       follow: Suivre
-      guidelines: "%{user}'s guidelines:"
       joined:
         icon: Rejoint
         text_html: "Rejoint le\_%{date}"

diff --git a/spec/system/homepage/user_visits_homepage_spec.rb b/spec/system/homepage/user_visits_homepage_spec.rb
@@ -9,9 +9,9 @@
     it "shows the sign-in block" do
       visit "/"
       within "#sidebar-wrapper-left" do
-        p I18n.t("create_account")
-        expect(page).to have_text(I18n.t("core.log_in"))
-        expect(page).to have_text(I18n.t("core.create_account"))
+        p I18n.t("views.main.header.create_account")
+        expect(page).to have_text(I18n.t("views.main.header.login"))
+        expect(page).to have_text(I18n.t("views.main.header.create_account"))
       end
     end