From 354b9ccf3bb49cd608b1381d5c87a651dc41f3ac Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 10 Mar 2015 16:04:48 -0400 Subject: [PATCH] Allow users to choose "Every 3 days" as a digest frequency --- .../javascripts/discourse/controllers/preferences.js.es6 | 3 ++- config/locales/client.ar.yml | 2 +- config/locales/client.cs.yml | 2 +- config/locales/client.da.yml | 2 +- config/locales/client.de.yml | 2 +- config/locales/client.en.yml | 3 ++- config/locales/client.es.yml | 2 +- config/locales/client.fi.yml | 2 +- config/locales/client.fr.yml | 2 +- config/locales/client.he.yml | 2 +- config/locales/client.id.yml | 2 +- config/locales/client.it.yml | 2 +- config/locales/client.ja.yml | 2 +- config/locales/client.ko.yml | 2 +- config/locales/client.nb_NO.yml | 2 +- config/locales/client.nl.yml | 2 +- config/locales/client.pl_PL.yml | 2 +- config/locales/client.pt.yml | 2 +- config/locales/client.pt_BR.yml | 2 +- config/locales/client.ro.yml | 2 +- config/locales/client.ru.yml | 2 +- config/locales/client.sq.yml | 2 +- config/locales/client.sv.yml | 2 +- config/locales/client.te.yml | 2 +- config/locales/client.tr_TR.yml | 2 +- config/locales/client.uk.yml | 2 +- config/locales/client.zh_CN.yml | 2 +- config/locales/client.zh_TW.yml | 2 +- 28 files changed, 30 insertions(+), 28 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js.es6 index 4131a03c5..1e40e4ba1 100644 --- a/app/assets/javascripts/discourse/controllers/preferences.js.es6 +++ b/app/assets/javascripts/discourse/controllers/preferences.js.es6 @@ -53,8 +53,9 @@ export default ObjectController.extend(CanCheckEmails, { }.property(), digestFrequencies: [{ name: I18n.t('user.email_digests.daily'), value: 1 }, + { name: I18n.t('user.email_digests.every_three_days'), value: 3 }, { name: I18n.t('user.email_digests.weekly'), value: 7 }, - { name: I18n.t('user.email_digests.bi_weekly'), value: 14 }], + { name: I18n.t('user.email_digests.every_two_weeks'), value: 14 }], autoTrackDurations: [{ name: I18n.t('user.auto_track_options.never'), value: -1 }, { name: I18n.t('user.auto_track_options.always'), value: 0 }, diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml index ab7c694b9..ecd81288d 100644 --- a/config/locales/client.ar.yml +++ b/config/locales/client.ar.yml @@ -363,7 +363,7 @@ ar: title: "إرسال رسالة إلكترونية تحتوي على جديد الموقع عندما لا أزور الموقع" daily: "يومي" weekly: "اسبوعي" - bi_weekly: "كل اسبوعين" + every_two_weeks: "كل اسبوعين" email_direct: "تلقي رسالة إلكترونية عند اقتباس مشاركة لك أو الرد على عليها أو في حالة ذكر اسمك @username" email_private_messages: "إرسال إشعار بالبريد الإلكتروني عندما يرسل لك شخصاً رسالة خاصة" email_always: "لاتفعل ارسال رسائل بريدية اذا كنت متفاعل مع الموقع" diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml index 3591c0f33..17f5180bf 100644 --- a/config/locales/client.cs.yml +++ b/config/locales/client.cs.yml @@ -425,7 +425,7 @@ cs: title: "Když tady dlouho nebudu, chci emailem zaslat co je nového:" daily: "denně" weekly: "týdně" - bi_weekly: "jednou za 14 dní" + every_two_weeks: "jednou za 14 dní" email_direct: "Upozornit emailem na moje citace, odpovědi na můj příspěvek a na @jmeno" email_private_messages: "Upozornit emailem na nové soukromé konverzace" email_always: "Posílat upozorňovací emaily i když jsem zrovna na webu aktivní" diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml index 5a61f5455..a2fd5f7aa 100644 --- a/config/locales/client.da.yml +++ b/config/locales/client.da.yml @@ -401,7 +401,7 @@ da: title: "Når jeg ikke besøger her, send mig en email med nyheder." daily: "dagligt" weekly: "ugenligt" - bi_weekly: "hver anden uge" + every_two_weeks: "hver anden uge" email_direct: "Send mig en email når nogen citere mig, svar på mit indlæg, eller nævner mit @brugernavn" email_private_messages: "Send mig en email når nogen sender mig private beskeder" email_always: "Send email notifikationer, selvom jeg er aktiv på forummet" diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml index 5ad78f96c..51e8abc48 100644 --- a/config/locales/client.de.yml +++ b/config/locales/client.de.yml @@ -402,7 +402,7 @@ de: title: "Schicke eine E-Mail mit Neuigkeiten, wenn ich länger nicht hier bin:" daily: "täglich" weekly: "wöchentlich" - bi_weekly: "alle zwei Wochen" + every_two_weeks: "alle zwei Wochen" email_direct: "Schicke eine E-Mail, wenn mich jemand zitiert, auf meine Beiträge antwortet oder meinen @Namen erwähnt." email_private_messages: "Schicke eine E-Mail, wenn mir jemand eine private Nachricht sendet." email_always: "E-Mail-Benachrichtigungen nicht unterdrücken, während ich im Forum aktiv bin" diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 27c7cd825..71609c40e 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -452,8 +452,9 @@ en: email_digests: title: "When I don't visit here, send an email digest of what's new:" daily: "daily" + every_three_days: "every three days" weekly: "weekly" - bi_weekly: "every two weeks" + every_two_weeks: "every two weeks" email_direct: "Send me an email when someone quotes me, replies to my post, or mentions my @username" email_private_messages: "Send me an email when someone private messages me" diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index a540ba955..ee62c8253 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -402,7 +402,7 @@ es: title: "Cuando no visite la página, enviarme un correo con las últimas novedades." daily: "diariamente" weekly: "semanalmente" - bi_weekly: "cada dos semanas" + every_two_weeks: "cada dos semanas" email_direct: "Enviarme un email cuando alguien me cita, responde a mi post o menciona mi @usuario" email_private_messages: "Enviarme un email cuando alguien me mande un mensaje privado" email_always: "No detener notificaciones por e-mail cuando estoy activo en el sitio" diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index 66eb9f68c..7903916d8 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -397,7 +397,7 @@ fi: title: "Lähetä tiivistelmä uusista viesteistä sähköpostilla, jos en käy sivustolla " daily: "päivittäin" weekly: "viikottain" - bi_weekly: "joka toinen viikko" + every_two_weeks: "joka toinen viikko" email_direct: "Lähetä minulle sähköposti, jos joku lainaa viestiäni, vastaa viestiini tai viittaa @nimeeni." email_private_messages: "Lähetä minulle sähköposti jos joku lähettää minulle yksityisviestin" email_always: "Älä jätä lähettämättä sähköposti-ilmoituksia, vaikka olen aktiivinen palstalla." diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index f1755bfa5..c198bd93a 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -402,7 +402,7 @@ fr: title: "Quand je ne visite pas ce site, m'envoyer un résumé des nouveautés par courriel:" daily: "quotidien" weekly: "hebdomadaire" - bi_weekly: "tous les 15 jours" + every_two_weeks: "tous les 15 jours" email_direct: "M'envoyer un courriel quand quelqu'un me cite, répond à mon message ou mentionne mon @pseudo" email_private_messages: "M'envoyer un courriel quand quelqu'un m'envoie un message privé" email_always: "Ne pas recevoir de courriel de notifications lorsque je suis actif sur le site" diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml index 144e92904..535b3e363 100644 --- a/config/locales/client.he.yml +++ b/config/locales/client.he.yml @@ -401,7 +401,7 @@ he: title: "כשאיני מבקר/ת כאן, שלחו לי מייל עם תקציר העדכונים:" daily: "יומית" weekly: "שבועית" - bi_weekly: "דו-שבועית" + every_two_weeks: "דו-שבועית" email_direct: "שלחו לי דואל כשמישהו/י מצטטים אותי, מגיבים לפרסום שלי או מזכירים את @שם_המשתמש/ת" email_private_messages: "שלחו לי דוא\"ל כשמישהו/מישהי שולחים לי מסר פרטי" email_always: "אל תמנעו התראות דוא\"ל כאשר אני פעיל/ה באתר" diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml index 469aa0d07..f62dde877 100644 --- a/config/locales/client.id.yml +++ b/config/locales/client.id.yml @@ -287,7 +287,7 @@ id: email_digests: daily: "harian" weekly: "mingguan" - bi_weekly: "setiap dua minggu" + every_two_weeks: "setiap dua minggu" auto_track_options: never: "tidak pernah" always: "selalu" diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml index fd8b5d7b3..8848a79c4 100644 --- a/config/locales/client.it.yml +++ b/config/locales/client.it.yml @@ -402,7 +402,7 @@ it: title: "Quando non visito il sito, invia un riassunto delle novità per email: " daily: "ogni giorno" weekly: "ogni settimana" - bi_weekly: "bisettimanale" + every_two_weeks: "bisettimanale" email_direct: "Inviami un'email quando qualcuno mi cita, risponde a un mio messaggio o menziona il mio @nome" email_private_messages: "Inviami un'email quando qualcuno mi scrive un messaggio privato" email_always: "Non sospendere le notifiche via email anche quando sono attivo sul sito" diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml index d77176fcb..16e3dfd88 100644 --- a/config/locales/client.ja.yml +++ b/config/locales/client.ja.yml @@ -319,7 +319,7 @@ ja: email_digests: daily: "毎日" weekly: "毎週" - bi_weekly: "隔週" + every_two_weeks: "隔週" email_always: "ログインしている際にメール通知を受け取る。" other_settings: "その他" categories_settings: "カテゴリ設定" diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml index 759216673..65fdabc0c 100644 --- a/config/locales/client.ko.yml +++ b/config/locales/client.ko.yml @@ -374,7 +374,7 @@ ko: title: "사이트 방문이 없을 경우, 새로운 글을 요약하여 메일로 보냄" daily: "매일" weekly: "매주" - bi_weekly: "격주" + every_two_weeks: "격주" email_direct: "누군가 나를 인용했을 때, 내 글에 답글을 달았을때, 혹은 내 이름을 언급했을때 이메일 보내기" email_private_messages: "누군가 나에게 개인 메시지를 보냈을때 이메일 보내기" email_always: "싸이트에 방문 중 일 때 이메일 알림을 보내지 마세요." diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml index 184144646..d2aafd092 100644 --- a/config/locales/client.nb_NO.yml +++ b/config/locales/client.nb_NO.yml @@ -402,7 +402,7 @@ nb_NO: title: "Send meg sammendrag av hva som er nytt på e-post når jeg ikke er ofte innom:" daily: "daglig" weekly: "ukentlig" - bi_weekly: "hver andre uke" + every_two_weeks: "hver andre uke" email_direct: "Send meg e-post når noen siteter meg, svarer meg eller nevner mitt @brukernavn" email_private_messages: "Notta en email når noen sender deg en privat melding" email_always: "Ikke stans e-postvarsler mens jeg er aktiv på nettstedet." diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml index 491a5213d..c0fdbf613 100644 --- a/config/locales/client.nl.yml +++ b/config/locales/client.nl.yml @@ -391,7 +391,7 @@ nl: email_digests: daily: "dagelijks" weekly: "wekelijks" - bi_weekly: "elke twee weken" + every_two_weeks: "elke twee weken" email_always: "E-mailnotificaties niet onderdrukken als ik actief ben op de site" other_settings: "Overige" categories_settings: "Categorieën" diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml index 43ce298d2..1a3864460 100644 --- a/config/locales/client.pl_PL.yml +++ b/config/locales/client.pl_PL.yml @@ -425,7 +425,7 @@ pl_PL: title: "Gdy nie odwiedzam strony, wysyłaj e-mail z podsumowaniem aktywności:" daily: "codziennie" weekly: "co tydzień" - bi_weekly: "co 2 tygodnie" + every_two_weeks: "co 2 tygodnie" email_direct: "Wysyłaj powiadomienia gdy ktoś mnie cytuje, odpowiada na mój wpis lub wywołuje moją @nazwę" email_private_messages: "Wysyłaj powiadomienia, gdy ktoś wyśle mi prywatną wiadomość" email_always: "Wysyłaj powiadomienia email nawet gdy przejawiam aktywność na forum" diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml index 47ab4e9ea..7d81418f4 100644 --- a/config/locales/client.pt.yml +++ b/config/locales/client.pt.yml @@ -396,7 +396,7 @@ pt: email_digests: daily: "diariamente" weekly: "semanalmente" - bi_weekly: "a cada duas semanas" + every_two_weeks: "a cada duas semanas" email_always: "Não suprimir notificações de email quando estou ativo no sítio" other_settings: "Outros" categories_settings: "Categorias" diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml index c26e3ee09..4d943ae40 100644 --- a/config/locales/client.pt_BR.yml +++ b/config/locales/client.pt_BR.yml @@ -401,7 +401,7 @@ pt_BR: title: "Quando eu não visitar aqui, envie um resumo via email do que há de novo:" daily: "diariamente" weekly: "semanalmente" - bi_weekly: "duas em duas semanas" + every_two_weeks: "duas em duas semanas" email_direct: "Me envie um email quando alguém me citar, responder ao meu post, ou mencionar meu @nomedeusuário" email_private_messages: "Me envie um email quando alguém me enviar mensagem particular" email_always: "Não suprimir notificações de email quando eu estiver ativo no site" diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml index 87a10e49d..713d0addf 100644 --- a/config/locales/client.ro.yml +++ b/config/locales/client.ro.yml @@ -401,7 +401,7 @@ ro: title: "Cand nu vizitaţi site-ul, veţi primii un email cu rezumatul noutăţilor:" daily: "zilnic" weekly: "săptămânal" - bi_weekly: "odată la două saptămâni" + every_two_weeks: "odată la două saptămâni" email_direct: "Primeşte un email când cineva te citeaza, iţi răspunde la postare,sau iţi menţionează @numele de utilizator" email_private_messages: "Primeşte un email când cineva trimite un mesaj privat." diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml index 035b7d236..93168e909 100644 --- a/config/locales/client.ru.yml +++ b/config/locales/client.ru.yml @@ -422,7 +422,7 @@ ru: title: "В случае моего отсутствия на форуме присылайте мне сводку новостей по почте:" daily: "ежедневно" weekly: "еженедельно" - bi_weekly: "каждые две недели" + every_two_weeks: "каждые две недели" email_direct: "Присылать почтовое уведомление, когда кто-то цитирует меня, отвечает на мой пост или упоминает мой @псевдоним" email_private_messages: "Присылать почтовое уведомление, когда кто-то оставляет мне личное сообщение" email_always: "Отправлять оповещения по e-mail даже когда я нахожусь на сайте." diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml index bfe9ceb03..387773529 100644 --- a/config/locales/client.sq.yml +++ b/config/locales/client.sq.yml @@ -357,7 +357,7 @@ sq: email_digests: daily: "ditore" weekly: "javore" - bi_weekly: "çdo dy javë" + every_two_weeks: "çdo dy javë" email_always: "Do not suppress email notifications when I am active on the site" other_settings: "Tjetër" categories_settings: "Kategoritë" diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml index 705a6fe5e..257dc1f71 100644 --- a/config/locales/client.sv.yml +++ b/config/locales/client.sv.yml @@ -391,7 +391,7 @@ sv: email_digests: daily: "dagligen" weekly: "veckovis" - bi_weekly: "varannan vecka" + every_two_weeks: "varannan vecka" email_direct: "Skicka ett e-postmeddelande när någon citerar mig, svarar på mitt inlägg, eller nämner mitt @användarnamn" email_private_messages: "Skicka ett e-postmeddelande till mig när någon skickar mig ett privatmeddelande." email_always: "Ta emot notifieringar via mail även om jag är aktiv på forumet" diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml index 4c5f9ce06..b134c08ca 100644 --- a/config/locales/client.te.yml +++ b/config/locales/client.te.yml @@ -402,7 +402,7 @@ te: title: "నేను ఇక్కడికి రాకపోతే, కొత్త విషయాలు నాకు ఈమెయిల్ గా పంపండి:" daily: "ప్రతీరోజు" weekly: "ప్రతీవారం" - bi_weekly: "ప్రతీ రెండు వారాలకు" + every_two_weeks: "ప్రతీ రెండు వారాలకు" email_direct: "ఎవరన్నా నన్ను కోట్ చేసినా, నా టపాలకు జవాబిచ్చినా, నా @పేరు ప్రస్తావిస్తే నాకు ఈమెయిల్ పంపండి" email_private_messages: "ఎవరన్నా ప్రైవేటు సందేశం పంపితే నాకు ఈమెయిల్ పంపండి." email_always: "నేను ఈసైటుపై క్రియాశీలంగా ఉన్నా నాకు ఈమెయిల్ పంపుట ఆపవద్దు" diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml index be21c8a60..82ee1e53c 100644 --- a/config/locales/client.tr_TR.yml +++ b/config/locales/client.tr_TR.yml @@ -379,7 +379,7 @@ tr_TR: title: "Burayı ziyaret etmediğim zamanlarda bana yeni şeylerin özetini içeren bir email yolla:" daily: "günlük" weekly: "haftalık" - bi_weekly: "her iki haftada bir" + every_two_weeks: "her iki haftada bir" email_direct: "Birisi gönderime cevap verdiğinde, benden alıntı yaptığında ya da benden @username bahsettiğinde bana bir email at" email_private_messages: "Biri bana özel mesaj yazdığında bana bir email at" email_always: "Sayfada etkin olduğum anlarda da e-posta bildirimleri yollamaya devam et" diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml index 031ccab12..93b78611b 100644 --- a/config/locales/client.uk.yml +++ b/config/locales/client.uk.yml @@ -262,7 +262,7 @@ uk: email_digests: daily: "щодня" weekly: "щотижня" - bi_weekly: "кожні два тижні" + every_two_weeks: "кожні два тижні" other_settings: "Інше" categories_settings: "Категорії" new_topic_duration: diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index a44babc07..5df75d66d 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -378,7 +378,7 @@ zh_CN: title: "当我不访问时，向我的邮箱发送最新信息：" daily: "每天" weekly: "每周" - bi_weekly: "每两周" + every_two_weeks: "每两周" email_direct: "当有人引用我、回复我的帖子或提及@你时发送一封邮件给我" email_private_messages: "当有人给发私信给我时发送一封邮件给我" email_always: "即使在论坛中活跃时也接收电子邮件提醒" diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml index 37238a09d..4a3888f1b 100644 --- a/config/locales/client.zh_TW.yml +++ b/config/locales/client.zh_TW.yml @@ -379,7 +379,7 @@ zh_TW: title: "當我很久沒來此網站時，以電子郵件通知我最近有什麼新文章：" daily: "每天" weekly: "每週" - bi_weekly: "每兩週" + every_two_weeks: "每兩週" email_direct: "當有人引用、回覆我的發文，或以 @用戶名稱 提到我時，請以電子郵件通知我。" email_private_messages: "當有人寄給我私人訊息時，以電子郵件通知我。" email_always: "不要因為我在網站上活動而不寄信通知。"