ruby_android 0.7.5 → 0.7.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/android/resource.rb +4 -3
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c8833781b8ded09312c57fcf8b963b2948fb386e
|
|
4
|
+
data.tar.gz: ee66f7ceea2419e6e7e39372843ab5eb94898072
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 068726a9d09d8b5e811240c22498b77444eac4a53881032ee0b40906abe9f579bead6465d7d8348abee9620bd2c4fc218145fe3529d193f2ca8451e00203458c
|
|
7
|
+
data.tar.gz: f9a27ae24d816c68752230568053f10b4748688a6b6340f92b1a3ad2d6c475e42f710c30c8ebbb682eae21e178ebe8f940d38ba3b1aeadd7c404d0e94ca311ee
|
data/lib/android/resource.rb
CHANGED
|
@@ -275,11 +275,12 @@ module Android
|
|
|
275
275
|
end
|
|
276
276
|
lang = type.config.locale_lang
|
|
277
277
|
contry = type.config.locale_contry
|
|
278
|
+
hash_merge_resolver = proc { |_, *values| values.compact.first }
|
|
278
279
|
if lang.nil? && contry.nil?
|
|
279
|
-
@res_strings_default.merge!(str_hash)
|
|
280
|
+
@res_strings_default.merge!(str_hash, &hash_merge_resolver)
|
|
280
281
|
else
|
|
281
|
-
@res_strings_lang[lang] = (@res_strings_lang[lang] || {}).merge(str_hash) unless lang.nil?
|
|
282
|
-
@res_strings_contry[contry] = (@res_strings_contry[contry] || {}).merge(str_hash) unless contry.nil?
|
|
282
|
+
@res_strings_lang[lang] = (@res_strings_lang[lang] || {}).merge(str_hash, &hash_merge_resolver) unless lang.nil?
|
|
283
|
+
@res_strings_contry[contry] = (@res_strings_contry[contry] || {}).merge(str_hash, &hash_merge_resolver) unless contry.nil?
|
|
283
284
|
end
|
|
284
285
|
end
|
|
285
286
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ruby_android
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.7.
|
|
4
|
+
version: 0.7.6
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Michal Tajchert
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date:
|
|
13
|
+
date: 2015-02-20 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: rubyzip
|