From f072da1bfec6c03fa6f29fadb4445ea982171b30 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Mon, 25 Mar 2019 12:45:01 +0200
Subject: [PATCH] FEATURE: Add every month / 6 months options to email digest.
 (#7247)

---
 .../discourse/controllers/preferences/emails.js.es6         | 4 ++--
 app/models/digest_email_site_setting.rb                     | 4 ++--
 config/locales/client.en.yml                                | 6 ++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6
index a54e9055438..fd9c5374fca 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6
@@ -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_hour"), value: 60 },
     { 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.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()
diff --git a/app/models/digest_email_site_setting.rb b/app/models/digest_email_site_setting.rb
index e9a817ad4c8..e2dee400920 100644
--- a/app/models/digest_email_site_setting.rb
+++ b/app/models/digest_email_site_setting.rb
@@ -13,9 +13,9 @@ class DigestEmailSiteSetting < EnumSiteSetting
       { name: 'every_30_minutes', value:  30 },
       { name: 'every_hour',       value:  60 },
       { name: 'daily',            value:  1440 },
-      { name: 'every_three_days', value:  4320 },
       { name: 'weekly',           value:  10080 },
-      { name: 'every_two_weeks',  value:  20160 }
+      { name: 'every_month',      value:  43200 },
+      { name: 'every_six_months', value: 259200 }
     ]
   end
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 3c392e41d54..42942883094 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -249,8 +249,6 @@ en:
     every_hour: "every hour"
     daily: "daily"
     weekly: "weekly"
-    every_two_weeks: "every two weeks"
-    every_three_days: "every three days"
     max_of_count: "max of {{count}}"
     alternation: "or"
     character_count:
@@ -948,9 +946,9 @@ en:
         every_30_minutes: "every 30 minutes"
         every_hour: "hourly"
         daily: "daily"
-        every_three_days: "every three days"
         weekly: "weekly"
-        every_two_weeks: "every two weeks"
+        every_month: "every month"
+        every_six_months: "every six months"
       email_level:
         title: "Send me an email when someone quotes me, replies to my post, mentions my @username, or invites me to a topic"
         always: "always"