xlocalize 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae37aab6a0d88d19503863c88fba6781572be6e0
-  data.tar.gz: 7bad4314a85fc60fba671d3d112927e1c0903804
+  metadata.gz: fa7fbd8d30e2a08b01bb26ce46700e69b71933a7
+  data.tar.gz: 1154a3d87abef4595417e4810fcd5664bc6c2dc9
 SHA512:
-  metadata.gz: d5697b57687f2229fbcfd7e03c735cd61de0afd61f8d5602e79560a5bad1b6e90564dd8f2123d89ed7e9c4c287fe67206628508593617f08208310802a4b511e
-  data.tar.gz: 70537aa2952e423b8bb8073f422b93a12d4441876bbc84bde3e20e82ca3142738a86cc85da45f9c50475ca85c32ef43ab59d14372740a118bf85061bf7b858c1
+  metadata.gz: 480ca68941c6fea0bf101adf2f276f5644147600772b40a68f54a45306770cedd6b59f99a90c925778666bf86ac45b59fa6d3585675f7721702e98a49ec58635
+  data.tar.gz: 7faf6415c3a9169ebf396c95cdd535b754f9ea013a6e86f67414d21aed04d8c76747b48828fe4b34bcdfc3df0d04d0e556fe1e08e274d2ae735b2f31259829ce

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [v0.6.0](https://github.com/viktorasl/xlocalize/releases/tag/0.6.0)
+
+* [17ffefc](https://github.com/viktorasl/xlocalize/commit/17ffefcc94272385091cef087e7df18a407897a8) Xliff merging before upload
+
 ## [v0.5.0](https://github.com/viktorasl/xlocalize/releases/tag/0.5.0)
 
 * [cb03ba3](https://github.com/viktorasl/xlocalize/commit/cb03ba3a91c3b4218fd880b50c7b9f2fff113573) Translations import revamp

data/lib/xlocalize/executor.rb

@@ -37,6 +37,11 @@ module Xlocalize
       end
 
       purelyze(master_lang, targets, excl_prefix, project, filer_ui_duplicates=Helper.xcode_at_least?(9.3), exclude_units)
+      if wti then
+        original_doc = Nokogiri::XML(wti.pull(master_lang)['xliff'])
+        Nokogiri::XML(File.open(master_file_name)).merge_on_top_of(original_doc)
+        File.write(master_file_name, original_doc.to_xml)
+      end
       push_master_file(wti, master_lang, master_file_name) if !wti.nil?
     end
 

data/lib/xlocalize/version.rb

@@ -1,4 +1,4 @@
 module Xlocalize
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
   DESCRIPTION = "Xcode localizations import/export helper tool"
 end

data/lib/xlocalize/xliff.rb

@@ -77,5 +77,26 @@ module Xlocalize
           .gsub('\\\\n', '\n')
       end
     end
+
+    def merge_on_top_of(original_doc)
+      #original_doc = Nokogiri::XML(wti.pull(master_lang)['xliff'])
+      original_xliff = original_doc.at_css('xliff')
+      doc = self#Nokogiri::XML(File.open(master_file_name))
+      doc.xpath("//xmlns:file").each { |node|
+        fname = node["original"]
+        original_file = original_doc.at_css('file[original="' << fname << '"] > body')
+        if original_file then
+          node.css('body > trans-unit').each { |unit|
+            key = unit['id']
+            original_unit = original_file.at_css('trans-unit[id="' << key << '"]')
+            if !original_unit then
+              original_file << unit
+            end
+          }
+        else
+          original_xliff << node
+        end
+      }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlocalize
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Viktoras Laukevičius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri