From aa2c527c60c21cd1e922d1871d9b60e9005ef70a Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Mon, 20 Feb 2017 11:04:10 -0500 Subject: [PATCH] Remove "From" from every post in Popular Posts section of summary emails --- app/views/user_notifications/digest.html.erb | 1 - app/views/user_notifications/digest.text.erb | 2 +- config/locales/server.de.yml | 1 - config/locales/server.en.yml | 1 - config/locales/server.es.yml | 1 - config/locales/server.fi.yml | 1 - config/locales/server.fr.yml | 1 - config/locales/server.he.yml | 1 - config/locales/server.nb_NO.yml | 1 - config/locales/server.pl_PL.yml | 1 - config/locales/server.pt.yml | 1 - config/locales/server.pt_BR.yml | 1 - config/locales/server.ro.yml | 1 - config/locales/server.ru.yml | 1 - config/locales/server.zh_CN.yml | 1 - config/locales/server.zh_TW.yml | 1 - 16 files changed, 1 insertion(+), 16 deletions(-) diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb index 66e5930732b..6cee3a4e7ed 100644 --- a/app/views/user_notifications/digest.html.erb +++ b/app/views/user_notifications/digest.html.erb @@ -279,7 +279,6 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo

- <%=t 'user_notifications.digest.from_topic_label' %> <%= post.topic.title.truncate(60, separator: /\s/) -%>

