rename I18n.normalize_translation_keys to normalize_keys and finally …

…make it public.

lib/i18n.rb

@@ -225,6 +225,16 @@ def localize(object, options = {})
     end
     alias :l :localize
 
+    # 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_keys(locale, key, scope, separator = nil)
+      keys = [locale] + Array(scope) + Array(key)
+      keys = keys.map { |k| k.to_s.split(separator || I18n.default_separator) }
+      keys = keys.flatten - ['']
+      keys.map { |k| k.to_sym }
+    end
+
   # making these private until Ruby 1.9.2 can send to protected methods again
   # see http://redmine.ruby-lang.org/repositories/revision/ruby-19?rev=24280
   private
@@ -263,15 +273,5 @@ def handle_exception(exception, locale, key, options)
         @@exception_handler.call(exception, locale, key, options)
       end
     end
-
-    # 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(locale, key, scope, separator = nil)
-      keys = [locale] + Array(scope) + Array(key)
-      keys = keys.map { |k| k.to_s.split(separator || I18n.default_separator) }
-      keys = keys.flatten - ['']
-      keys.map { |k| k.to_sym }
-    end
   end
 end

lib/i18n/backend/active_record/missing.rb

@@ -37,7 +37,7 @@ def store_default_translations(locale, key, options = {})
           count, scope, default, separator = options.values_at(:count, *Base::RESERVED_KEYS)
           separator ||= I18n.default_separator
 
-          keys = I18n.send(:normalize_translation_keys, locale, key, scope, separator)[1..-1]
+          keys = I18n.normalize_keys(locale, key, scope, separator)[1..-1]
           key = keys.join(separator || I18n.default_separator)
 
           unless ActiveRecord::Translation.locale(locale).lookup(key, separator).exists?

lib/i18n/backend/base.rb

@@ -110,7 +110,7 @@ def translations
         def lookup(locale, key, scope = [], options = {})
           return unless key
           init_translations unless initialized?
-          keys = I18n.send(:normalize_translation_keys, locale, key, scope, options[:separator])
+          keys = I18n.normalize_keys(locale, key, scope, options[:separator])
           keys.inject(translations) do |result, key|
             key = key.to_sym
             return nil unless result.is_a?(Hash) && result.has_key?(key)

lib/i18n/backend/cascade.rb

@@ -37,7 +37,7 @@ def lookup(locale, key, scope = [], options = {})
         return unless key
         return super unless options[:cascade]
 
-        locale, *scope = I18n.send(:normalize_translation_keys, locale, key, scope, options[:separator])
+        locale, *scope = I18n.normalize_keys(locale, key, scope, options[:separator])
         key = scope.pop
 
         begin

lib/i18n/exceptions.rb

@@ -21,7 +21,7 @@ class MissingTranslationData < ArgumentError
     attr_reader :locale, :key, :options
     def initialize(locale, key, opts = nil)
       @key, @locale, @options = key, locale, opts || {}
-      keys = I18n.send(:normalize_translation_keys, locale, key, options[:scope])
+      keys = I18n.normalize_keys(locale, key, options[:scope])
       keys << 'no key' if keys.size < 2
       super "translation missing: #{keys.join(', ')}"
     end

test/cases/i18n_test.rb

@@ -55,20 +55,20 @@ def test_can_set_default_separator
   end
 
   def test_normalize_keys
-    assert_equal [:en, :foo, :bar], I18n.send(:normalize_translation_keys, :en, :bar, :foo)
-    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.send(:normalize_translation_keys, :en, :'baz.buz', :'foo.bar')
-    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.send(:normalize_translation_keys, :en, 'baz.buz', 'foo.bar')
-    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.send(:normalize_translation_keys, :en, %w(baz buz), %w(foo bar))
-    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.send(:normalize_translation_keys, :en, [:baz, :buz], [:foo, :bar])
+    assert_equal [:en, :foo, :bar], I18n.normalize_keys(:en, :bar, :foo)
+    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.normalize_keys(:en, :'baz.buz', :'foo.bar')
+    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.normalize_keys(:en, 'baz.buz', 'foo.bar')
+    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.normalize_keys(:en, %w(baz buz), %w(foo bar))
+    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.normalize_keys(:en, [:baz, :buz], [:foo, :bar])
   end
 
   def test_normalize_keys_should_not_attempt_to_sym_on_empty_string
-    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.send(:normalize_translation_keys, :en, :'baz.buz', :'foo..bar')
-    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.send(:normalize_translation_keys, :en, :'baz.buz', :'foo......bar')
+    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.normalize_keys(:en, :'baz.buz', :'foo..bar')
+    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.normalize_keys(:en, :'baz.buz', :'foo......bar')
   end
 
   def test_uses_passed_separator_to_normalize_keys
-    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.send(:normalize_translation_keys, :en, :'baz|buz', :'foo|bar', '|')
+    assert_equal [:en, :foo, :bar, :baz, :buz], I18n.normalize_keys(:en, :'baz|buz', :'foo|bar', '|')
   end
 
   def test_can_set_exception_handler