Skip to content
Browse files

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

  • Loading branch information...
1 parent e7127be commit 92a7239a3dd1de672730f7b0bcf5f5d2cb0f877f @jeremy jeremy committed Aug 23, 2008
View
4 activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb
@@ -183,8 +183,8 @@ def default_exception_handler(exception, locale, key, options)
# 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
View
10 activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/backend/simple.rb
@@ -27,7 +27,7 @@ def store_translations(locale, data)
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 @@ def translations
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 @@ def load_file(filename)
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

0 comments on commit 92a7239

Please sign in to comment.
Something went wrong with that request. Please try again.