github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 02:19:27 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

should not have renamed this setting in 460665895c

Browse Source
This commit is contained in:
Régis Hanol 2017-02-08 18:11:34 +01:00
parent 53ea8942e8
commit f07b4b310a
14 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/jobs/scheduled/enqueue_digest_emails.rb
View File

@ -21,7 +21,7 @@ module Jobs
.where(user_options: {email_digests: true})
.where("COALESCE(last_emailed_at, '2010-01-01') <= CURRENT_TIMESTAMP - ('1 MINUTE'::INTERVAL * user_options.digest_after_minutes)")
.where("COALESCE(last_seen_at, '2010-01-01') <= CURRENT_TIMESTAMP - ('1 MINUTE'::INTERVAL * user_options.digest_after_minutes)")
.where("COALESCE(last_seen_at, '2010-01-01') >= CURRENT_TIMESTAMP - ('1 DAY'::INTERVAL * #{SiteSetting.delete_digest_email_after_days})")
.where("COALESCE(last_seen_at, '2010-01-01') >= CURRENT_TIMESTAMP - ('1 DAY'::INTERVAL * #{SiteSetting.suppress_digest_email_after_days})")
# If the site requires approval, make sure the user is approved
if SiteSetting.must_approve_users?

2
config/locales/server.de.yml
View File

@ -1166,7 +1166,7 @@ de:
digest_posts: "Die maximale Anzahl von beliebten Beiträgen, die in der E-Mail-Zusammenfassung angezeigt werden sollen."
digest_other_topics: "Die maximale Anzahl von Themen, die in dem Bereich 'Neues in Themen und Kategorien, denen du folgst' in der E-Mail-Zusammenfassung angezeigt werden sollen."
digest_min_excerpt_length: "Minimale Zeichenlänge für Auszüge von Beiträgen in der E-Mail-Zusammenfassung."
delete_digest_email_after_days: "Unterdrücke E-Mail-Zusammenfassungen für Benutzer, die länger als (n) Tage nicht auf der Site gesehen wurden."
suppress_digest_email_after_days: "Unterdrücke E-Mail-Zusammenfassungen für Benutzer, die länger als (n) Tage nicht auf der Site gesehen wurden."
digest_suppress_categories: "Unterdrücke diese Kategorien in E-Mail-Zusammenfassungen."
disable_digest_emails: "Deaktiviere E-Mail-Zusammenfassungen für alle Benutzer."
email_accent_bg_color: "Die Hervorhebungsfarbe, die als Hintergrund mancher Elemente in HTML-E-Mails verwendet wird. Gib’ einen Namen ('red') oder einen Hex-Wert ('#FF000') der Farbe an."

4
config/locales/server.en.yml
View File

@ -322,7 +322,7 @@ en:
You’ve already replied %{count} times to this person in this particular topic.
Have you considered replying to *other* people in the discussion, too? A great discussion involves many voices and perspectives.
If you’d like to continue your conversation with this particular user at length, consider sending them a personal message.
too_many_replies: |
@ -1343,7 +1343,7 @@ en:
digest_posts: "The maximum number of popular posts to display in the email summary."
digest_other_topics: "The maximum number of topics to show in the 'New in topics and categories you follow' section of the email summary."
digest_min_excerpt_length: "Minimum post excerpt in the email summary, in characters."
delete_digest_email_after_days: "Suppress summary emails for users not seen on the site for more than (n) days."
suppress_digest_email_after_days: "Suppress summary emails for users not seen on the site for more than (n) days."
digest_suppress_categories: "Suppress these categories from summary emails."
disable_digest_emails: "Disable summary emails for all users."
email_accent_bg_color: "The accent color to be used as the background of some elements in HTML emails. Enter a color name ('red') or hex value ('#FF000')."

2
config/locales/server.es.yml
View File

@ -1166,7 +1166,7 @@ es:
digest_posts: "El número máximo de temas populares que se mostrarán en el email de resumen."
digest_other_topics: "El número máximo de temas que se mostrarán en la sección del email de resumen 'Nuevo en temas y categorías'."
digest_min_excerpt_length: "Mínimo de caracteres del extracto de posts en el resumen por email."
delete_digest_email_after_days: "Suprimir los emails de resumen para aquellos usuarios que no han visto el sitio desde más de (n) días."
suppress_digest_email_after_days: "Suprimir los emails de resumen para aquellos usuarios que no han visto el sitio desde más de (n) días."
digest_suppress_categories: "Suprimir estas categorías de los emails de resumen."
disable_digest_emails: "Desactivar emails de resumen para todos los usuarios."
email_accent_bg_color: "El color de realce utilizado como fondo en algunos elementos del HTML en los emails. Introduce un nombre de color ('red') o un valor hexadecimal ('#FF000')."

2
config/locales/server.fi.yml
View File

