xlocalize 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e769ae9ea466eac3b9a343ce2e7583e3c8e0d8c
-  data.tar.gz: a7ac50fb19af682e46347139fc466aaaacee47ed
+  metadata.gz: 934cb7077c838252617fce8f0583847eff82aedd
+  data.tar.gz: 85ef3055860a34de3e9ccb33634b9110c2af1762
 SHA512:
-  metadata.gz: bf16efc0ad633adb1bd34c0364d724c905fe59a30ad1d5d39ca406e647b9b407095ea6bfa980c5e827fa096a121aff77902c6148e4f5544dbf016cb1849aa065
-  data.tar.gz: f0f9d990697113327a4ec9a410dad15ee84688e9f07a69c082e8221d03e64b8273200cb14efb158ff092aaf69130bd21275cbce4c6c11717f5ece233b4bba7f4
+  metadata.gz: 5d21bc3c534b8523c1188af30ea7323c5f2936271ad5351e0fc2f2fc46b3db868ee8acc1f6461fbced3ea891e308973035a28daae473b2d41219c0cc1d98ffed
+  data.tar.gz: 86723f67f6ef7062d159cfe6b368a52348aa174925ccf525e4cbdf484f3ec4001d7ba751045073f4af50b2434eefcaa7ea6ce548c435bbb759ffc3ddce569958

data/lib/xlocalize/executor.rb

@@ -2,7 +2,6 @@ require 'xlocalize/webtranslateit'
 require 'xlocalize/xliff'
 require 'colorize'
 require 'nokogiri'
-require 'plist'
 require 'yaml'
 
 module Xlocalize
@@ -91,7 +90,6 @@ module Xlocalize
     def download(wti, locales)
       begin
         locales.each do |locale|
-          puts "Downloading translations for #{locale}"
           translations = wti.pull(locale)
           
           out_list_of_translations_of_locale(wti, locale, translations).each do |out|
@@ -106,7 +104,7 @@ module Xlocalize
       end
     end
 
-    def filename_from_xliff_provided_filename(file_name, locale)
+    def localized_filename(file_name, locale)
       parts = file_name.split('/')
       name = ""
       parts.each_with_index do |part, idx|
@@ -114,8 +112,9 @@ module Xlocalize
         if part.end_with?(".lproj")
           name += "#{locale}.lproj"
         elsif idx+1 == parts.count
+          extension = (part.split('.')[1] == 'stringsdict') ? 'stringsdict' : 'strings'
           # TODO: join all parts till the last '.'
-          name += "#{part.split('.')[0]}.strings"
+          name += "#{part.split('.')[0]}.#{extension}"
         else
           name += part
         end
@@ -124,8 +123,10 @@ module Xlocalize
     end
 
     def import_xliff(locale)
-      Nokogiri::XML(open("#{locale}.xliff")).xpath("//xmlns:file").each do |node|
-        File.open(filename_from_xliff_provided_filename(node["original"], locale), "w") do |file|
+      fname = "#{locale}.xliff"
+      puts "Importing translations from #{fname}"
+      Nokogiri::XML(open(fname)).xpath("//xmlns:file").each do |node|
+        File.open(localized_filename(node["original"], locale), "w") do |file|
           (node > "body > trans-unit").each do |trans_unit|
             key = trans_unit["id"]
             target = (trans_unit > "target").text
@@ -142,19 +143,40 @@ module Xlocalize
     def import_plurals_if_needed(locale)
       plurals_fname = "#{locale}_plurals.yaml"
       return if !File.exist?(plurals_fname)
+      puts "Importing translations from #{plurals_fname}"
       plurals_yml = YAML.load_file(plurals_fname)
-      plurals_yml[locale].each do |fname, trans_units|
-        content = {}
-        trans_units.each do |key, vals|
-          content[key] = {
-            "NSStringLocalizedFormatKey" => "%\#@value@",
-            "value" => vals.merge({
-              "NSStringFormatSpecTypeKey" => "NSStringPluralRuleType",
-              "NSStringFormatValueTypeKey" => "d"
-            })
-          }
+      plurals_yml[locale].each do |original_fname, trans_units|
+        content = ''
+        content << '<?xml version="1.0" encoding="UTF-8"?>' + "\n"
+        content << '<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">' + "\n"
+        content << '<plist version="1.0">' + "\n"
+
+        fname = localized_filename(original_fname, locale)
+        content << "<dict>\n"
+        trans_units.each do |key, element|
+          content << "\t<key>#{key}</key>\n"
+          content << "\t<dict>\n"
+
+          content << "\t\t<key>NSStringLocalizedFormatKey</key>\n"
+          content << "\t\t<string>%\#@value@</string>\n"
+          content << "\t\t<key>value</key>\n"
+          content << "\t\t<dict>\n"
+          element.each do |k, v|
+            content << "\t\t\t<key>#{k}</key>\n"
+            content << "\t\t\t<string>#{v}</string>\n"
+          end
+          content << "\t\t\t<key>NSStringFormatSpecTypeKey</key>\n"
+          content << "\t\t\t<string>NSStringPluralRuleType</string>\n"
+          content << "\t\t\t<key>NSStringFormatValueTypeKey</key>\n"
+          content << "\t\t\t<string>d</string>\n"
+          content << "\t\t</dict>\n"
+
+          content << "\t</dict>\n"
         end
-        File.open(fname, 'w') { |f| f.write content.to_plist }
+        content << "</dict>\n"
+        content << "</plist>\n"
+
+        File.open(fname, 'w') { |f| f.write content }
       end
     end
 

data/lib/xlocalize/version.rb

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

data/xlocalize.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'nokogiri', '= 1.6'
   spec.add_runtime_dependency 'commander', '~> 4.4'
   spec.add_runtime_dependency 'colorize', '~> 0.8'
-  spec.add_runtime_dependency 'plist', '~> 3.2'
   spec.add_runtime_dependency 'multipart-post', '~> 2.0'
 
   spec.add_development_dependency 'bundler', '~> 1.10'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlocalize
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Viktoras Laukevičius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-03 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: plist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: multipart-post
   requirement: !ruby/object:Gem::Requirement