kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Bump i18n for new public I18n.normalize_keys

Browse source
This commit is contained in:
Jeremy Kemper 2010-02-25 15:06:11 -08:00
parent 2ba6049506
commit 66d537852b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/lib/action_view/helpers/translation_helper.rb
View file

@ -15,7 +15,7 @@ module ActionView
translation = I18n.translate(scope_key_by_partial(key), options) translation = I18n.translate(scope_key_by_partial(key), options)
translation.is_a?(Array) ? translation.map { |entry| entry.html_safe } : translation.html_safe translation.is_a?(Array) ? translation.map { |entry| entry.html_safe } : translation.html_safe
rescue I18n::MissingTranslationData => e 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') content_tag('span', keys.join(', '), :class => 'translation_missing')
end end
alias :t :translate alias :t :translate

2
activesupport/activesupport.gemspec
View file

@ -16,7 +16,7 @@ Gem::Specification.new do |s|
s.has_rdoc = true 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('tzinfo', '~> 0.3.16')
s.add_dependency('builder', '~> 2.1.2') s.add_dependency('builder', '~> 2.1.2')
s.add_dependency('memcache-client', '~> 1.7.5') s.add_dependency('memcache-client', '~> 1.7.5')