ruby_android 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c8f1c24d2815da2ff133718135ac22d2a477725
-  data.tar.gz: c463e9c968e4fac78690f62da20404c8efe73e98
+  metadata.gz: c8833781b8ded09312c57fcf8b963b2948fb386e
+  data.tar.gz: ee66f7ceea2419e6e7e39372843ab5eb94898072
 SHA512:
-  metadata.gz: 68ed3bdb91e8f57c341479a17f4ed88e63150e8bca3129070ccbd199971ad0479cc3945c797f457f3b1e4af2ff5273923c73e888387e776d556fc7e0c135887e
-  data.tar.gz: 0591ac870d7c4b08b6f4a60384d92c30ea60cd533e2f443646a00d15ae7059a721843df6f8bfef5646bd90536136ccefb1a25bd7fb5faecd7654af2617a5437a
+  metadata.gz: 068726a9d09d8b5e811240c22498b77444eac4a53881032ee0b40906abe9f579bead6465d7d8348abee9620bd2c4fc218145fe3529d193f2ca8451e00203458c
+  data.tar.gz: f9a27ae24d816c68752230568053f10b4748688a6b6340f92b1a3ad2d6c475e42f710c30c8ebbb682eae21e178ebe8f940d38ba3b1aeadd7c404d0e94ca311ee

data/lib/android/resource.rb

@@ -275,11 +275,12 @@ module Android
           end
           lang = type.config.locale_lang
           contry = type.config.locale_contry
+          hash_merge_resolver = proc { |_, *values| values.compact.first }
           if lang.nil? && contry.nil?
-            @res_strings_default.merge!(str_hash)
+            @res_strings_default.merge!(str_hash, &hash_merge_resolver)
           else
-            @res_strings_lang[lang] = (@res_strings_lang[lang] || {}).merge(str_hash) unless lang.nil?
-            @res_strings_contry[contry] = (@res_strings_contry[contry] || {}).merge(str_hash) unless contry.nil?
+            @res_strings_lang[lang] = (@res_strings_lang[lang] || {}).merge(str_hash, &hash_merge_resolver) unless lang.nil?
+            @res_strings_contry[contry] = (@res_strings_contry[contry] || {}).merge(str_hash, &hash_merge_resolver) unless contry.nil?
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_android
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Michal Tajchert
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip