rabelyoda 1.1.1 → 1.1.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/VERSION +1 -1
  2. data/lib/rabelyoda/hash.rb +6 -9
  3. metadata +2 -2
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.1.1
1
+ 1.1.2
@@ -3,26 +3,23 @@
3
3
  class Hash
4
4
  def locale_diff(b)
5
5
  a = self
6
- (a.keys | b.keys).inject({}) do |diff, k|
7
- if a[k].respond_to?(:locale_diff) && b[k].respond_to?(:locale_diff)
6
+ b = {} if b.nil?
7
+ diff = {}
8
+ a.keys.each do |k|
9
+ if a[k].respond_to?(:locale_diff)
8
10
  deeper_diff = a[k].locale_diff(b[k])
9
11
  diff[k] = deeper_diff if deeper_diff != {}
10
12
  else
11
- if !a.keys.include?(k)
12
- # omit extra strings
13
- # diff[k] = 'extra'
14
- elsif !b.keys.include?(k)
13
+ if !b.keys.include?(k)
15
14
  diff[k] = '[pls translate]' + a[k]
16
15
  elsif b.keys.include?(k) && b[k] == a[k]
17
16
  diff[k] = '[pls translate]' + a[k]
18
- elsif b.keys.include?(k)
19
- # do nothing
20
17
  else
21
18
  # keep translated strings
22
19
  diff[k] = b[k]
23
20
  end
24
21
  end
25
- diff
26
22
  end
23
+ diff
27
24
  end
28
25
  end
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 1
7
7
  - 1
8
- - 1
9
- version: 1.1.1
8
+ - 2
9
+ version: 1.1.2
10
10
  platform: ruby
11
11
  authors:
12
12
  - Andrey Subbotin