i18n-translators-tools 0.2.4 → 0.2.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ec3d676d4b73931620ae4f14fda0380befb5e274
+  data.tar.gz: 43843b3512f6d599bff966fef2bc9609d15013c1
+SHA512:
+  metadata.gz: f8e345b907b4a1fd80758e97b279b075c68ff9c207844f6fcc0aa9897b281ce28b7bb385cab864eae1db2f5d0a73c97a04e9346d96e9bcc5d5d45bafff730267
+  data.tar.gz: e371e8bfbf1b3b3b096a17f9f2a6564223bd81af903bd8221b2103efa677a639cffe24c3f99ab0949ca933060081112fe377a3ed672586d8d3b8aa527d9e8e45

data/Rakefile

@@ -2,10 +2,10 @@
 # vi: fenc=utf-8:expandtab:ts=2:sw=2:sts=2
 # 
 # @author: Petr Kovar <pejuko@gmail.com>
-$KCODE='UTF8'
+$KCODE='UTF8' if RUBY_VERSION < "1.9"
 
 require 'rake/testtask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rake/clean'
 
 CLEAN << "coverage" << "pkg" << "README.html" << "CHANGELOG.html" << '*.rbc'
@@ -16,7 +16,7 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
-Rake::GemPackageTask.new(eval(File.read("i18n-translators-tools.gemspec"))) {|pkg|}
+Gem::PackageTask.new(eval(File.read("i18n-translators-tools.gemspec"))) {|pkg|}
 
 desc "Test with rcov"
 task :rcov do |t| 

data/bin/i18n-translate

@@ -4,7 +4,7 @@
 # 
 # @author: Petr Kovar <pejuko@gmail.com>
 
-$KCODE="UTF8"
+$KCODE="UTF8" if RUBY_VERSION < "1.9"
 
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
 
@@ -20,7 +20,7 @@ def print_help
   convert     -- convert from -f format to -c format
   strip       -- throw away translation metadata from locales and makes them
                  compatible again with I18n::Backend::Simple
-  translate   -- simple console translator; --language must be set
+  translate   -- simple console translator; --locale must be set
 
 
 options:
@@ -90,7 +90,7 @@ rescue
 end
 
 require 'i18n'
-require 'i18n-translate'
+require 'i18n-translators-tools'
 
 
 # converts from one file format to another
@@ -216,7 +216,7 @@ opts.each do |opt, val|
     end
     tmp[optkey] = val
   when :deep
-    tmp[optkey] = val
+    tmp[optkey] = true
   when :hard
     tmp[:merge] = "hard"
   when :verbose

data/i18n-translators-tools.gemspec

@@ -13,7 +13,7 @@ spec = Gem::Specification.new do |s|
   s.email = "pejuko@gmail.com"
   s.authors = ["Petr Kovar"]
   s.name = 'i18n-translators-tools'
-  s.version = '0.2.4'
+  s.version = '0.2.5'
   s.date = Time.now.strftime("%Y-%m-%d")
   s.add_dependency('i18n', '>= 0.5.0')
   s.add_dependency('ya2yaml')
@@ -52,21 +52,9 @@ Functions:
   * statistics
 
 Changelog:
-  v0.2.1
-    * fix: I18n::Backend::Translate now returns nil if translation is empty
-      string (this allows fallbacks)
-
-  v0.2.2
-    * fix: don't merge if default file doesn't exist (locale stays untouched)
-    * fix: for default format autodetection works again
-    * merge can be more verbose
-
-  v0.2.3
-    * fix: hash_to_keys can work with enhanced format => default can be in
-      enchanced format
-    * default file can be now in enhanced format. if translation field is missing
-    * i18n-translate <source file> <target file>
-      automaticlay perform convert action from one file to another
+  v0.2.5
+    * fix recursive directory scan (-r and --deep options should work now)
+    * enables usage require 'i18n-translators-tools'
 
   v0.2.4
     * enhanced support for java properties
@@ -75,7 +63,23 @@ Changelog:
     * processors now generate keys list from provided data and not from @tr.default
     * flag obsolete added
     * delete function
