diff --git a/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs b/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs index 2cabc8cf1fa..a0a74d5d0c7 100644 --- a/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs +++ b/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs @@ -76,12 +76,12 @@ {{d-icon (if this.isInDoNotDisturb "toggle-on" "toggle-off")}} {{#if this.isInDoNotDisturb}} - {{i18n "do_not_disturb.label"}} + {{i18n "pause_notifications.label"}} {{#if this.showDoNotDisturbEndDate}} {{format-age this.doNotDisturbDateTime}} {{/if}} {{else}} - {{i18n "do_not_disturb.label"}} + {{i18n "pause_notifications.label"}} {{/if}} diff --git a/app/assets/javascripts/discourse/app/templates/modal/do-not-disturb.hbs b/app/assets/javascripts/discourse/app/templates/modal/do-not-disturb.hbs index 751ba179041..0793e00184d 100644 --- a/app/assets/javascripts/discourse/app/templates/modal/do-not-disturb.hbs +++ b/app/assets/javascripts/discourse/app/templates/modal/do-not-disturb.hbs @@ -1,19 +1,19 @@ - + - {{i18n "do_not_disturb.options.half_hour"}} + {{i18n "pause_notifications.options.half_hour"}} - {{i18n "do_not_disturb.options.one_hour"}} + {{i18n "pause_notifications.options.one_hour"}} - {{i18n "do_not_disturb.options.two_hours"}} + {{i18n "pause_notifications.options.two_hours"}} - {{i18n "do_not_disturb.options.tomorrow"}} + {{i18n "pause_notifications.options.tomorrow"}} - + diff --git a/app/assets/javascripts/discourse/app/widgets/do-not-disturb.js b/app/assets/javascripts/discourse/app/widgets/do-not-disturb.js index ed094ec2b38..57ee927d99d 100644 --- a/app/assets/javascripts/discourse/app/widgets/do-not-disturb.js +++ b/app/assets/javascripts/discourse/app/widgets/do-not-disturb.js @@ -22,7 +22,7 @@ export default createWidget("do-not-disturb", { return [ h("button.btn-flat.do-not-disturb-inner-container", [ iconNode("toggle-off"), - h("span.do-not-disturb-label", I18n.t("do_not_disturb.label")), + h("span.do-not-disturb-label", I18n.t("pause_notifications.label")), ]), ]; } diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js index 741fe6b08ef..34177d934d6 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js @@ -523,7 +523,7 @@ acceptance("User menu", function (needs) { .replaceAll(/\s+/g, " ") .replaceAll(/\u200B/g, "") .trim(), - I18n.t("do_not_disturb.label"), + I18n.t("pause_notifications.label"), "Do Not Disturb button has the right label" ); assert.ok( @@ -546,7 +546,7 @@ acceptance("User menu", function (needs) { .replaceAll(/\s+/g, " ") .replaceAll(/\u200B/g, "") .trim(), - `${I18n.t("do_not_disturb.label")} 2h`, + `${I18n.t("pause_notifications.label")} 2h`, "Do Not Disturb button has the right label when Do Not Disturb is enabled" ); assert.ok( diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 408152e1373..7fce47a1bf6 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1078,7 +1078,7 @@ en: notification_schedule: title: "Notification Schedule" label: "Enable custom notification schedule" - tip: "Outside of these hours you will be put in 'do not disturb' automatically." + tip: "Outside of these hours your notifications will be paused." midnight: "Midnight" none: "None" monday: "Monday" @@ -4289,9 +4289,9 @@ en: image_removed: "(image removed)" - do_not_disturb: - title: "Do not disturb for..." - label: "Do not disturb" + pause_notifications: + title: "Pause notifications for..." + label: "Pause notifications" remaining: "%{remaining} remaining" options: half_hour: "30 minutes"