No need to unwind keys when storing translations. This allows to stor…

…es keys in any format without a need to specify a separator.

lib/i18n/backend/active_record.rb

@@ -51,7 +51,7 @@ def lookup(locale, key, scope = [], options = {})
               hash[r.key.slice(chop_range)] = r.value
               hash
             end
-            deep_symbolize_keys(unwind_keys(result, separator))
+            deep_symbolize_keys(result)
           end
         end
 

lib/i18n/backend/base.rb

@@ -249,8 +249,7 @@ def load_yml(filename)
         def merge_translations(locale, data, options = {})
           locale = locale.to_sym
           translations[locale] ||= {}
-          separator = options[:separator] || I18n.default_separator
-          data = unwind_keys(data, separator)
+
           data = deep_symbolize_keys(data)
 
           # deep_merge by Stefan Rusterholz, see http://www.ruby-forum.com/topic/142809

lib/i18n/backend/helpers.rb

@@ -40,29 +40,6 @@ def escape_default_separator(key, separator=nil)
       def unescape_default_separator(key, separator=nil)
         key.to_s.tr(SEPARATOR_ESCAPE_CHAR, separator || I18n.default_separator).to_sym
       end
-
-      # Expand keys chained by the the given separator through nested Hashes
-      #   >> { "a.b.c" => "d", "a.b.e" => "f", "a.g" => "h", "i" => "j" }.unwind
-      #   => { "a" => { "b" => { "c" => "d", "e" => "f" }, "g" => "h" }, "i" => "j"}
-      def unwind_keys(hash, separator = ".")
-        result = {}
-        hash.each do |key, value|
-          keys = key.to_s.split(separator)
-          curr = result
-          curr = curr[keys.shift] ||= {} while keys.size > 1
-          curr[keys.shift] = value
-        end
-        result
-      end
-
-      # # Flatten the given array once
-      # def flatten_once(array)
-      #   result = []
-      #   for element in array # a little faster than each
-      #     result.push(*element)
-      #   end
-      #   result
-      # end
     end
   end
 end

test/backend/helpers_test.rb

@@ -13,12 +13,6 @@ def setup
     assert_equal expected, @backend.wind_keys(hash)
   end
 
-  test "unwind_keys" do
-    hash = { "a.b.c" => "d", :"a.b.e" => "f", :"a.g" => "h", "i" => "j" }
-    expected = { "a" => { "b" => { "c" => "d", "e" => "f" }, "g" => "h" }, "i" => "j"}
-    assert_equal expected, @backend.unwind_keys(hash)
-  end
-
   test "deep_symbolize_keys" do
     result = @backend.deep_symbolize_keys('foo' => { 'bar' => { 'baz' => 'bar' } })
     expected = {:foo => {:bar => {:baz => 'bar'}}}