aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorShota Fukumori (sora_h) <her@sorah.jp>2013-12-04 12:48:21 +0900
committerShota Fukumori <sorah@cookpad.com>2013-12-05 09:20:58 +0900
commitc1d5477b63e73dadec9f284fa55ec22d81f3bf36 (patch)
tree05f338e912a29ec109e7f2d94af85ac6451e8fdf /actionpack
parent49ed8a1a628ff8b7aa089df241cd3f487cfbd06f (diff)
downloadrails-c1d5477b63e73dadec9f284fa55ec22d81f3bf36.tar.gz
rails-c1d5477b63e73dadec9f284fa55ec22d81f3bf36.tar.bz2
rails-c1d5477b63e73dadec9f284fa55ec22d81f3bf36.zip
Escalate missing error when :raise is true
Before ec16ba75a5493b9da972eea08bae630eba35b62f, ActionView::Helpers::TranslationHelper#translate has raised errors with specifying options[:raise] to true. This should work by this fix: begin t(:"translations.missing", raise: true) rescue I18n::MissingTranslationData p :hello! end
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 83e188a41b..26ba89eb33 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,10 @@
+* Fix regression when using `ActionView::Helpers::TranslationHelper#translate` with
+ `options[:raise]`.
+
+ This regression was introduced at ec16ba75a5493b9da972eea08bae630eba35b62f.
+
+ *Shota Fukumori (sora_h)*
+
* Introducing Variants
We often want to render different html/json/xml templates for phones,