From 2ccc577b79cd0b85371ba63ee89eda6ddf62fa0a Mon Sep 17 00:00:00 2001 From: yheuhtozr <84892012+yheuhtozr@users.noreply.github.com> Date: Wed, 19 Oct 2022 02:39:59 +0900 Subject: [PATCH] Fix recent missing or unsynchronized i18n (#18563) * add missing i18n * replace old keys * new badges UI update * comment sort options missing i18n * one fr key forgot to rename --- app/views/articles/_full_comment_area.html.erb | 14 +++++++------- app/views/badges/_badge_detail.html.erb | 2 +- .../modals/_unpublish_post_modal.html.erb | 7 +++---- config/locales/views/articles/en.yml | 10 ++++++++++ config/locales/views/articles/fr.yml | 10 ++++++++++ config/locales/views/main/en.yml | 2 +- config/locales/views/main/fr.yml | 2 +- config/locales/views/misc/en.yml | 3 +-- config/locales/views/misc/fr.yml | 3 +-- config/locales/views/moderations/en.yml | 3 +++ config/locales/views/moderations/fr.yml | 3 +++ config/locales/views/reactions/fr.yml | 2 +- config/locales/views/settings/fr.yml | 1 + 13 files changed, 43 insertions(+), 19 deletions(-) diff --git a/app/views/articles/_full_comment_area.html.erb b/app/views/articles/_full_comment_area.html.erb index 575cb215d..2283243cf 100644 --- a/app/views/articles/_full_comment_area.html.erb +++ b/app/views/articles/_full_comment_area.html.erb @@ -13,22 +13,22 @@ diff --git a/app/views/badges/_badge_detail.html.erb b/app/views/badges/_badge_detail.html.erb index 7e9714198..b32cc50c7 100644 --- a/app/views/badges/_badge_detail.html.erb +++ b/app/views/badges/_badge_detail.html.erb @@ -10,6 +10,6 @@

<%= badge.title %>

<%= badge.description %>

- + diff --git a/app/views/moderations/modals/_unpublish_post_modal.html.erb b/app/views/moderations/modals/_unpublish_post_modal.html.erb index 3e2f966c9..d0278c581 100644 --- a/app/views/moderations/modals/_unpublish_post_modal.html.erb +++ b/app/views/moderations/modals/_unpublish_post_modal.html.erb @@ -1,17 +1,16 @@ <% name = @article.cached_user_name %> diff --git a/config/locales/views/articles/en.yml b/config/locales/views/articles/en.yml index 8fdabf04e..ef7825d54 100644 --- a/config/locales/views/articles/en.yml +++ b/config/locales/views/articles/en.yml @@ -8,6 +8,16 @@ en: aria_label: Article actions comments: aria_label: Add a comment to post - %{title} + sort: + heading: "Sort discussion: " + title: + top: Top + latest: Latest + oldest: Oldest + desc: + top: Most upvoted and relevant comments will be first + latest: Most recent comments will be first + oldest: The oldest comments will be first sort_button: aria_label: Sort comments subtitle: diff --git a/config/locales/views/articles/fr.yml b/config/locales/views/articles/fr.yml index c4b26660f..08d02c377 100644 --- a/config/locales/views/articles/fr.yml +++ b/config/locales/views/articles/fr.yml @@ -8,6 +8,16 @@ fr: aria_label: Article actions comments: aria_label: Add a comment to post - %{title} + sort: + heading: "Sort discussion: " + title: + top: Top + latest: Latest + oldest: Oldest + desc: + top: Most upvoted and relevant comments will be first + latest: Most recent comments will be first + oldest: The oldest comments will be first sort_button: aria_label: Sort comments subtitle: diff --git a/config/locales/views/main/en.yml b/config/locales/views/main/en.yml index d79c3780e..9241b26cd 100644 --- a/config/locales/views/main/en.yml +++ b/config/locales/views/main/en.yml @@ -35,6 +35,7 @@ en: Code of Conduct: Code of Conduct Contact: Contact FAQ: FAQ + Home: Home Listings: Listings Podcasts: Podcasts Privacy Policy: Privacy Policy @@ -65,6 +66,5 @@ en: powered: text_html: Made with love and %{rails}. %{community} © %{copyright}. rails: Ruby on Rails - home: Home create_post: Create Post signout: Sign Out diff --git a/config/locales/views/main/fr.yml b/config/locales/views/main/fr.yml index 61776336f..d5c24245a 100644 --- a/config/locales/views/main/fr.yml +++ b/config/locales/views/main/fr.yml @@ -35,6 +35,7 @@ fr: Code of Conduct: Code of Conduct Contact: Contact FAQ: FAQ + Home: Page D'Accueil Listings: Listings Podcasts: Podcasts Privacy Policy: Privacy Policy @@ -65,6 +66,5 @@ fr: powered: text_html: Made with love and %{rails}. %{community} © %{copyright}. rails: Ruby on Rails - home: Page D'Accueil create_post: Créer une publication signout: Se déconnecter diff --git a/config/locales/views/misc/en.yml b/config/locales/views/misc/en.yml index 061812cb1..3e3f742d6 100644 --- a/config/locales/views/misc/en.yml +++ b/config/locales/views/misc/en.yml @@ -4,13 +4,12 @@ en: badges: meta: title: Badges - name: "%{title} Badge" all: one: Show one badge other: Show all %{count} badges heading: Badges desc: Receive badges for being awesome! Click on a badge to see how you can earn it. - name: "🏅 %{title} Badge 🏅" + gotit: Got it campaign: subtitle: Stories (%{count}) view: See all posts diff --git a/config/locales/views/misc/fr.yml b/config/locales/views/misc/fr.yml index 0bb01d98e..f828179ee 100644 --- a/config/locales/views/misc/fr.yml +++ b/config/locales/views/misc/fr.yml @@ -4,13 +4,12 @@ fr: badges: meta: title: Badges - name: "%{title} Badge" all: one: Show one badge other: Show all %{count} badges heading: Badges desc: Receive badges for being awesome! Click on a badge to see how you can earn it. - name: "🏅 %{title} Badge 🏅" + gotit: Got it campaign: subtitle: Stories (%{count}) view: See all posts diff --git a/config/locales/views/moderations/en.yml b/config/locales/views/moderations/en.yml index e96b02ac7..b6218fa37 100644 --- a/config/locales/views/moderations/en.yml +++ b/config/locales/views/moderations/en.yml @@ -114,6 +114,9 @@ en: modal_text1: Once unpublished, all posts by %{username} will become hidden and only accessible to themselves. modal_text2: If %{username} is not suspended, they can still re-publish their posts from their dashboard. modal_button: Unpublish all posts + unpublish_post: + modal_text1: Once unpublished, this post will become invisible to the public and only accessible to %{username}. + modal_text2: They can still re-publish the post if they are not suspended. vote_down: Low Quality flag_to_admins: Flag to Admins vote_up: High Quality diff --git a/config/locales/views/moderations/fr.yml b/config/locales/views/moderations/fr.yml index c192f9009..7e0e552fc 100644 --- a/config/locales/views/moderations/fr.yml +++ b/config/locales/views/moderations/fr.yml @@ -113,6 +113,9 @@ fr: modal_text1: Once unpublished, all posts by %{username} will become hidden and only accessible to themselves. modal_text2: If %{username} is not suspended, they can still re-publish their posts from their dashboard. modal_button: Unpublish all posts + unpublish_post: + modal_text1: Once unpublished, this post will become invisible to the public and only accessible to %{username}. + modal_text2: They can still re-publish the post if they are not suspended. vote_down: Low Quality flag_to_admins: Flag to Admins vote_up: High Quality diff --git a/config/locales/views/reactions/fr.yml b/config/locales/views/reactions/fr.yml index b1f8de335..4a4ca6800 100644 --- a/config/locales/views/reactions/fr.yml +++ b/config/locales/views/reactions/fr.yml @@ -17,7 +17,7 @@ fr: other: "%{count}%{start}\_réactions%{end}" title: Reactions like: - title: Coeur + title: Like aria_label: Like icon: Favorite heart button text: Like diff --git a/config/locales/views/settings/fr.yml b/config/locales/views/settings/fr.yml index 0feb6d200..f809e934c 100644 --- a/config/locales/views/settings/fr.yml +++ b/config/locales/views/settings/fr.yml @@ -130,6 +130,7 @@ fr: remove: Remove save: Save template saved: Saved templates + trusted: Trusted user templates github: heading: GitHub desc1: Pin your GitHub repositories to your profile.