-    * i18n-0.5.0 compatibility (for older i18n user v0.2.3)
+    * i18n-0.5.0 compatibility
+
+
+  v0.2.3
+    * fix: hash_to_keys can work with enhanced format => default can be in
+      enhanced format
+    * default file can be now in enhanced format. if translation field is missing
+      in default file then field default is used instead
+    * i18n-translate <source file> <target file>
+      automaticlay perform convert action from one file to another
+
+
+  v0.2.2
+    * fix: don't merge if default file doesn't exist
+    * fix: for default format autodetection works again
+    * merge can be more verbose
+
 
 For more information read README.md and CHANGELOG.md
 

data/lib/i18n-translators-tools.rb

@@ -0,0 +1,4 @@
+dir = File.expand_path(File.dirname(__FILE__))
+$:.unshift(dir) unless $:.include?(dir)
+
+require 'i18n-translate'

data/lib/i18n/backend/translate.rb

@@ -21,7 +21,7 @@ module I18n
         result = super(locale, key, options)
         return nil if result.kind_of?(String) and result.empty?
         return result unless result.kind_of?(Hash)
-        return nil unless result[:t] or result[:translation] or result[:default]
+        return result unless result[:t] or result[:translation] or result[:default]
 
         tr = result[:translation] || result[:t]
         tr = result[:default] if tr.to_s.empty?

data/lib/i18n/processor/gettext.rb

@@ -110,19 +110,19 @@ module I18n::Translate::Processor
         I18n::Translate.set(key, entry, hash, @translate.options[:separator])
       end
 
-      {@translate.lang => hash}
+      {@lang => hash}
     end
 
 
     def export(data)
-      target = data[@translate.lang]
+      target = data[@lang]
       str = ""
       keys = I18n::Translate.hash_to_keys(target).sort
 
       str << %~msgid ""\n~
       str << %~msgstr ""\n~
       str << %~"Content-Type: text/plain; charset=#{@translate.options[:encoding]}\\n"\n~
-      str << %~"X-Language: #{@translate.lang}\\n"\n~
+      str << %~"X-Language: #{@lang}\\n"\n~
       keys.each do |key|
         entry = [""]
         value = @translate.find(key, target)

data/lib/i18n/processor/properties.rb

@@ -20,6 +20,8 @@ module I18n::Translate::Processor
     def import(data)
       hash = {}
 
+      sep = @translate.options[:separator]
+      plus_key = sep+"translation"
       key = nil
       value = nil
       status = :first