@ -1164,7 +1164,7 @@ fi:
digest_posts: "Yläraja sähköpostikoosteessa näytettävien suosittujen viestien määrälle."
digest_other_topics: "Yläraja sähköpostikoosteen 'Uutta seuraamissasi ketjuissa ja alueissa' -osiossa näytettävien ketjujen määrälle."
digest_min_excerpt_length: "Vähimmäispituus merkeissä viestin katkelmalle, joka näytetään sähköpostikoosteissa."
delete_digest_email_after_days: "Älä lähetä sähköpostikoosteita käyttäjille, joita ei ole nähty sivustolla yli (n) päivään."
suppress_digest_email_after_days: "Älä lähetä sähköpostikoosteita käyttäjille, joita ei ole nähty sivustolla yli (n) päivään."
digest_suppress_categories: "Älä liitä näiden alueiden viestejä sähköpostikoosteisiin."
disable_digest_emails: "Poista sähköpostikoosteet kaikilta käyttäjiltä."
email_accent_bg_color: "Kakkosväri, jota käytetään joidenkin elementtien taustavärinä sähköpostiviesteissä. Anna värin nimi englanniksi ('red') tai sen Hex-arvo ('#FF000')."

2
config/locales/server.fr.yml
View File

@ -1166,7 +1166,7 @@ fr:
digest_posts: "Le nombre maximum de messages populaires à afficher dans le résumé par courriel."
digest_other_topics: "Le nombre maximum de sujets à afficher dans la section « Nouveautés dans les sujets et catégories que vous suivez » du résumé par courriel."
digest_min_excerpt_length: "Longueur minimale (en caractères) de l'extrait des messages dans le résumé par courriel."
delete_digest_email_after_days: "Ne pas envoyer de résumés par courriel aux utilisateurs qui n'ont pas visité le site depuis plus de (n) jours."
suppress_digest_email_after_days: "Ne pas envoyer de résumés par courriel aux utilisateurs qui n'ont pas visité le site depuis plus de (n) jours."
digest_suppress_categories: "Ne pas inclure ces catégories dans les résumés par courriel."
disable_digest_emails: "Désactiver les résumés par courriel pour tous les utilisateurs."
email_accent_bg_color: "La couleur d'accentuation utilisée comme arrière-plan de certains éléments des courriels HTML. Entrez un nom de couleur (« red ») ou une valeur hexadécimale (« #FF0000 »)."

2
config/locales/server.he.yml
View File

@ -1163,7 +1163,7 @@ he:
digest_posts: "המספר המקסימלי של פוסטים פופולאריים להצגה במייל סיכום."
digest_other_topics: "המספר המקסימלי של נושאים להצגה בקטע 'חדש בנושאים וקטגוריות שאתם עוקבים אחריהם' של מייל הסיכום."
digest_min_excerpt_length: "אורך קטע מינימלי מהפוסט למיילי הסיכום, בתווים."
delete_digest_email_after_days: "השתקת מיילי סיכום למשתמשים שלא ביקרו באתר למעלה מ (n) ימים."
suppress_digest_email_after_days: "השתקת מיילי סיכום למשתמשים שלא ביקרו באתר למעלה מ (n) ימים."
digest_suppress_categories: "וותרו על קטגוריות אלו במיילים מסכמים."
disable_digest_emails: "בטל סיכומי מיילים לכל המשתמשים."
email_accent_bg_color: "צבע האקסנט שיעשה בו שימוש כרקע לחלק מהאלמנטים של מיילים מסוג HTML. הכניסו שם צבע ('red') או ערך הקסדצימלי ('#FF000')."

2
config/locales/server.nb_NO.yml
View File

@ -745,7 +745,7 @@ nb_NO:
digest_posts: "Maksimalt antall populære innlegg å vise i oppsummerings-e-posten."
digest_other_topics: "Maksimalt antall emner å vise i delen 'Nytt i emner og kategorier du følger' i oppsummerings-e-posten."
digest_min_excerpt_length: "Minimal lengde på utdrag av innlegg i e-post-oppsummeringen, i antall tegn."
delete_digest_email_after_days: "Utelat oppsummerings-eposter for brukere ikke sett på nettstedet siden mer enn (n) dager."
suppress_digest_email_after_days: "Utelat oppsummerings-eposter for brukere ikke sett på nettstedet siden mer enn (n) dager."
digest_suppress_categories: "Utelat disse kategoriene i oppsummerings-eposter"
disable_digest_emails: "Deaktivér oppsummerings-eposter for alle brukere."
allow_profile_backgrounds: "Gi brukere mulighet til å laste opp profilbakgrunner."

2
config/locales/server.pt.yml
View File

