ruby_android 0.7.3 → 0.7.5
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/VERSION +1 -1
- data/lib/android/resource.rb +4 -3
- metadata +3 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9c8f1c24d2815da2ff133718135ac22d2a477725
|
|
4
|
+
data.tar.gz: c463e9c968e4fac78690f62da20404c8efe73e98
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 68ed3bdb91e8f57c341479a17f4ed88e63150e8bca3129070ccbd199971ad0479cc3945c797f457f3b1e4af2ff5273923c73e888387e776d556fc7e0c135887e
|
|
7
|
+
data.tar.gz: 0591ac870d7c4b08b6f4a60384d92c30ea60cd533e2f443646a00d15ae7059a721843df6f8bfef5646bd90536136ccefb1a25bd7fb5faecd7654af2617a5437a
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.7.
|
|
1
|
+
0.7.3
|
data/lib/android/resource.rb
CHANGED
|
@@ -255,6 +255,7 @@ module Android
|
|
|
255
255
|
private :parse
|
|
256
256
|
|
|
257
257
|
def extract_res_strings
|
|
258
|
+
@res_strings_default = {}
|
|
258
259
|
@res_strings_lang = {}
|
|
259
260
|
@res_strings_contry = {}
|
|
260
261
|
begin
|
|
@@ -275,10 +276,10 @@ module Android
|
|
|
275
276
|
lang = type.config.locale_lang
|
|
276
277
|
contry = type.config.locale_contry
|
|
277
278
|
if lang.nil? && contry.nil?
|
|
278
|
-
@res_strings_default
|
|
279
|
+
@res_strings_default.merge!(str_hash)
|
|
279
280
|
else
|
|
280
|
-
@res_strings_lang[lang] = str_hash unless lang.nil?
|
|
281
|
-
@res_strings_contry[contry] = str_hash unless contry.nil?
|
|
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
283
|
end
|
|
283
284
|
end
|
|
284
285
|
end
|
metadata
CHANGED
|
@@ -1,15 +1,16 @@
|
|
|
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.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Michal Tajchert
|
|
8
|
+
- Kamil Trzcinski
|
|
8
9
|
- SecureBrain
|
|
9
10
|
autorequire:
|
|
10
11
|
bindir: bin
|
|
11
12
|
cert_chain: []
|
|
12
|
-
date: 2014-
|
|
13
|
+
date: 2014-11-24 00:00:00.000000000 Z
|
|
13
14
|
dependencies:
|
|
14
15
|
- !ruby/object:Gem::Dependency
|
|
15
16
|
name: rubyzip
|