@@ -42,20 +44,20 @@ module I18n::Translate::Processor
         # end of continuous string
         elsif line[%r{^(?:#{WHITE_SPACE})*#{VALUE_END}$}] and (status == :inside)
           value << $1.to_s.strip
-          I18n::Translate.set(uninspect(key), uninspect(value), hash, @translate.options[:separator])
+          I18n::Translate.set(uninspect(key)+plus_key, uninspect(value), hash, sep)
           value = nil
           status = :first
 
         # simple key = value
         elsif line[%r{#{KEY}#{ASSIGN}#{VALUE}}]
           key, value = $1.to_s.strip, $2.to_s.strip
-          I18n::Translate.set(uninspect(key), uninspect(value), hash, @translate.options[:separator])
+          I18n::Translate.set(uninspect(key)+plus_key, uninspect(value), hash, sep)
 
          # empty key
-        elsif line[/#{KEY}$/]
+        elsif line[/#{KEY}\s*/]
           key = $1.to_s.strip
           value = ""
-          I18n::Translate.set(uninspect(key), uninspect(value), hash, @translate.options[:separator])
+          I18n::Translate.set(uninspect(key)+plus_key, uninspect(value), hash, sep)
         else
           puts "*** not match: '#{line}'"
         end
@@ -66,7 +68,8 @@ module I18n::Translate::Processor
 
     # this export ignores data
     def export(data)
-      target = data[@translate.lang]
+      sep = @translate.options[:separator]
+      target = data[@lang]
       str = ""
       keys = I18n::Translate.hash_to_keys(target).sort
 
@@ -82,8 +85,11 @@ module I18n::Translate::Processor
           entry = value["translation"].to_s
         end
 
+        k = key
+        k = $1 if k =~ /(.*)#{Regexp.escape sep}translation$/
+
         # create record in format: key = value
-        str << key.gsub(/( |:|=)/){|m| "\\#{m}"} << " = " << entry.gsub("\n", "\\n") << "\n"
+        str << k.gsub(/( |:|=)/){|m| "\\#{m}"} << " = " << entry.gsub("\n", "\\n") << "\n"
       end
 
       str

data/lib/i18n/translate.rb

@@ -250,6 +250,9 @@ module I18n::Translate
       raise "Translate#[key]: wrong key '#{key}'" unless d
 
       entry = {"key" => key, "default" => d}
+      if d.kind_of? Hash
+        entry["default"] = d["translation"] || d["t"] || d["default"]
+      end
       
       # translation doesn't exist
       trg = I18n::Translate.find(key, @target, @options[:separator])

data/test/all.rb

@@ -3,7 +3,7 @@
 # 
 # @author: Petr Kovar <pejuko@gmail.com>
 #
-$KCODE='UTF8'
+$KCODE='UTF8' if RUBY_VERSION < "1.9"
 
 require 'test/unit'
 require 'rubygems'

data/test/tc_backend_translate.rb

@@ -13,4 +13,7 @@ class TestBackendTranslate < Test::Unit::TestCase
 
   include I18n::Test::Backend
 
+  def test_1000_returns_hash
+    assert_equal( {:interpolation=>"Interpolated text '%{var}'"}, I18n.t("extended", :locale => "default") )
+  end
 end

data/test/tc_processor_properties.rb

@@ -19,7 +19,7 @@ class TestProcessorProperties < Test::Unit::TestCase
     data = data['cze']
     str = "Interpolovaný text '%{var}'"
     #diff(str, data["extended"]["interpolation"])
-    assert_equal( str, data["extended"]["interpolation"] )
+    assert_equal( str, data["extended"]["interpolation"]["translation"] )
   end
 
   def test_0020_write

metadata

@@ -1,50 +1,43 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: i18n-translators-tools
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 4
-  version: 0.2.4
+version: !ruby/object:Gem::Version
+  version: 0.2.5
 platform: ruby
-authors: 
+authors:
 - Petr Kovar
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-29 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-04-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: i18n
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ya2yaml
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: ya2yaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   This package brings you useful utility and library which can help you to handle
   locale files and translations in your Ruby projects.
@@ -54,75 +47,72 @@ description: |
   simple console editor. Supported formats are YAML, Ruby, Gettext po,
   QT Linguist TS and Java Properties. Read README.md file and run i18n-translate
   without parameters for more information.
-
 email: pejuko@gmail.com
-executables: 
+executables:
 - i18n-translate
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- bin/i18n-translate
+files:
 - README.md
-- i18n-translators-tools.gemspec
 - Rakefile
-- lib/i18n/translator.rb
+- bin/i18n-translate
+- i18n-translators-tools.gemspec
+- lib/i18n-translate.rb
+- lib/i18n-translators-tools.rb
 - lib/i18n/backend/po.rb
 - lib/i18n/backend/properties.rb
-- lib/i18n/backend/ts.rb
 - lib/i18n/backend/translate.rb
-- lib/i18n/processor/properties.rb
-- lib/i18n/processor/ts.rb
+- lib/i18n/backend/ts.rb
+- lib/i18n/processor.rb
+- lib/i18n/processor/gettext.rb
 - lib/i18n/processor/gettext_strscan.rb
+- lib/i18n/processor/properties.rb
 - lib/i18n/processor/ruby.rb
+- lib/i18n/processor/ts.rb
 - lib/i18n/processor/yaml.rb
-- lib/i18n/processor/gettext.rb
 - lib/i18n/translate.rb
-- lib/i18n/processor.rb
-- lib/i18n-translate.rb
-- test/tc_processor_properties.rb
-- test/tc_processor.rb
-- test/locale/src/cze.rb
-- test/backend.rb
-- test/tc_i18n-translate.rb
-- test/tc_backend_ts.rb
-- test/tc_processor_yaml.rb
-- test/tc_processor_ruby.rb
+- lib/i18n/translator.rb
 - test/all.rb
+- test/backend.rb
+- test/locale/src/cze.po
+- test/locale/src/cze.rb
+- test/locale/src/cze.yml
+- test/locale/src/deep/cze.yml
+- test/locale/src/deep/default.yml
+- test/locale/src/deep/eng.yml
+- test/locale/src/default.yml
+- test/processor.rb
 - test/tc_backend_po.rb
-- test/tc_processor_gettext.rb
+- test/tc_backend_properties.rb
 - test/tc_backend_ruby.rb
 - test/tc_backend_translate.rb
-- test/tc_processor_ts.rb
-- test/processor.rb
+- test/tc_backend_ts.rb
 - test/tc_backend_yaml.rb
-- test/tc_backend_properties.rb
+- test/tc_i18n-translate.rb
+- test/tc_processor.rb
+- test/tc_processor_gettext.rb
+- test/tc_processor_properties.rb
+- test/tc_processor_ruby.rb
+- test/tc_processor_ts.rb
+- test/tc_processor_yaml.rb
 - test/tc_translate.rb
-- test/locale/src/cze.yml
-- test/locale/src/default.yml
-- test/locale/src/deep/cze.yml
-- test/locale/src/deep/eng.yml
-- test/locale/src/deep/default.yml
-- test/locale/src/cze.po
-has_rdoc: true
 homepage: http://github.com/pejuko/i18n-translators-tools
 licenses: []
-
+metadata: {}
 post_install_message: |
   =============================================================================
-  
+
   I18N TRANSLATORS TOOLS
-  
+
   -----------------------------------------------------------------------------
-  
+
   Supported formats:
     * yml
     * rb
     * ts
     * po
     * properties
-  
+
   Backends:
     * Extended format. i18n-translators-tools brings extended format
       I18n::Backend::Simple.send(:include, I18n::Backend::Translate)
@@ -132,30 +122,18 @@ post_install_message: |
       I18n::Backend::Simple.send(:include, I18n::Backend::TS)
     * Java Properties files
       I18n::Backend::Simple.send(:include, I18n::Backend::Properties)
-  
+
   Functions:
     * merge
     * convert
     * translate (built-in simple console translator)
     * statistics
-  
+
   Changelog:
-    v0.2.1
-      * fix: I18n::Backend::Translate now returns nil if translation is empty
-        string (this allows fallbacks)
-  
-    v0.2.2
-      * fix: don't merge if default file doesn't exist (locale stays untouched)
-      * fix: for default format autodetection works again
-      * merge can be more verbose
-  
-    v0.2.3
-      * fix: hash_to_keys can work with enhanced format => default can be in
-        enchanced format
-      * default file can be now in enhanced format. if translation field is missing
-      * i18n-translate <source file> <target file>
-        automaticlay perform convert action from one file to another
-  
+    v0.2.5
+      * fix recursive directory scan (-r and --deep options should work now)
+      * enables usage require 'i18n-translators-tools'
+
     v0.2.4
       * enhanced support for java properties
       * hard/soft merges. hard deletes deleted keys in target and soft set them to
@@ -163,42 +141,48 @@ post_install_message: |
       * processors now generate keys list from provided data and not from @tr.default
       * flag obsolete added
       * delete function
-      * i18n-0.5.0 compatibility (for older i18n user v0.2.3)
-  
+      * i18n-0.5.0 compatibility
+
+
+    v0.2.3
+      * fix: hash_to_keys can work with enhanced format => default can be in
+        enhanced format
+      * default file can be now in enhanced format. if translation field is missing
+        in default file then field default is used instead
+      * i18n-translate <source file> <target file>
+        automaticlay perform convert action from one file to another
+
+
+    v0.2.2
+      * fix: don't merge if default file doesn't exist
+      * fix: for default format autodetection works again
+      * merge can be more verbose
+
+
   For more information read README.md and CHANGELOG.md
-  
+
   -----------------------------------------------------------------------------
-  
+
   http://github.com/pejuko/i18n-translators-tools
-  
-  =============================================================================
 
+  =============================================================================
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.4.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: I18n translation utility which helps to manage files with locales.
 test_files: []
-