diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-02-25 15:06:11 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-02-25 15:06:11 -0800 |
| commit | 66d537852b6c0357f391069c6d3b0b62c0722283 (patch) | |
| tree | 9cc2bc715ed036420ec9b7f6cf2b2695dd034118 | |
| parent | 2ba604950603302fd78bcefecfe043efaa8169dc (diff) | |
| download | rails-66d537852b6c0357f391069c6d3b0b62c0722283.tar.gz rails-66d537852b6c0357f391069c6d3b0b62c0722283.tar.bz2 rails-66d537852b6c0357f391069c6d3b0b62c0722283.zip | |
Bump i18n for new public I18n.normalize_keys
| -rw-r--r-- | actionpack/lib/action_view/helpers/translation_helper.rb | 2 | ||||
| -rw-r--r-- | activesupport/activesupport.gemspec | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/translation_helper.rb b/actionpack/lib/action_view/helpers/translation_helper.rb index 7d954b3a2f..8a89ee58a0 100644 --- a/actionpack/lib/action_view/helpers/translation_helper.rb +++ b/actionpack/lib/action_view/helpers/translation_helper.rb @@ -15,7 +15,7 @@ module ActionView translation = I18n.translate(scope_key_by_partial(key), options) translation.is_a?(Array) ? translation.map { |entry| entry.html_safe } : translation.html_safe rescue I18n::MissingTranslationData => e - keys = I18n.send(:normalize_translation_keys, e.locale, e.key, e.options[:scope]) + keys = I18n.normalize_keys(e.locale, e.key, e.options[:scope]) content_tag('span', keys.join(', '), :class => 'translation_missing') end alias :t :translate diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index d0557230aa..90d68a215a 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.has_rdoc = true - s.add_dependency('i18n', '~> 0.3.0') + s.add_dependency('i18n', '~> 0.3.4') s.add_dependency('tzinfo', '~> 0.3.16') s.add_dependency('builder', '~> 2.1.2') s.add_dependency('memcache-client', '~> 1.7.5') |