aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorRobin Dupret <robin.dupret@gmail.com>2014-12-31 16:53:36 +0100
committerRobin Dupret <robin.dupret@gmail.com>2014-12-31 17:35:41 +0100
commitae08bef428827e8da4b00088b273de11b5190aed (patch)
tree37221ef54ac2771e6d030f812113b3b2acbc9dff /actionmailer
parentf2b31cd6d1f4b4b0a7095ec25456bd560587330a (diff)
downloadrails-ae08bef428827e8da4b00088b273de11b5190aed.tar.gz
rails-ae08bef428827e8da4b00088b273de11b5190aed.tar.bz2
rails-ae08bef428827e8da4b00088b273de11b5190aed.zip
Changelog edits [ci skip]
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/CHANGELOG.md28
1 files changed, 14 insertions, 14 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 2f9c0dd7a3..ba9e1b0607 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,24 +1,24 @@
-* Template lookup now respect default locale and I18n fallbacks.
+* Template lookup now respects default locale and I18n fallbacks.
- Given the following templates:
+ Given the following templates:
- mailer/demo.html.erb
- mailer/demo.en.html.erb
- mailer/demo.pt.html.erb
+ mailer/demo.html.erb
+ mailer/demo.en.html.erb
+ mailer/demo.pt.html.erb
- Before this change for a locale that doesn't have its related file the `mailer/demo.html.erb` will
- be rendered even if `en` is the default locale.
+ Before this change, for a locale that doesn't have its associated file, the
+ `mailer/demo.html.erb` would be rendered even if `en` was the default locale.
- Now `mailer/demo.en.html.erb` has precedence over the file without locale.
+ Now `mailer/demo.en.html.erb` has precedence over the file without locale.
- Also, it is possible to give a fallback.
+ Also, it is possible to give a fallback.
- mailer/demo.pt.html.erb
- mailer/demo.pt-BR.html.erb
+ mailer/demo.pt.html.erb
+ mailer/demo.pt-BR.html.erb
- So if the locale is `pt-PT`, `mailer/demo.pt.html.erb` will be rendered given the right I18n
- fallback configuration.
+ So if the locale is `pt-PT`, `mailer/demo.pt.html.erb` will be rendered given
+ the right I18n fallback configuration.
- *Rafael Mendonça França*
+ *Rafael Mendonça França*
Please check [4-2-stable](https://github.com/rails/rails/blob/4-2-stable/actionmailer/CHANGELOG.md) for previous changes.