lost_in_translation 0.2.15 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8400bb4007bbe3b64842be7db2b060671ff5785b
-  data.tar.gz: df902891617cad5ce52a0b54676177a83bd914e2
+  metadata.gz: a4ba919cf48560a895ba229150cd565d9ed86f4a
+  data.tar.gz: 4db873b88c4054da7b151eae7b711dcc82ad4699
 SHA512:
-  metadata.gz: 76d057594c8963e6396a805e13fdfb3ba33de48aca14ad7008749cc2bae1ef235fcf68d5b8c18aa209604adb62ce301741f41f22f1f3bce439d71379ff14a638
-  data.tar.gz: 245a56d1c664e247f448bfd5ebcc8a76afce1fd2065de1008e1e8484b241bbce19b7d5b5412b9d3f917b3e6f306bb37ee0f156adc51d044dc4872fc17a6e4513
+  metadata.gz: 8b410239ce6e0db841534a124675100bb3bd8b9f69b10eb8677f1c5f97bce9ed73a14bd136b3a56b154e6923e51030e5a6324e8d9d3e390cd5624eceb5e0ed33
+  data.tar.gz: c92f37a7044887056229394e826a29dfc294f0770a79bc6c2cb447a7cf562ab22fd257524b66a033892a750daa78acb936246988be7536982ff5679994a9ffc5

data/lib/lost_in_translation/difference.rb

@@ -12,12 +12,14 @@ module LostInTranslation
       next_compared = compared.nil? ? nil : compared[key]
       new_structure = structure.dup << key
       if value.is_a?(String) && (compared.nil? || compared[key].nil?)
-        @diff_counter += 1
-        if @mode == 'replace' && value_missing(@slave_file, new_structure)
-          new_val = ask_for_translation(value, new_structure, lang1, lang2, @diff_count, @diff_counter)
-          new_array << new_val unless new_val.blank?
-        elsif @mode == 'clean'
-          new_array << "#{new_structure.join('---')}---#{value}"
+        if value_missing(@slave_file, new_structure)
+          @diff_counter += 1
+          if @mode == 'replace'
+            new_val = ask_for_translation(value, new_structure, lang1, lang2, @diff_count, @diff_counter)
+            new_array << new_val unless new_val.blank?
+          elsif @mode == 'clean'
+            new_array << "#{new_structure.join('---')}---#{value}"
+          end
         end
       end
       if next_root.is_a? Hash
@@ -30,11 +32,7 @@ module LostInTranslation
 
   def self.value_missing(slave_file, structure)
     return true if slave_file.blank?
-    # puts structure
-    # en
-    # storage_backlog
-    # backlog_qstl
-    true
+    slave_file.dig(*structure).blank?
   end
 
   def self.get_locale(path)

data/lib/lost_in_translation/user_interface.rb

@@ -33,8 +33,8 @@ module LostInTranslation
     log "Application: #{app_name}"
     log "Do you want the #{lang}.yml to be sorted?"
     log 'Alphabetically & Recursive (ASC)'
-    a = [(print "# [Y/n]: "), Readline.readline()][1]
-    a == 'y' || a == 'Y' || a == ''
+    a = [(print "# [y/N]: "), Readline.readline()][1]
+    a == 'y' || a == 'Y'
   end
 
   def self.ask_for_translation(value, new_structure, lang1, lang2, diff_count, diff_counter)
@@ -56,7 +56,7 @@ module LostInTranslation
   end
 
   def self.log(text = '')
-    max_length = 70
+    max_length = 80
     outside = 4
     puts '#' * max_length if text.blank?
     arr = text.scan(/.{1,#{max_length - outside}}/)

data/lib/lost_in_translation/version.rb

@@ -2,5 +2,5 @@
 
 #
 module LostInTranslation
-  VERSION = '0.2.15'
+  VERSION = '0.2.16'
 end

data/lib/lost_in_translation/z_recent.rb

@@ -24,7 +24,7 @@ module LostInTranslation
     slave_file = YAML.load_file(paths[:slave])
 
     count = diff(master_copy_file[@master[:lang]], master_file[@master[:lang]], @master[:lang],
-                 @slave[:lang], [@slave[:lang]], [], mode: 'count')
+                 @slave[:lang], [@slave[:lang]], [], mode: 'count', slave_file: slave_file)
 
     abort('Well, in that case, forget it!') unless ask_for_permission(@master[:lang], @slave[:lang], @master[:app_name], count)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lost_in_translation
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
 platform: ruby
 authors:
 - Datyv
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler