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

Ruby 1.9: silence some warnings for block args shadowing local vars

Browse source
This commit is contained in:
Jeremy Kemper 2008-08-23 16:03:00 -07:00
parent e7127be365
commit 92a7239a3d
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb vendored
View file

@ -183,8 +183,8 @@ module I18n
# keys are Symbols.
def normalize_translation_keys(locale, key, scope)
keys = [locale] + Array(scope) + [key]
keys = keys.map{|key| key.to_s.split(/\./) }
keys.flatten.map{|key| key.to_sym}
keys = keys.map{|k| k.to_s.split(/\./) }
keys.flatten.map{|k| k.to_sym}
end
end
end

10
activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/backend/simple.rb vendored
View file

@ -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