xlocalize 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61201771f44ad4a128294e0ff843d41f532ba3e8
-  data.tar.gz: 2a454a61c22769540216deccd8997aadcf037639
+  metadata.gz: ae37aab6a0d88d19503863c88fba6781572be6e0
+  data.tar.gz: 7bad4314a85fc60fba671d3d112927e1c0903804
 SHA512:
-  metadata.gz: ee6f7f181d6bf06a2c93b1b6d010501213dfb2f2b4678a014437404220a37cb344484bd6f15e072dc31625fbd3e8448e3e632a1010158f3c34dc05e287e086d2
-  data.tar.gz: f553da3f3b20f336a1289b8b3202fed0d31949e4405ca343066a6153a1512c96df62d649639abb91e03b445cc51326ae641ff99ca31fcc877ccc6cacf098dd5c
+  metadata.gz: d5697b57687f2229fbcfd7e03c735cd61de0afd61f8d5602e79560a5bad1b6e90564dd8f2123d89ed7e9c4c287fe67206628508593617f08208310802a4b511e
+  data.tar.gz: 70537aa2952e423b8bb8073f422b93a12d4441876bbc84bde3e20e82ca3142738a86cc85da45f9c50475ca85c32ef43ab59d14372740a118bf85061bf7b858c1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [v0.5.0](https://github.com/viktorasl/xlocalize/releases/tag/0.5.0)
+
+* [cb03ba3](https://github.com/viktorasl/xlocalize/commit/cb03ba3a91c3b4218fd880b50c7b9f2fff113573) Translations import revamp
+* [bb768a4](https://github.com/viktorasl/xlocalize/commit/bb768a45111519d6797bc38c1a31aed87499d6c9) Not overriding translations on export to WebtranslateIt
+
 ## [v0.4.1](https://github.com/viktorasl/xlocalize/releases/tag/0.4.1)
 
 * [5be2948](https://github.com/viktorasl/xlocalize/commit/5be2948bbe5a4c1867a9780f122778f2dcd3b1a4) Unescapes xliff files on export

data/lib/xlocalize/executor.rb

@@ -1,9 +1,11 @@
 require 'xlocalize/webtranslateit'
 require 'xlocalize/xliff'
 require 'xlocalize/helper'
+require 'xlocalize/importer'
 require 'colorize'
 require 'nokogiri'
 require 'yaml'
+require 'apfel'
 
 module Xlocalize
   class Executor
@@ -137,35 +139,30 @@ module Xlocalize
       return name
     end
 
-    def import_xliff(locale, allows_missing_files)
-      fname = "#{locale}.xliff"
+    def import_xliff(fname)
       puts "Importing translations from #{fname}" if $VERBOSE
       Nokogiri::XML(File.open(fname)).xpath("//xmlns:file").each do |node|
-        tr_fname = localized_filename(node["original"], locale)
-        if !File.exist?(tr_fname)
-          err = "Missing #{tr_fname} file"
-          raise err if !allows_missing_files
-          puts err.yellow if $VERBOSE
-          next
-        end
-        File.open(tr_fname, "w") do |file|
-          (node > "body > trans-unit").each do |trans_unit|
-            key = trans_unit["id"]
-            target = (trans_unit > "target").text
-            note = (trans_unit > "note").text
-            note = "(No Commment)" if note.length <= 0
-            
-            file.write "/* #{note} */\n"
-            file.write "\"#{key}\" = #{target.inspect};\n\n"
-          end
-        end
+        tr_fname = node["original"]
+        source_lang = node["source-language"]
+        target_lang = node["target-language"]
+        
+        localized_src_fname = localized_filename(tr_fname, source_lang)
+        next if !File.exist?(localized_src_fname)
+
+        translations_hash = Apfel.parse(localized_src_fname).to_hash
+        importer = Importer.new
+        importer.translate_from_node(translations_hash, node)
+
+        f_content = importer.strings_content_from_translations_hash(translations_hash)
+        target_fname = localized_filename(tr_fname, target_lang)
+        File.open(target_fname, 'w') { |f| f.write(f_content) }
       end
     end
 
     def import_plurals_if_needed(locale)
       plurals_fname = "#{locale}_plurals.yaml"
       return if !File.exist?(plurals_fname)
-      puts "Importing translations from #{plurals_fname}"
+      puts "Importing translations from #{plurals_fname}" if $VERBOSE
       plurals_yml = YAML.load_file(plurals_fname)
       plurals_yml[locale].each do |original_fname, trans_units|
         content = ''
@@ -205,7 +202,7 @@ module Xlocalize
     def import(locales, allows_missing_files=false)
       puts 'Importing translations' if $VERBOSE
       locales.each do |locale|
-        import_xliff(locale, allows_missing_files)
+        import_xliff("#{locale}.xliff")
         import_plurals_if_needed(locale)
         puts "Done #{locale}".green if $VERBOSE
       end

data/lib/xlocalize/importer.rb

@@ -0,0 +1,27 @@
+
+module Xlocalize
+  class Importer
+
+    def strings_content_from_translations_hash(translations_hash)
+      result = StringIO.new
+      translations_hash.each do |key, translations|
+        translations.each do |target, note|
+          result << "/* #{note} */\n" if note.length > 0
+          result << "\"#{key}\" = #{target.inspect};\n\n"
+        end
+      end
+      return result.string
+    end
+
+    def translate_from_node(translations, node)
+      (node > "body > trans-unit").each do |trans_unit|
+        key = trans_unit["id"]
+        target = (trans_unit > "target").text
+        note = (trans_unit > "note").text
+        if translations.key?(key)
+          translations[key] = { target => note }
+        end
+      end
+    end
+  end
+end

data/lib/xlocalize/version.rb

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

data/lib/xlocalize/webtranslateit.rb

@@ -40,18 +40,18 @@ module Xlocalize
       return resp
     end
 
-    def master_file_for_locale_request(file_id, file, override)
+    def master_file_for_locale_request(file_id, file)
       # /api/projects/:project_token/files/:master_project_file_id/locales/:locale_code [PUT]
       return Net::HTTP::Put::Multipart.new("/api/projects/#{@key}/files/#{file_id}/locales/#{@source_locale}", {
         "file" => UploadIO.new(file, "text/plain", file.path),
-        "merge" => !override,
+        "merge" => true,
         "ignore_missing" => true,
         "label" => "",
         "low_priority" => false
       })
     end
 
-    def push_master_plurals(plurals_file, override = true)
+    def push_master_plurals(plurals_file)
       if @plurals_file_id.nil?
         if $VERBOSE
           $stderr.puts 'Creating plurals file'
@@ -66,16 +66,16 @@ module Xlocalize
         if $VERBOSE
           $stderr.puts 'Updating plurals file'
         end
-        send_request(master_file_for_locale_request(@plurals_file_id, plurals_file, override))
+        send_request(master_file_for_locale_request(@plurals_file_id, plurals_file))
       end
     end
 
-    def push_master(file, plurals_file, override = true)
+    def push_master(file, plurals_file)
       if $VERBOSE
         $stderr.puts 'Updating xliff file'
       end
-      send_request(master_file_for_locale_request(@xliff_file_id, file, override))
-      push_master_plurals(plurals_file, override) if not plurals_file.nil?
+      send_request(master_file_for_locale_request(@xliff_file_id, file))
+      push_master_plurals(plurals_file) if not plurals_file.nil?
     end
 
     def pull(locale)

data/xlocalize.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'colorize', '~> 0.8'
   spec.add_runtime_dependency 'multipart-post', '~> 2.0'
   spec.add_runtime_dependency 'plist', '~> 3.2'
+  spec.add_runtime_dependency 'apfel'
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rspec', '~> 3.5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlocalize
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Viktoras Laukevičius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-06 00:00:00.000000000 Z
+date: 2018-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: apfel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +175,7 @@ files:
 - lib/xlocalize.rb
 - lib/xlocalize/executor.rb
 - lib/xlocalize/helper.rb
+- lib/xlocalize/importer.rb
 - lib/xlocalize/version.rb
 - lib/xlocalize/webtranslateit.rb
 - lib/xlocalize/xliff.rb