deep_merge -> deep_sync, thanks @tmsrjs

nofxx · Dec 12, 2014 · 90c2f93 · 90c2f93
1 parent 640ec49
commit 90c2f93
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/i18n/sync.rb b/lib/i18n/sync.rb
@@ -51,7 +51,7 @@ def sync
         out "Writing #{filename}"
         (_comments, old) = read_file(filename, lang)
         # Initializing hash variable as empty if it does not exist
-        other = @words.dup.deep_merge! old
+        other = @words.dup.deep_sync! old
         write_file(filename, lang, @comments, other)
       end
     end

diff --git a/lib/i18n/sync/hash.rb b/lib/i18n/sync/hash.rb
@@ -1,10 +1,10 @@
 class Hash
 
   # Ensures multilevel hash merging
-  def deep_merge!(other_hash)
-    other_hash.each do |k,v|
+  def deep_sync!(other_hash)
+    other_hash.each do |k, v|
       next unless tv = self[k]
-      self[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.dup.deep_merge!(v) : v
+      self[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.dup.deep_sync!(v) : v
     end
     self
   end