Permalink
Browse files

Revert "Ruby 1.9.2: avoid Array#to_s and Array(nil)"

This reverts commit 7ad461b.
  • Loading branch information...
1 parent a038b3d commit 7f0fcadd3650eaee5bd6a8ab8032ed3c5627385b @jeremy jeremy committed Nov 9, 2009
Showing with 4 additions and 13 deletions.
  1. +4 −13 activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n.rb
@@ -195,19 +195,10 @@ def default_exception_handler(exception, locale, key, options)
# Merges the given locale, key and scope into a single array of keys.
# Splits keys that contain dots into multiple keys. Makes sure all
# keys are Symbols.
- def normalize_translation_keys(*keys)
- normalized = []
- keys.each do |key|
- case key
- when Array
- normalized.concat normalize_translation_keys(*key)
- when nil
- # skip
- else
- normalized.concat key.to_s.split('.').map { |sub| sub.to_sym }
- end
- end
- normalized
+ def normalize_translation_keys(locale, key, scope)
+ keys = [locale] + Array(scope) + [key]
+ keys = keys.map { |k| k.to_s.split(/\./) }
+ keys.flatten.map { |k| k.to_sym }
end
end
end

0 comments on commit 7f0fcad

Please sign in to comment.