maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resync and restore i18n keys (#19899)

Browse source
This commit is contained in:
yheuhtozr 2023-08-19 01:48:12 +09:00 • committed by GitHub
parent 738c33b7ed
commit c95636ce09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 14 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/views/mailers/notify_mailer/account_deleted_email.html.erb
View file

@ -7,8 +7,7 @@
</p>
<p>
Contact us at <a href="mailto:<%= ForemInstance.contact_email %>"><%= ForemInstance.contact_email %></a>
if there is anything more we can help with.
<%= t("views.mailers.contact_mailto_html", contact_email: ForemInstance.contact_email) %>
</p>
<p>

2
app/views/mailers/notify_mailer/account_deleted_email.text.erb
View file

@ -1,6 +1,6 @@
Hi <%= @name %>, your account has been successfully deleted.
Contact us at <%= ForemInstance.contact_email %> if there is anything more we can help with.
<%= strip_tags t("views.mailers.contact_mailto_html", contact_email: ForemInstance.contact_email) %>
Thanks,
The <%= community_name %> Team

3
app/views/mailers/notify_mailer/account_deletion_requested_email.html.erb
View file

@ -8,8 +8,7 @@
</p>
<p>
Contact us at <a href="mailto:<%= ForemInstance.contact_email %>"><%= ForemInstance.contact_email %></a>
if there is anything more we can help with.
<%= t("views.mailers.contact_mailto_html", contact_email: ForemInstance.contact_email) %>
</p>
<p>

2
app/views/mailers/notify_mailer/account_deletion_requested_email.text.erb
View file

@ -1,7 +1,7 @@
Hi <%= @name %>,
Your account deletion was requested. Please, visit this page: <%= user_confirm_destroy_url(@token) %> to destroy your account. The link will expire in 12 hours.
Contact us at <%= ForemInstance.contact_email %> if there is anything more we can help with.
<%= strip_tags t("views.mailers.contact_mailto_html", contact_email: ForemInstance.contact_email) %>
Thanks,
The <%= community_name %> Team

3
app/views/mailers/notify_mailer/organization_deleted_email.html.erb
View file

@ -7,8 +7,7 @@
</p>
<p>
Contact us at <a href="mailto:<%= ForemInstance.contact_email %>"><%= ForemInstance.contact_email %></a>
if there is anything more we can help with.
<%= t("views.mailers.contact_mailto_html", contact_email: ForemInstance.contact_email) %>
</p>
<p>

2
app/views/mailers/notify_mailer/organization_deleted_email.text.erb
View file

@ -2,7 +2,7 @@ Hi <%= @name %>.
Your organization <%= @org_name %> on <%= community_name %> has been successfully deleted.
Contact us at <%= ForemInstance.contact_email %> if there is anything more we can help with.
<%= strip_tags t("views.mailers.contact_mailto_html", contact_email: ForemInstance.contact_email) %>
Thanks,
The <%= community_name %> Team

1
config/locales/en.yml
View file

@ -204,4 +204,3 @@ en:
short_with_yy: "%b %-d '%y"
short_with_year: "%b %-e, %Y"
stackexchange: "%b %e '%y"
tweet: "%H:%M %p - %d %b %Y"

1
config/locales/fr.yml
View file

@ -227,4 +227,3 @@ fr:
short_with_yy: "%-e %b '%y"
short_with_year: "%-e %b, %Y"
stackexchange: "%b %e '%y"
tweet: "%H:%M %p - %d %b %Y"

7
config/locales/lib/en.yml
View file

@ -139,14 +139,10 @@ en:
description: User ID of the Mascot account
meta_keywords:
description: 'List of valid keywords: comma separated, letters only e.g. engineering, development'
onboarding:
description: Background for onboarding splash page
payment:
description: 'Used for site-wide web monetization. See: https://github.com/forem/forem/pull/6345'
periodic:
description: Determines how often periodic email digests are sent (in days)
prefer_manual:
description: Always show suggested users as suggested people to follow even when auto-suggestion is available
sidebar:
description: Determines which tags are shown on the homepage right-hand sidebar
placeholder: List of valid, comma-separated tags e.g. help,discuss,explainlikeimfive,meta
@ -157,9 +153,6 @@ en:
tags:
description: Determines which tags are suggested to new users during onboarding (comma separated, letters only)
placeholder: 'List of valid tags: comma separated, letters only e.g. beginners,javascript,ruby,swift,kotlin'
users:
description: Determines which users are suggested to follow to new users during onboarding (comma separated, letters only). Please note that these users will be shown as a fallback if no recently-active commenters or producers can be suggested
placeholder: 'List of valid usernames: comma separated, letters only e.g. ben,jess,peter,maestromac,andy,liana'
video:
description: Secret key used to allow AWS video encoding through the VideoStatesController
rate_limit:

7
config/locales/lib/fr.yml
View file

@ -139,14 +139,10 @@ fr:
description: User ID of the Mascot account
meta_keywords:
description: 'List of valid keywords: comma separated, letters only e.g. engineering, development'
onboarding:
description: Background for onboarding splash page
payment:
description: 'Used for site-wide web monetization. See: https://github.com/forem/forem/pull/6345'
periodic:
description: Determines how often periodic email digests are sent (in days)
prefer_manual:
description: Always show suggested users as suggested people to follow even when auto-suggestion is available
sidebar:
description: Determines which tags are shown on the homepage right-hand sidebar
placeholder: List of valid, comma-separated tags e.g. help,discuss,explainlikeimfive,meta
@ -157,9 +153,6 @@ fr:
tags:
description: Determines which tags are suggested to new users during onboarding (comma separated, letters only)
placeholder: 'List of valid tags: comma separated, letters only e.g. beginners,javascript,ruby,swift,kotlin'
users:
description: Determines which users are suggested to follow to new users during onboarding (comma separated, letters only). Please note that these users will be shown as a fallback if no recently-active commenters or producers can be suggested
placeholder: 'List of valid usernames: comma separated, letters only e.g. ben,jess,peter,maestromac,andy,liana'
video:
description: Secret key used to allow AWS video encoding through the VideoStatesController
rate_limit:

2
config/locales/mailers/en.yml
View file

@ -16,7 +16,7 @@ en:
account_deleted: "%{community} - Account Deletion Confirmation"
deletion_requested: "%{community} - Account Deletion Requested"
trusted: Congrats! You're now a "trusted" user on %{community}!
moderator: 'Congrats! You''re now a moderator for #%{tag_name}'
moderator: "Congrats! You're now a moderator for #%{tag_name}"
new_follower: just followed you on %{community}
new_mention: "%{name} just mentioned you in their %{type}"
org_deleted: "%{community} - Organization Deletion Confirmation"

2
config/locales/mailers/fr.yml
View file

@ -16,7 +16,7 @@ fr:
account_deleted: "%{community} - Confirmation de la suppression du compte"
deletion_requested: "%{community} - Suppression du compte demandée"
trusted: Félicitations ! Vous êtes maintenant un utilisateur "de confiance" sur %{community} !
moderator: 'Félicitations ! Vous êtes le modérateur de #%{tag_name}'
moderator: "Congrats! You're now a moderator for #%{tag_name}"
new_follower: vous suit sur %{community}
new_mention: "%{name} vient de vous mentionner sur %{type}"
org_deleted: "%{community} - Confirmation de la suppression de l'organisation"

4
config/locales/models/en.yml
View file

@ -82,8 +82,6 @@ en:
reserved_word: '%<value>s is a reserved word. Contact site admins for help registering your organization.'
page:
body_must_exist: must exist if body_html or body_json doesn't exist.
podcast:
slug_is_reserved: slug is reserved
podcast_episode_appearance:
provided_role_is_not_valid: provided role is not valid
poll_skip:
@ -128,9 +126,7 @@ en:
could_not_send: confirmation could not be sent. %{e_message}
password_not_matched: doesn't match password confirmation
has_been_banished: has been banished.
is_taken: '%{username} is taken.'
user_could_not_be_saved: User could not be saved. %{e_message}
username_is_reserved: username is reserved
user_block:
cant_be_the_same: can't be the same as the blocked_id
user_subscription:

4
config/locales/models/fr.yml
View file

@ -81,8 +81,6 @@ fr:
reserved_word: "%<value>s est un mot réservé. Contactez l'administrateur du site pour obtenir de l'aide pour enregistrer votre organisation."
page:
body_must_exist: doit exister si body_html ou body_json n'existe pas.
podcast:
slug_is_reserved: le slug est réservé.
podcast_episode_appearance:
provided_role_is_not_valid: le rôle fourni n'est pas valide.
poll_skip:
@ -127,9 +125,7 @@ fr:
could_not_send: la confirmation n'a pas pu être envoyée. %{e_message}
password_not_matched: ne correspond pas à la confirmation du mot de passe.
has_been_banished : a été banni.
is_taken: '%{username} est pris.'
user_could_not_be_saved: L'utilisateur n'a pas pu être enregistré. %{e_message}
username_is_reserved: Le nom d'utilisateur est réservé.
user_block:
cant_be_the_same: ne peut pas être le même que le blocked_id
user_subscription:

4
config/locales/validators/fr.yml
View file

@ -13,7 +13,7 @@ fr:
bio_too_long: La biographie est trop longue
cross_model_slug_validator:
is_taken: est déjà pris
is_invalid: is invalid
is_reserved: is reserved
is_invalid: est invalide
is_reserved: est réservé
valid_domain_csv_validator:
invalid_list_format: doit être une liste de domaines valides, séparés par des virgules.

2
config/locales/views/misc/en.yml
View file

@ -46,6 +46,8 @@ en:
preview:
icon: App logo
text: 'Preview:'
mailers:
contact_mailto_html: Contact us at <a href="mailto:%{contact_email}">%{contact_email}</a> if there is anything more we can help with.
onboardings:
meta:
title: Welcome to %{community}

2
config/locales/views/misc/fr.yml
View file

@ -46,6 +46,8 @@ fr:
preview:
icon: App logo
text: 'Preview:'
mailers:
contact_mailto_html: Contactez-nous à l'adresse <a href="mailto:%{contact_email}">%{contact_email}</a> si nous pouvons vous aider davantage.
onboardings:
meta:
title: Welcome to %{community}