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

slightly better upgrade email text

This commit is contained in:
Jeff Atwood 2016-02-22 15:50:22 -08:00
parent 841065db2f
commit 69461ec1ce
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1493,7 +1493,7 @@ en:
- If you run your own mail server, check to make sure the IPs of your mail server are [not on any email blacklists][4]. Also verify that it is definitely sending a fully-qualified hostname that resolves in DNS in its HELO message. If not, this will cause your email to be rejected by many mail services. - If you run your own mail server, check to make sure the IPs of your mail server are [not on any email blacklists][4]. Also verify that it is definitely sending a fully-qualified hostname that resolves in DNS in its HELO message. If not, this will cause your email to be rejected by many mail services.
- Send a test email to [mail-tester.com][mt] to verify that everything is working correctly. - Send a test email to [mail-tester.com][mt] to verify that everything is working correctly.
(The *easy* way is to create a free account on [Mandrill][md] or [Mailgun][mg] or [Mailjet][mj], which have free generous free mailing plans and will be fine for small communities. You'll still need to set up the SPF and DKIM records in your DNS, though!) (The *easy* way is to create a free account on [Mandrill][md] or [Mailgun][mg] or [Mailjet][mj], which have free generous free mailing plans and will be fine for small communities. You'll still need to set up the SPF and DKIM records in your DNS, though!)
@ -1518,13 +1518,11 @@ en:
new_version_mailer: new_version_mailer:
subject_template: "[%{site_name}] New Discourse version, update available" subject_template: "[%{site_name}] New Discourse version, update available"
text_body_template: | text_body_template: |
A new version of [Discourse](http://www.discourse.org) is available. Hooray, a new version of [Discourse](http://www.discourse.org) is available! :)
Your version: %{installed_version} Your version: %{installed_version}
New version: **%{new_version}** New version: **%{new_version}**
You may want to:
- See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master). - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master).
- Upgrade from your browser at [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - Upgrade from your browser at [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade).
@ -1534,13 +1532,11 @@ en:
new_version_mailer_with_notes: new_version_mailer_with_notes:
subject_template: "[%{site_name}] update available" subject_template: "[%{site_name}] update available"
text_body_template: | text_body_template: |
A new version of [Discourse](http://www.discourse.org) is available. Hooray, a new version of [Discourse](http://www.discourse.org) is available! :)
Your version: %{installed_version} Your version: %{installed_version}
New version: **%{new_version}** New version: **%{new_version}**
You may want to:
- See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master). - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master).
- Upgrade from your browser at [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - Upgrade from your browser at [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade).