diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-23 21:41:18 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-23 21:41:18 -0700 |
commit | 53e2e8ef2bebb7fb444fe472c657ddb11fae1c89 (patch) | |
tree | 7b90f6e92d318a2112091a2448e2c1d5507a4149 /activesupport/lib/active_support/vendor/i18n-0.0.1/i18n | |
parent | 23fb26a0dcbd46d36bdbc2caa267aa3192f77a24 (diff) | |
parent | c471f13db63844fe290615ed6e1ddca32b26570d (diff) | |
download | rails-53e2e8ef2bebb7fb444fe472c657ddb11fae1c89.tar.gz rails-53e2e8ef2bebb7fb444fe472c657ddb11fae1c89.tar.bz2 rails-53e2e8ef2bebb7fb444fe472c657ddb11fae1c89.zip |
Merge branch 'master' into i18n
Diffstat (limited to 'activesupport/lib/active_support/vendor/i18n-0.0.1/i18n')
-rw-r--r-- | activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/backend/simple.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/backend/simple.rb b/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/backend/simple.rb index 6c7c54777c..43ff686514 100644 --- a/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/backend/simple.rb +++ b/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/backend/simple.rb @@ -27,7 +27,7 @@ module I18n def translate(locale, key, options = {}) raise InvalidLocale.new(locale) if locale.nil? - return key.map{|key| translate locale, key, options } if key.is_a? Array + return key.map{|k| translate locale, k, options } if key.is_a? Array reserved = :scope, :default count, scope, default = options.values_at(:count, *reserved) @@ -74,7 +74,7 @@ module I18n def lookup(locale, key, scope = []) return unless key keys = I18n.send :normalize_translation_keys, locale, key, scope - keys.inject(translations){|result, key| result[key.to_sym] or return nil } + keys.inject(translations){|result, k| result[k.to_sym] or return nil } end # Evaluates a default translation. @@ -147,9 +147,9 @@ module I18n type = File.extname(filename).tr('.', '').downcase raise UnknownFileType.new(type, filename) unless respond_to? :"load_#{type}" data = send :"load_#{type}", filename # TODO raise a meaningful exception if this does not yield a Hash - data.each do |locale, data| - merge_translations locale, data - end + data.each do |locale, d| + merge_translations locale, d + end end # Loads a plain Ruby translations file. eval'ing the file must yield |