xlocalize 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f18a1267e6b51f35e4ed9744bb3d0fb93aa19350
-  data.tar.gz: d5761da399cbc9057322506902fb6aabe797de8b
+  metadata.gz: 49c020e414aa5935d3d5613c930196af1ccc3b79
+  data.tar.gz: 43048b71638f80dd8ff958d99800bd59af82cc57
 SHA512:
-  metadata.gz: e7239c52d390a97c8dd1b0e9ff0e9943e05a059e7186919b399a6a50aadcb15d3b4272470ad8114d006ce76869ab0e0d85a9bebacaf294771e6b526305188114
-  data.tar.gz: ce3ca40f1c3285255afb7c397994fe47fa69eab9dab68752f3e2cb0509d48fe26a81e15a39916ad8e3550eaf1e398ed4d239f8c659d8e9b9d399913f44b1b4c5
+  metadata.gz: 2a48bd0f91385b7e011f6f7fb3b9d5b1ae643d0bc3e4a84cf9be3dc3773b0a7432917efaccc786cc9c951aafd12b3c45acd9d9391764a8f78e38a9d31595a3ef
+  data.tar.gz: b57cdabfaf66d11ee69a6bd73e06075bf5b135d8e5429ed2793b4ab4bec85160b851f367601a0d94a995c700cb46978cfcbf936788d2e26f43219e8a7df138ee

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [v0.3.2](https://github.com/viktorasl/xlocalize/releases/tag/0.3.2)
+
+* [d081ce2](https://github.com/viktorasl/xlocalize/commit/d081ce2640d7e8997d6d98a7659f31d571103f36) Bumps nokogiri version
+* [8e91f25](https://github.com/viktorasl/xlocalize/commit/8e91f256dd17c9566848abe3a5e1d06ca283f4f7) Deduplicates generated storyboard & xib translation files
+
 ## [v0.3.1](https://github.com/viktorasl/xlocalize/releases/tag/0.3.1)
 
 * [7eb4563](https://github.com/viktorasl/xlocalize/commit/7eb4563456932b72fab0b3579a9d9ed1d5b97f0c) Fixes plurals export on Xcode9 and later

data/lib/xlocalize/executor.rb

@@ -34,7 +34,7 @@ module Xlocalize
         end        
       end
 
-      purelyze(master_lang, targets, excl_prefix, project)
+      purelyze(master_lang, targets, excl_prefix, project, filer_ui_duplicates=Helper.xcode_at_least?(9.3))
       push_master_file(wti, master_lang, master_file_name) if !wti.nil?
     end
 
@@ -55,7 +55,7 @@ module Xlocalize
       end if !wti.nil?
     end
 
-    def purelyze(locale, targets, excl_prefix, project)
+    def purelyze(locale, targets, excl_prefix, project, filer_ui_duplicates=false)
       locale_file_name = locale_file_name(locale)
       doc = Nokogiri::XML(open(locale_file_name))
 
@@ -67,7 +67,11 @@ module Xlocalize
       plurals = doc.filter_plurals(project)
       puts "Removing all files having no trans-unit elements after removal" if $VERBOSE
       doc.filter_empty_files
-
+      if filer_ui_duplicates
+        puts "Filtering duplicate xib & storyboard translation files" if $VERBOSE
+        doc.filter_duplicate_storyboard_xib_files
+      end
+      
       puts "Writing modified XLIFF file to #{locale_file_name}" if $VERBOSE
       File.open(locale_file_name, 'w') { |f| f.write(doc.to_xml) }
       if !plurals.empty?

data/lib/xlocalize/version.rb

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

data/lib/xlocalize/xliff.rb

@@ -55,5 +55,19 @@ module Xlocalize
         node.parent.remove if node.elements.count == 0
       }
     end
+
+    def filter_duplicate_storyboard_xib_files
+      all_files = self.xpath("//xmlns:file").map { |node| Pathname.new(node["original"]).split.last.to_s }
+      self.xpath("//xmlns:file").each do |node|
+        fname = Pathname.new(node["original"]).split.last.to_s
+        if fname.end_with?(".strings")
+          storyboard_fname = fname.sub(".strings", ".storyboard")
+          xib_fname = fname.sub(".strings", ".xib")
+          if all_files.include?(storyboard_fname) || all_files.include?(xib_fname)
+            node.remove
+          end
+        end
+      end
+    end
   end
 end

data/xlocalize.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'nokogiri', '= 1.6'
+  spec.add_runtime_dependency 'nokogiri', '~> 1.8.2'
   spec.add_runtime_dependency 'commander', '~> 4.4'
   spec.add_runtime_dependency 'colorize', '~> 0.8'
   spec.add_runtime_dependency 'multipart-post', '~> 2.0'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: xlocalize
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Viktoras Laukevičius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
@@ -189,4 +189,3 @@ signing_key:
 specification_version: 4
 summary: Xcode localizations import/export helper tool
 test_files: []
-has_rdoc: