diff options
| author | Sven Fuchs <svenfuchs@artweb-design.de> | 2011-04-24 17:37:57 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-04-26 15:10:58 +0200 |
| commit | a5b0f7064c0b74f4e007d8536afb8976d10fd49d (patch) | |
| tree | 866119b12384844c720865bc982664f5c53c03f9 | |
| parent | dd44626c7f2015c61d83a1be1265e664e87419f6 (diff) | |
| download | rails-a5b0f7064c0b74f4e007d8536afb8976d10fd49d.tar.gz rails-a5b0f7064c0b74f4e007d8536afb8976d10fd49d.tar.bz2 rails-a5b0f7064c0b74f4e007d8536afb8976d10fd49d.zip | |
bump the i18n gem to 0.6.0beta1 and update docs for the i18n exception handler [#6739 state:committed]
Signed-off-by: José Valim <jose.valim@gmail.com>
| -rw-r--r-- | actionpack/actionpack.gemspec | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/translation_helper.rb | 6 | ||||
| -rw-r--r-- | activemodel/activemodel.gemspec | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index d3c66800d9..f771737779 100644 --- a/actionpack/actionpack.gemspec +++ b/actionpack/actionpack.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.add_dependency('activemodel', version) s.add_dependency('rack-cache', '~> 1.0.0') s.add_dependency('builder', '~> 3.0.0') - s.add_dependency('i18n', '~> 0.5.0') + s.add_dependency('i18n', '~> 0.6.0beta1') s.add_dependency('rack', '~> 1.2.1') s.add_dependency('rack-test', '~> 0.5.7') s.add_dependency('rack-mount', '~> 0.7.1') diff --git a/actionpack/lib/action_view/helpers/translation_helper.rb b/actionpack/lib/action_view/helpers/translation_helper.rb index 59e6ce878f..26ebae6546 100644 --- a/actionpack/lib/action_view/helpers/translation_helper.rb +++ b/actionpack/lib/action_view/helpers/translation_helper.rb @@ -5,7 +5,7 @@ module I18n class ExceptionHandler include Module.new { def call(exception, locale, key, options) - exception.is_a?(MissingTranslationData) ? super.html_safe : super + exception.is_a?(MissingTranslation) ? super.html_safe : super end } end @@ -17,8 +17,8 @@ module ActionView module TranslationHelper # Delegates to I18n#translate but also performs three additional functions. # - # First, it'll pass the :rescue_format => :html option to I18n so that any caught - # MissingTranslationData exceptions will be turned into inline spans that + # First, it'll pass the :rescue_format => :html option to I18n so that any + # thrown MissingTranslation messages will be turned into inline spans that # # * have a "translation-missing" class set, # * contain the missing key as a title attribute and diff --git a/activemodel/activemodel.gemspec b/activemodel/activemodel.gemspec index 9f80673bb8..ce69c4a201 100644 --- a/activemodel/activemodel.gemspec +++ b/activemodel/activemodel.gemspec @@ -19,6 +19,6 @@ Gem::Specification.new do |s| s.add_dependency('activesupport', version) s.add_dependency('builder', '~> 3.0.0') - s.add_dependency('i18n', '~> 0.5.0') + s.add_dependency('i18n', '~> 0.6.0beta1') s.add_dependency('bcrypt-ruby', '~> 2.1.4') end |