lib/i18n/js/utils.rb in i18n-js-3.4.1 vs lib/i18n/js/utils.rb in i18n-js-3.4.2

- old
+ new

@@ -12,13 +12,15 @@ # 3. Else if either node is nil, use the other node. PLURAL_MERGER = proc do |_key, v1, v2| v1 || v2 end MERGER = proc do |_key, v1, v2| - if Hash === v2 && (v2.keys - PLURAL_KEYS).empty? - slice(v2.merge(v1, &PLURAL_MERGER), v2.keys) - elsif Hash === v1 && Hash === v2 - v1.merge(v2, &MERGER) + if Hash === v1 && Hash === v2 + if (v2.keys - PLURAL_KEYS).empty? + slice(v2.merge(v1, &PLURAL_MERGER), v2.keys) + else + v1.merge(v2, &MERGER) + end else v2 || v1 end end