Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UX: Omit instruction note when `email_time_window_mins` is off (#19385) 

A translator noted that this string is odd: "We'll email you immediately
if you haven't read the thing we're emailing you about." We show this
note in the user profile when the user has chosen to be emailed "only
when away" and the site has `email_time_window_mins` off. The message
essentially says that "only when away" in this particular site's config
means "Always".

I think it is best to show no description here. In an ideal world, the
"Only when away" option shouldn't be there when `email_time_window_mins`
is off. But it is rare to choose that override, and adding proper support
for that use case would be complicated.
This commit is contained in:
Penar Musaraj 2022-12-08 21:31:18 -05:00 committed by GitHub
parent 138dac9257
commit 0c50bacbc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/discourse/app/controllers/preferences/emails.js
View File

@ -82,13 +82,11 @@ export default Controller.extend({
@discourseComputed()
emailFrequencyInstructions() {
if (this.siteSettings.email_time_window_mins) {
return I18n.t("user.email.frequency", {
count: this.siteSettings.email_time_window_mins,
});
} else {
return I18n.t("user.email.frequency_immediately");
}
return this.siteSettings.email_time_window_mins
? I18n.t("user.email.frequency", {
count: this.siteSettings.email_time_window_mins,
})
: null;
},
actions: {

1
config/locales/client.en.yml
View File

@ -1496,7 +1496,6 @@ en:
authenticated: "Your email has been authenticated by %{provider}"
invite_auth_email_invalid: "Your invitation email does not match the email authenticated by %{provider}"
authenticated_by_invite: "Your email has been authenticated by the invitation"
frequency_immediately: "We'll email you immediately if you haven't read the thing we're emailing you about."
frequency:
one: "We'll only email you if we haven't seen you in the last minute."
other: "We'll only email you if we haven't seen you in the last %{count} minutes."