From 38ef49a2f250fd6ca30b4b3998edf88682895a71 Mon Sep 17 00:00:00 2001 From: Jeremy Friesen Date: Wed, 23 Mar 2022 11:34:33 -0400 Subject: [PATCH] Adjusting article copy to be more general (#16973) * Adjusting article copy to be more general Our language regarding articles needs minor revisions to speak a bit more generally about content. This follows on the features of AuthN/AuthZ work to allow forem admins to configure their forems such that a subset of their forem members may not have the ability to create articles. Closes forem/forem#16890 Closes forem/forem#16891 * Update app/views/users/_notifications.html.erb Co-authored-by: Suzanne Aitchison Co-authored-by: Suzanne Aitchison --- app/views/users/_notifications.html.erb | 2 +- config/locales/helpers/en.yml | 2 +- config/locales/helpers/fr.yml | 2 +- config/locales/views/settings/en.yml | 2 +- config/locales/views/settings/fr.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/users/_notifications.html.erb b/app/views/users/_notifications.html.erb index 1706d75b7..8decb5157 100644 --- a/app/views/users/_notifications.html.erb +++ b/app/views/users/_notifications.html.erb @@ -84,7 +84,7 @@
<%= f.check_box :reaction_notifications, class: "crayons-checkbox" %> - <%= f.label :reaction_notifications, "Send notifications when someone reacts to my comments or posts", class: "crayons-field__label" %> + <%= f.label :reaction_notifications, t("helpers.label.users_notification_setting.reaction_notifications"), class: "crayons-field__label" %>
diff --git a/config/locales/helpers/en.yml b/config/locales/helpers/en.yml index bd3fdde2a..fa304fb75 100644 --- a/config/locales/helpers/en.yml +++ b/config/locales/helpers/en.yml @@ -65,7 +65,7 @@ en: mobile_mention_notifications: Send me a push notification when someone mentions me mobile_comment_notifications: Send me a push notification when someone replies to me in a comment thread welcome_notifications: Send me occasional tips on how to enhance my %{community} experience - reaction_notifications: Send notifications when someone reacts to my comments or posts + reaction_notifications: Send notifications when someone reacts to my content, such as comments or posts mod_roundrobin_notifications: Send me occasional community-success mod notifications users_setting: feed_url: RSS Feed URL diff --git a/config/locales/helpers/fr.yml b/config/locales/helpers/fr.yml index bb7e931b3..e702187c3 100644 --- a/config/locales/helpers/fr.yml +++ b/config/locales/helpers/fr.yml @@ -65,7 +65,7 @@ fr: mobile_mention_notifications: Send me a push notification when someone mentions me mobile_comment_notifications: Send me a push notification when someone replies to me in a comment thread welcome_notifications: Send me occasional tips on how to enhance my %{community} experience - reaction_notifications: Send notifications when someone reacts to my comments or posts + reaction_notifications: Send notifications when someone reacts to my content, such as comments or posts mod_roundrobin_notifications: Send me occasional community-success mod notifications users_setting: feed_url: RSS Feed URL diff --git a/config/locales/views/settings/en.yml b/config/locales/views/settings/en.yml index 5b4e0d727..c405716df 100644 --- a/config/locales/views/settings/en.yml +++ b/config/locales/views/settings/en.yml @@ -38,7 +38,7 @@ en: submit: Delete Account export: heading: Export content - desc: You can request an export of all your content. Currently we only support the export of your posts and comments. They will be emailed to your inbox. + desc: You can request an export of all your content. Currently we only support the export of your posts and comments, if you have any. They will be emailed to your inbox. label: Request an export of your content requested: You have recently requested an export of your content. Please check your email. submit: Submit Data Request diff --git a/config/locales/views/settings/fr.yml b/config/locales/views/settings/fr.yml index 7f8092961..ae877ea5d 100644 --- a/config/locales/views/settings/fr.yml +++ b/config/locales/views/settings/fr.yml @@ -38,7 +38,7 @@ fr: submit: Delete Account export: heading: Export content - desc: You can request an export of all your content. Currently we only support the export of your posts and comments. They will be emailed to your inbox. + desc: You can request an export of all your content. Currently we only support the export of your posts and comments, if you have any. They will be emailed to your inbox. label: Request an export of your content requested: You have recently requested an export of your content. Please check your email. submit: Submit Data Request