Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: html links in text part of summary email

This commit is contained in:
Neil Lalonde 2017-10-30 15:36:23 -04:00
parent 528eac5a07
commit a5afc08363
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/user_notifications/digest.html.erb
View File

@ -419,7 +419,7 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
<div dir="<%= rtl? ? 'rtl' : 'ltr' %>" class='footer'>
<%=raw(t 'user_notifications.digest.unsubscribe',
site_link: html_site_link(@anchor_color),
email_settings_url: Discourse.base_url + '/my/preferences/emails',
email_preferences_link: link_to(t('user_notifications.digest.your_email_settings'), Discourse.base_url + '/my/preferences/emails'),
unsubscribe_link: link_to(t('user_notifications.digest.click_here'), email_unsubscribe_url(host: Discourse.base_url, key: @unsubscribe_key), {:style=>"color: ##{@anchor_color}"})) %>
</div>

2
app/views/user_notifications/digest.text.erb
View File

@ -52,7 +52,7 @@
<%= digest_custom_text("above_footer") %>
<%=raw(t :'user_notifications.digest.unsubscribe',
site_link: site_link,
email_settings_url: Discourse.base_url + '/my/preferences/emails',
email_preferences_link: raw(@markdown_linker.create(t('user_notifications.digest.your_email_settings'), '/my/preferences/emails')),
unsubscribe_link: raw(@markdown_linker.create(t('user_notifications.digest.click_here'), email_unsubscribe_url(key: @unsubscribe_key, only_path: true)))) %>
<%= raw(@markdown_linker.references) %>

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

@ -2688,7 +2688,8 @@ en:
popular_posts: "Popular Posts"
more_new: "New for you"
subject_template: "[%{email_prefix}] Summary"
unsubscribe: "This summary is sent from %{site_link} when we haven't seen you in a while. Change <a href='%{email_settings_url}'>your email settings</a>, or %{unsubscribe_link} to unsubscribe."
unsubscribe: "This summary is sent from %{site_link} when we haven't seen you in a while. Change %{email_preferences_link}, or %{unsubscribe_link} to unsubscribe."
your_email_settings: "your email settings"
click_here: "click here"
from: "%{site_name} summary"
preheader: "A brief summary since your last visit on %{last_seen_at}"