github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-10 17:33:42 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: Add every month / 6 months options to email digest. (#7247)

Browse Source
This commit is contained in:
Bianca Nenciu
2019-03-25 12:45:01 +02:00
committed by GitHub
parent dcd56cf593
commit f072da1bfe
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,9 +69,9 @@ export default Ember.Controller.extend(PreferencesTabController, {
{ name: I18n.t("user.email_digests.every_30_minutes"), value: 30 }, { name: I18n.t("user.email_digests.every_30_minutes"), value: 30 },
{ name: I18n.t("user.email_digests.every_hour"), value: 60 }, { name: I18n.t("user.email_digests.every_hour"), value: 60 },
{ name: I18n.t("user.email_digests.daily"), value: 1440 }, { name: I18n.t("user.email_digests.daily"), value: 1440 },
{ name: I18n.t("user.email_digests.every_three_days"), value: 4320 },
{ name: I18n.t("user.email_digests.weekly"), value: 10080 }, { name: I18n.t("user.email_digests.weekly"), value: 10080 },
{ name: I18n.t("user.email_digests.every_two_weeks"), value: 20160 } { name: I18n.t("user.email_digests.every_month"), value: 43200 },
{ name: I18n.t("user.email_digests.every_six_months"), value: 259200 }
], ],
@computed() @computed()

4
app/models/digest_email_site_setting.rb
View File

@ -13,9 +13,9 @@ class DigestEmailSiteSetting < EnumSiteSetting
{ name: 'every_30_minutes', value: 30 }, { name: 'every_30_minutes', value: 30 },
{ name: 'every_hour', value: 60 }, { name: 'every_hour', value: 60 },
{ name: 'daily', value: 1440 }, { name: 'daily', value: 1440 },
{ name: 'every_three_days', value: 4320 },
{ name: 'weekly', value: 10080 }, { name: 'weekly', value: 10080 },
{ name: 'every_two_weeks', value: 20160 } { name: 'every_month', value: 43200 },
{ name: 'every_six_months', value: 259200 }
] ]
end end

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

@ -249,8 +249,6 @@ en:
every_hour: "every hour" every_hour: "every hour"
daily: "daily" daily: "daily"
weekly: "weekly" weekly: "weekly"
every_two_weeks: "every two weeks"
every_three_days: "every three days"
max_of_count: "max of {{count}}" max_of_count: "max of {{count}}"
alternation: "or" alternation: "or"
character_count: character_count:
@ -948,9 +946,9 @@ en:
every_30_minutes: "every 30 minutes" every_30_minutes: "every 30 minutes"
every_hour: "hourly" every_hour: "hourly"
daily: "daily" daily: "daily"
every_three_days: "every three days"
weekly: "weekly" weekly: "weekly"
every_two_weeks: "every two weeks" every_month: "every month"
every_six_months: "every six months"
email_level: email_level:
title: "Send me an email when someone quotes me, replies to my post, mentions my @username, or invites me to a topic" title: "Send me an email when someone quotes me, replies to my post, mentions my @username, or invites me to a topic"
always: "always" always: "always"