github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 7ad461b44d.
This commit is contained in:
Jeremy Kemper
2009-11-09 04:05:22 -08:00
parent a038b3d1bc
commit 7f0fcadd36
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n.rb vendored
View File

@@ -195,19 +195,10 @@ module I18n
# 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