diff --git a/app/views/user_notifications/digest.text.erb b/app/views/user_notifications/digest.text.erb index e6570508545..ec9278df89b 100644 --- a/app/views/user_notifications/digest.text.erb +++ b/app/views/user_notifications/digest.text.erb @@ -29,7 +29,7 @@ ### <%=t 'user_notifications.digest.popular_posts' %> <%- @popular_posts.each_with_index do |post,i| %> -<%= post.user.username -%> <%=t 'user_notifications.digest.from_topic_label' -%> <%= raw(@markdown_linker.create(post.topic.title, post.topic.relative_url)) %> +<%= post.user.username -%> - <%= raw(@markdown_linker.create(post.topic.title, post.topic.relative_url)) %> <%= raw(post.excerpt(1000, strip_links: true, text_entities: true, markdown_images: true)) %> -------------------------------------------------------------------------------- diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml index 6c8612efcdd..b372604f86c 100644 --- a/config/locales/server.de.yml +++ b/config/locales/server.de.yml @@ -2184,7 +2184,6 @@ de: follow_topic: "Diesem Thema folgen" join_the_discussion: "Mehr lesen" popular_posts: "Beliebte Beiträge" - from_topic_label: "Von" more_new: "Neu für dich" subject_template: "Zusammenfassung für [%{site_name}]" unsubscribe: "Diese Zusammenfassung wird von %{site_link} gesendet, wenn wir dich einige Zeit lang nicht gesehen haben. Abbestellen unter %{unsubscribe_link}." diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 47beed5099b..2bdfb97f356 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -2478,7 +2478,6 @@ en: follow_topic: "Follow this topic" join_the_discussion: "Read More" popular_posts: "Popular Posts" - from_topic_label: "From" more_new: "New for you" subject_template: "[%{site_name}] Summary" unsubscribe: "This summary is sent from %{site_link} when we haven't seen you in a while. To unsubscribe %{unsubscribe_link}." diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index be349be1c81..c6dd9a93b5b 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -1988,7 +1988,6 @@ es: follow_topic: "Seguir este tema" join_the_discussion: "Leer más" popular_posts: "Temas populares" - from_topic_label: "Formulario" subject_template: "Resumen de [%{site_name}]" unsubscribe: "Este resumen se envía desde %{site_link} cuando pasa un tiempo desde tu última visita. Para cancelar tu suscripción %{unsubscribe_link}." click_here: "clic aquí" diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml index 91eed2d63db..ad5020d991c 100644 --- a/config/locales/server.fi.yml +++ b/config/locales/server.fi.yml @@ -2159,7 +2159,6 @@ fi: follow_topic: "Seuraa tätä ketjua" join_the_discussion: "Lue lisää" popular_posts: "Suosittuja viestejä" - from_topic_label: "Lähettäjä" more_new: "Uutta sinulle" subject_template: "[%{site_name}] Kooste" unsubscribe: "Tämä kooste lähetettiin sivustolta %{site_link}, koska emme ole nähneet sinua vähään aikaan. Jos et halua vastaanottaa näitä viestejä %{unsubscribe_link}." diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index a3eec04478c..bb99e247e12 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -2091,7 +2091,6 @@ fr: follow_topic: "Suivre ce sujet" join_the_discussion: "Lire la suite" popular_posts: "Messages populaires" - from_topic_label: "De" more_new: "Nouveau pour vous" subject_template: "[%{site_name}] Résumé" unsubscribe: "Ce résumé est envoyé depuis %{site_link} lorsque nous ne vous voyons plus depuis un moment. Pour se désabonner %{unsubscribe_link}." diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml index ed8ca89c531..b865dd7e54d 100644 --- a/config/locales/server.he.yml +++ b/config/locales/server.he.yml @@ -2183,7 +2183,6 @@ he: follow_topic: "עיקבו אחרי נושא זה" join_the_discussion: "קראו עוד" popular_posts: "פוסטים פופולאריים" - from_topic_label: "מאת" more_new: "חדש בשבילכם" subject_template: "[%{site_name}] סיכום" unsubscribe: "סיכום זה נשלח מ %{site_link} כאשר אנחנו לא רואים אתכם לאורך זמן. כדי לבטל את המנוי %{unsubscribe_link}." diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml index a9099656340..bfb4e883c0a 100644 --- a/config/locales/server.nb_NO.yml +++ b/config/locales/server.nb_NO.yml @@ -887,7 +887,6 @@ nb_NO: follow_topic: "Følg dette emnet" join_the_discussion: "Les mer" popular_posts: "Populære innlegg" - from_topic_label: "Fra" more_new: "Nytt for deg" subject_template: "[%{site_name}] Oppsummering" unsubscribe: "Denne oppsummeringen blir sendt fra %{site_link} når vi ikke har sett deg på en stund. For å melde deg av %{unsubscribe_link}." diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml index 5c231c53357..90662b5d2bb 100644 --- a/config/locales/server.pl_PL.yml +++ b/config/locales/server.pl_PL.yml @@ -1465,7 +1465,6 @@ pl_PL: follow_topic: "Śledź ten temat" join_the_discussion: "Czytaj więcej" popular_posts: "Popularne wpisy" - from_topic_label: "Od" more_new: "Nowe dla ciebie" subject_template: "%{site_name} Podsumowanie" click_here: "kliknij tutaj" diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml index ea59a59401e..a7fb3864615 100644 --- a/config/locales/server.pt.yml +++ b/config/locales/server.pt.yml @@ -2040,7 +2040,6 @@ pt: follow_topic: "Acompanhar este tópico" join_the_discussion: "Ler Mais" popular_posts: "Publicações Populares" - from_topic_label: "De" subject_template: "Sumário de [%{site_name}] " unsubscribe: "Este resumo é enviado de %{site_link} quando não o vemos há algum tempo. Para anular a subscrição %{unsubscribe_link}." click_here: "clique aqui" diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml index f3e44c45a83..0c1d5a67c8c 100644 --- a/config/locales/server.pt_BR.yml +++ b/config/locales/server.pt_BR.yml @@ -1564,7 +1564,6 @@ pt_BR: follow_topic: "Seguir esse tópico" join_the_discussion: "Leia Mais" popular_posts: "Publicações Populares" - from_topic_label: "De" subject_template: "[%{site_name}] Resumo das discussões" unsubscribe: "Este resumo é enviado por %{site_link} quando não o vemos há algum tempo. Para cancelar a assinatura %{unsubscribe_link}." click_here: "clique aqui" diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml index 2dc598605ac..fc34284d841 100644 --- a/config/locales/server.ro.yml +++ b/config/locales/server.ro.yml @@ -2101,7 +2101,6 @@ ro: follow_topic: "Urmărește acest subiect" join_the_discussion: "Citește mai mult" popular_posts: "Postări notorii" - from_topic_label: "De la" subject_template: "[%{site_name}] Rezumat" unsubscribe: "Acest rezumat este transmis de pe %{site_link} când a trecut ceva vreme de când nu te-am mai văzut. Pentru a te dezabona, %{unsubscribe_link}." click_here: "click aici" diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml index 6afaf1dc72a..8ed2931bddb 100644 --- a/config/locales/server.ru.yml +++ b/config/locales/server.ru.yml @@ -1555,7 +1555,6 @@ ru: follow_topic: "Следить за этой темой" join_the_discussion: "Читать Далее" popular_posts: "Популярные Сообщения" - from_topic_label: "От" more_new: "Новое для Вас" click_here: "нажмите здесь" mailing_list: diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index ac5c7b6e427..0f4b154c34a 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -2034,7 +2034,6 @@ zh_CN: follow_topic: "关注主题" join_the_discussion: "阅读更多" popular_posts: "流行帖子" - from_topic_label: "来自" more_new: "你关注的新帖" subject_template: "[%{site_name}] 摘要" unsubscribe: "这是封来自%{site_link}的摘要邮件，因为你长时间没有访问而发送。%{unsubscribe_link}取消订阅。" diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml index f09ecdea3c2..47d78bfb053 100644 --- a/config/locales/server.zh_TW.yml +++ b/config/locales/server.zh_TW.yml @@ -2082,7 +2082,6 @@ zh_TW: follow_topic: "關注主題" join_the_discussion: "閲讀更多" popular_posts: "流行帖子" - from_topic_label: "來自" more_new: "新內容" subject_template: "[%{site_name}] 摘要" unsubscribe: "這是封來自%{site_link}的摘要郵件，因為你長時間沒有訪問而發送。%{unsubscribe_link}取消訂閲。"