phraseapp_android 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e93e77c6176e4fae785005ad6e07522cf258961b
-  data.tar.gz: 1801f2e7bda8d371c5240145b69ee0671aa022fd
+  metadata.gz: 3e5139f1a0cf880f123934b4aa27bc94d2921042
+  data.tar.gz: ded9010d9639f38e3f44c15d5df8d0624aa4fb86
 SHA512:
-  metadata.gz: 4436a3b1498b843cc05d71787e909716327ec6c34b5a652c8b430e354f62b9c2800337937bb194f9045c4117e1c4f4353c521eed73f211f6d4a67f9bc4e157c3
-  data.tar.gz: 740ddce5b12a579e27ee4aae46fde0aba2e02155fe0651ed0e856728481fd926abfe1e8349c55e7842d15b39aa3e53a38a87ed42a19cd0311b9bccc140940a77
+  metadata.gz: fa9e1a581a30861167d740aa42ad8492f406141f185acda4eecc673f22f9294db064e60035d226069dbf8141a98e0a97c04f113e780d4dc77bb6de8a8111c3bc
+  data.tar.gz: 2eabeceff879bb801bb5d5774a48ff99adc129614a45796ff2a3e5e218f641831c341fed006b3479253eeeb8a8758600e96333bf5e3b62cf15f5c1f47d967440

data/lib/phraseapp_android/format_check.rb

@@ -11,7 +11,9 @@ class PhraseApp::Android::FormatCheck < PhraseApp::Android::PhraseAppClient
   end
 
   def perform
-    locales.map { |l| perform_for_locale(l) }.reduce(:+)
+    count = locales.map { |l| perform_for_locale(l) }.reduce(:+)
+    puts 'All texts are ok.'.green
+    count
   end
 
   def perform_for_locale(locale)

data/lib/phraseapp_android/missing_translations.rb

@@ -44,6 +44,10 @@ class PhraseApp::Android::MissingTranslations < PhraseApp::Android::PhraseAppCli
         arrays: {added: 0, updated: 0}
     }
 
+    default_strings = doc_to_hash read_locale_file('strings', nil)
+    default_arrays = doc_to_hash read_locale_file('arrays', nil)
+    default = default_strings.merge default_arrays
+
     strings = doc_to_hash read_locale_file('strings', locale)
     arrays = doc_to_hash read_locale_file('arrays', locale)
     current = strings.merge arrays
@@ -52,8 +56,8 @@ class PhraseApp::Android::MissingTranslations < PhraseApp::Android::PhraseAppCli
     doc = Nokogiri::XML client.locale_download(project_id, locale, params)
     recent = doc_to_hash doc
 
-    merge_translations current, recent, :strings, stats
-    merge_translations current, recent, :arrays, stats
+    merge_translations default, current, recent, :strings, stats, locale
+    merge_translations default, current, recent, :arrays, stats, locale
 
     formatter = PhraseApp::Android::FileFormatter.new
 
@@ -71,9 +75,9 @@ class PhraseApp::Android::MissingTranslations < PhraseApp::Android::PhraseAppCli
     updated = stats[:strings][:updated] + stats[:arrays][:updated]
 
     if added + updated > 0
-      puts "#{added + updated} keys were updated!".green
+      puts "#{added + updated} keys were updated for #{locale} locale!".green
     else
-      puts 'no keys were updated.'.yellow
+      puts "no keys were updated for #{locale} locale.".yellow
     end
 
     stats
@@ -110,22 +114,36 @@ class PhraseApp::Android::MissingTranslations < PhraseApp::Android::PhraseAppCli
     result.reject { |k, v| v.empty? }
   end
 
-  def merge_translations(current, updated, key, stats)
+  def merge_translations(default, current, updated, key, stats, locale)
     updated[key].each do |name, values|
-      current[key] ||= {}
-      current_value = current[key][name]
-      if current_value
-        if values != current_value
+      if default[key][name]
+        current[key] ||= {}
+        current_value = current[key][name]
+        # auto prettify string resources
+        values = clean_up_string values if values.is_a? String
+        values = values.map { |item| clean_up_string item } if values.is_a? Array
+
+        if current_value
+          if values != current_value
+            if values.is_a?(Array) && values.size != current_value.size
+              puts "MERGE CONFLICT for #{name} array in #{locale} locale!\n#{current_value.inspect} vs #{values.inspect}".red
+            else
+              current[key][name] = values
+              stats[key][:updated] += 1
+            end
+          end
+        else
           current[key][name] = values
-          stats[key][:updated] += 1
+          stats[key][:added] += 1
         end
-      else
-        current[key][name] = values
-        stats[key][:added] += 1
       end
     end
   end
 
+  def clean_up_string(value)
+    value.strip.gsub '...', '…'
+  end
+
   def hash_to_doc(source)
     doc = Nokogiri::XML::Document.new
     doc.encoding = 'utf-8'

data/lib/phraseapp_android/version.rb

@@ -1,3 +1,3 @@
 module PhraseappAndroid
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phraseapp_android
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Sergey Glukhov (serggl)