From ae08bef428827e8da4b00088b273de11b5190aed Mon Sep 17 00:00:00 2001 From: Robin Dupret Date: Wed, 31 Dec 2014 16:53:36 +0100 Subject: [PATCH] Changelog edits [ci skip] --- actionmailer/CHANGELOG.md | 28 ++++++++++++++-------------- actionview/CHANGELOG.md | 4 ++-- activesupport/CHANGELOG.md | 14 ++++++++++---- 3 files changed, 26 insertions(+), 20 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. diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md index fb39ac7508..d71f29d7b0 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -1,5 +1,5 @@ -* Added an explicit error message, in `ActionView::PartialRenderer` - for partial `rendering`, when the value of option `as` has invalid characters. +* Add an explicit error message, in `ActionView::PartialRenderer` for partial + `rendering`, when the value of option `as` has invalid characters. *Angelo Capilleri* diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index f0ccdb1f21..709e497a6d 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,4 +1,5 @@ -* Added support for error dispatcher classes in `ActiveSupport::Rescuable`. Now it acts closer to Ruby's rescue. +* Add support for error dispatcher classes in `ActiveSupport::Rescuable`. + Now it acts closer to Ruby's rescue. class BaseController < ApplicationController module ErrorDispatcher @@ -14,11 +15,16 @@ *Genadi Samokovarov* -* Added `#verified` and `#valid_message?` methods to `ActiveSupport::MessageVerifier` +* Add `#verified` and `#valid_message?` methods to `ActiveSupport::MessageVerifier` - Previously, the only way to decode a message with `ActiveSupport::MessageVerifier` was to use `#verify`, which would raise an exception on invalid messages. Now `#verified` can also be used, which returns `nil` on messages that cannot be decoded. + Previously, the only way to decode a message with `ActiveSupport::MessageVerifier` + was to use `#verify`, which would raise an exception on invalid messages. Now + `#verified` can also be used, which returns `nil` on messages that cannot be + decoded. - Previously, there was no way to check if a message's format was valid without attempting to decode it. `#valid_message?` is a boolean convenience method that checks whether the message is valid without actually decoding it. + Previously, there was no way to check if a message's format was valid without + attempting to decode it. `#valid_message?` is a boolean convenience method that + checks whether the message is valid without actually decoding it. *Logan Leger* -- GitLab