IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FEATURE: use actual time in preference > email notifications' instruction

Browse Source
This commit is contained in:
Régis Hanol 2014-12-02 18:15:32 +01:00
parent 87667cfe17
commit 99928cac26
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/user/preferences.hbs
View File

@ -181,7 +181,7 @@
{{preference-checkbox labelKey="user.email_always" checked=email_always}} {{preference-checkbox labelKey="user.email_always" checked=email_always}}
<div class='instructions'> <div class='instructions'>
{{i18n user.email.frequency}} {{i18n user.email.frequency count=siteSettings.email_time_window_mins}}
</div> </div>
</div> </div>

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

@ -391,7 +391,10 @@ en:
ok: "We will email you to confirm" ok: "We will email you to confirm"
invalid: "Please enter a valid email address" invalid: "Please enter a valid email address"
authenticated: "Your email has been authenticated by {{provider}}" authenticated: "Your email has been authenticated by {{provider}}"
frequency: "We'll only email you if we haven't seen you recently and you haven't read the thing we're emailing you about." frequency:
zero: "We'll email you immediately if you haven't read the thing we're emailing you about."
one: "We'll only email you if we haven't seen you in the last minute and you haven't read the thing we're emailing you about."
other: "We'll only email you if we haven't seen you in the last {{count}} minutes and you haven't read the thing we're emailing you about."
name: name:
title: "Name" title: "Name"

4
config/site_settings.yml
View File

@ -391,7 +391,9 @@ posting:
type: list type: list
email: email:
email_time_window_mins: 10 email_time_window_mins:
default: 10
client: true
email_posts_context: 5 email_posts_context: 5
digest_min_excerpt_length: 100 digest_min_excerpt_length: 100
digest_topics: 20 digest_topics: 20