@ -1140,7 +1140,7 @@ pt:
digest_posts: "Número máximo de publicações populares a mostrar no resumo do email."
digest_other_topics: "O número máximo de tópicos a mostrar na secção de \"Novos em tópicos e categorias que segue\" do email de resumo."
digest_min_excerpt_length: "Tamanho mínimo dos excertos de publicações no email de resumo, em caracteres."
delete_digest_email_after_days: "Suprimir emails de resumos para utilizadores não vistos no sítio por mais de (n) dias."
suppress_digest_email_after_days: "Suprimir emails de resumos para utilizadores não vistos no sítio por mais de (n) dias."
digest_suppress_categories: "Suprimir estas categorias dos emails de resumo."
disable_digest_emails: "Desativar os emails de resumo para todos os utilizadores."
detect_custom_avatars: "Se deve ou não verificar que os utilizadores carregaram fotografias de perfil personalizadas."

2
config/locales/server.ro.yml
View File

@ -1184,7 +1184,7 @@ ro:
digest_posts: "Numărul maxim de postări notorii care să se afișeze în rezumatul-email."
digest_other_topics: "Numărul maxim de subiecte care să fie afișate în secțiunea „Noutăți în subiectele și categoriile pe care le urmărești” din rezumatul pe email."
digest_min_excerpt_length: "Lungimea minimă (în caractere) a extraselor de postări, ce vor fi incluse în emailul-rezumat."
delete_digest_email_after_days: "Nu trimite emailuri-rezumat utilizatorilor care nu au fost văzuți pe site de mai mult de (n) zile."
suppress_digest_email_after_days: "Nu trimite emailuri-rezumat utilizatorilor care nu au fost văzuți pe site de mai mult de (n) zile."
digest_suppress_categories: "Nu include aceste categorii în emailurile-rezumat."
disable_digest_emails: "Dezactivează emailurile-rezumat pentru toți utilizatorii."
email_accent_bg_color: "Culoarea accent care să fie folosită ca fundal pentru unele elemente din emailurile HTML. Introdu numele culorii („roșu”) sau valoarea hex ('#FF000')."

2
config/locales/server.sv.yml
View File

@ -1075,7 +1075,7 @@ sv:
default_avatars: "URL:er till avatarer som kommer att användas utgångsläge för nya användare tills de ändrar dem."
automatically_download_gravatars: "Ladda ned Gravatars för användare vid kontoregistrering eller e-postadressbyte."
digest_min_excerpt_length: "Minsta antal inläggsutdrag i e-postsammanfattningen, i tecken."
delete_digest_email_after_days: "Undertryck e-postsammanfattningar för användare som inte har besökt webbplatsen i mer än (n) dagar."
suppress_digest_email_after_days: "Undertryck e-postsammanfattningar för användare som inte har besökt webbplatsen i mer än (n) dagar."
digest_suppress_categories: "Undertryck de här kategorierna från e-postsammanfattningar."
disable_digest_emails: "Inaktivera e-postsammanfattningar för alla användare."
detect_custom_avatars: "Huruvida det ska kontrolleras att användare har laddat upp anpassade profilbilder."

2
config/locales/server.zh_CN.yml
View File

@ -1122,7 +1122,7 @@ zh_CN:
digest_posts: "邮件摘要中显示的最流行帖子的数量。"
digest_other_topics: "邮件摘要中“你关注的主题和分类中的新内容”栏目显示的主题数目上限。"
digest_min_excerpt_length: "邮件摘要中显示的帖子摘要字符数下限。"
delete_digest_email_after_days: "不发送摘要邮件给超过（n）天没访问的用户。"
suppress_digest_email_after_days: "不发送摘要邮件给超过（n）天没访问的用户。"
digest_suppress_categories: "不在摘要邮件中显示这些分类的内容。"
disable_digest_emails: "禁用所有用户摘要邮件功能。"
email_accent_bg_color: "HTML 邮件中某些元素的背景使用的强调颜色。输入色彩名（“red”）或十六进制值（“#FF0000”）。"

2
config/locales/server.zh_TW.yml
View File

@ -1126,7 +1126,7 @@ zh_TW:
digest_posts: "郵件摘要中顯示的最流行帖子的數量。"
digest_other_topics: "郵件摘要中“你關注的主題和分類中的新內容”欄目顯示的主題數目上限。"
digest_min_excerpt_length: "郵件摘要中顯示的帖子摘要字元數下限。"
delete_digest_email_after_days: "不發送摘要郵件給超過（n）天沒訪問的用戶。"
suppress_digest_email_after_days: "不發送摘要郵件給超過（n）天沒訪問的用戶。"
digest_suppress_categories: "不在摘要郵件中顯示這些分類的內容。"
disable_digest_emails: "禁用所有用戶摘要郵件功能。"
email_accent_bg_color: "HTML 郵件中某些元素的背景使用的強調顏色。輸入色彩名（“red”）或十六進制值（“#FF0000”）。"

2
config/site_settings.yml
View File

@ -608,7 +608,7 @@ email:
min: 1
digest_posts: 3
digest_other_topics: 5
delete_digest_email_after_days:
suppress_digest_email_after_days:
default: 365
min: 0
max: 20000