i18n-translators-tools 0.2.3 → 0.2.4

data/README.md

@@ -2,7 +2,10 @@ I18n translation and locales management utility
 ===============================================
 
 This package brings you useful utility and library which can help you to handle
-locale files and translations in your Ruby projects.
+locale files and translations in your Ruby projects. It is build upon i18n
+library and extends it's simple format so you can simply track field changes
+or keep translator's notes. Conversion back to simple format is possible and as
+simple as call 'i18n-translate strip'.
 
 
 Interesting features
@@ -11,6 +14,8 @@ Interesting features
 * no database required
 * merging and changes propagation (adding, removing and changed default text)
   keeping default file untouched
+* hard/soft merging (hard deletes extra keys from target, soft set them
+  obsolete; default is soft)
 * creating new locale file based on default file
 * converting from one format to another (yml <=> rb <=> po <=> ts <=> properties)
 * statistics
@@ -275,7 +280,7 @@ New format looks like:
       file: "file parsed from reference"
       line: "line parsed from po reference"
       translation: "translation itself"
-      flag: "one of (ok || incomplete || changed || untranslated)"
+      flag: "one of (ok || incomplete || changed || untranslated || obsolete)"
       fuzzy: true # exists only where flag != ok (nice to have when you want
                     edit files manually)
 

data/Rakefile

@@ -8,7 +8,7 @@ require 'rake/testtask'
 require 'rake/gempackagetask'
 require 'rake/clean'
 
-CLEAN << "coverage" << "pkg" << "README.html" << "CHANGELOG.html"
+CLEAN << "coverage" << "pkg" << "README.html" << "CHANGELOG.html" << '*.rbc'
 
 task :default => [:test, :doc, :gem]
 Rake::TestTask.new(:test) do |t|
@@ -23,6 +23,12 @@ task :rcov do |t|
   system "rcov  --exclude .rvm,lib/ruby --sort coverage --text-summary --text-coverage-diff -o coverage  test/all.rb"
 end
 
+desc "Benchmark processors"
+task :bench do |t|
+  system "ruby benchmark/gettext_scan.rb"
+  system "ruby benchmark/gettext_reg.rb"
+end
+
 begin
   require 'bluecloth'
 
@@ -47,5 +53,5 @@ begin
     build_document("CHANGELOG.md")
   end
 
-rescue
+rescue LoadError
 end

data/bin/i18n-translate

@@ -51,6 +51,8 @@ options:
   --quiet, -q                         -- show less information
   --verbose, -v                       -- shows more information during
                                          locales processing
+  --hard, -h                          -- deletes from target files all missing keys in default
+                                         normaly those keys are kept but flag is set to obsolete
 
 
 CONFIG FILE
@@ -184,7 +186,8 @@ opts = GetoptLong.new(
   ["--encoding", "-e", GetoptLong::REQUIRED_ARGUMENT],
   ["--verbose", "-v", GetoptLong::NO_ARGUMENT],
   ["--quiet", "-q", GetoptLong::NO_ARGUMENT],
-  ["--locale", "-l", GetoptLong::REQUIRED_ARGUMENT]
+  ["--locale", "-l", GetoptLong::REQUIRED_ARGUMENT],
+  ["--hard", "-h", GetoptLong::NO_ARGUMENT]
 )
 
 
@@ -214,6 +217,8 @@ opts.each do |opt, val|
     tmp[optkey] = val
   when :deep
     tmp[optkey] = val
+  when :hard
+    tmp[:merge] = "hard"
   when :verbose
     tmp[:verbose] = true
     tmp[:quiet] = false

data/i18n-translators-tools.gemspec

@@ -13,9 +13,9 @@ spec = Gem::Specification.new do |s|
   s.email = "pejuko@gmail.com"
   s.authors = ["Petr Kovar"]
   s.name = 'i18n-translators-tools'
-  s.version = '0.2.3'
+  s.version = '0.2.4'
   s.date = Time.now.strftime("%Y-%m-%d")
-  s.add_dependency('i18n', '>= 0.4.1')
+  s.add_dependency('i18n', '>= 0.5.0')
   s.add_dependency('ya2yaml')
   s.require_path = 'lib'
   s.files = ["bin/i18n-translate", "README.md", "i18n-translators-tools.gemspec", "Rakefile"]
@@ -37,7 +37,7 @@ Supported formats:
 
 Backends:
   * Extended format. i18n-translators-tools brings extended format
-    I18n::Backend::Simple.send(:include, I18n::Backend::Translator)
+    I18n::Backend::Simple.send(:include, I18n::Backend::Translate)
   * Gettext po
     I18n::Backend::Simple.send(:include, I18n::Backend::PO)
   * QT Linguist TS
@@ -64,9 +64,19 @@ Changelog:
   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.4
+    * enhanced support for java properties
+    * hard/soft merges. hard deletes deleted keys in target and soft set them to
+      obsolete
+    * 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)
+
 For more information read README.md and CHANGELOG.md
 
 -----------------------------------------------------------------------------
@@ -77,10 +87,13 @@ http://github.com/pejuko/i18n-translators-tools
 EOF
   s.description = <<EOF
 This package brings you useful utility and library which can help you to handle
-locale files and translations in your Ruby projects. Offers also built-in 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.
+locale files and translations in your Ruby projects.
+It is build upon i18n library and extends it's simple format so you can simply
+track field changes or keep translator's notes. Conversion back to simple format
+is possible and as simple as call 'i18n-translate strip'. Offers also built-in
+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.
 EOF
 end
 

data/lib/i18n/backend/translate.rb

@@ -8,7 +8,7 @@ module I18n
   module Backend
     # It is highly recommended to use Translator wit Fallback plugin
     #
-    #   I18n::Backend::Simple.send(:include, I18n::Backend::Translator)
+    #   I18n::Backend::Simple.send(:include, I18n::Backend::Translate)
     #   I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
     #
     # notice that Translator have to be included BEFORE Fallback otherwise
@@ -28,7 +28,7 @@ module I18n
 
         return nil if tr.to_s.empty?
 
-        values = options.except(*I18n::Backend::Base::RESERVED_KEYS)
+        values = options.except(*RESERVED_KEYS)
 
         tr = resolve(locale, key, tr, options)
         tr = interpolate(locale, tr, values) if values

data/lib/i18n/processor.rb

@@ -121,7 +121,7 @@ module I18n::Translate
       # converts inspected string back into normal string
       def uninspect(str)
         return nil unless str
-        str.gsub(%r!\\([\\#"abefnrstvx]|u\d{4}|u\{[^\}]+\}|\d{1,3}|x\d{1,2}|cx|C-[a-zA-Z]|M-[a-zA-Z])!) do |m|
+        str.gsub(%r!\\([\\#"abefnrstvx]|u\d{4}|u\{[^\}]+\}|\d{1,3}|x\d{1,2}|cx|C-[a-zA-Z]|M-[a-zA-Z]| |=|:)!) do |m|
           repl = ""
           if ['\\', '#', '"'].include?($1)
             repl = $1

data/lib/i18n/processor/gettext.rb

@@ -117,7 +117,7 @@ module I18n::Translate::Processor
     def export(data)
       target = data[@translate.lang]
       str = ""
-      keys = I18n::Translate.hash_to_keys(@translate.default).sort
+      keys = I18n::Translate.hash_to_keys(target).sort
 
       str << %~msgid ""\n~
       str << %~msgstr ""\n~

data/lib/i18n/processor/gettext_strscan.rb

@@ -0,0 +1,190 @@
+# -*- coding: utf-8 -*-
+# vi: fenc=utf-8:expandtab:ts=2:sw=2:sts=2
+# 
+# @author: Petr Kovar <pejuko@gmail.com>
+
+require 'strscan'
+
+module I18n::Translate::Processor
+
+  class GettextScanner < Template
+    FORMAT = ['po', 'pot']
+
+  protected
+
+    def import(data)
+      hash = {}
+
+      entry = {}
+      key = nil
+      last = nil
+
+
+      s = StringScanner.new(data)
+
+      until s.eos?
+
+        # empty line starts new entry
+        if s.scan /\n\s*\n/
+          if not entry.empty? and key
+            key = entry["default"].dup unless key
+            I18n::Translate.set(key, entry, hash, @translate.options[:separator])
+          end
+          key = last = nil
+          entry = {}
+          next
+        end
+
+        # skip end of line
+        if s.scan /\n/
+          next
+        end
+
+        # comments
+        if s.scan /#/
+          # translator's comment
+          if s.scan %r{\s+}
+            entry["comment"] = s.scan(/.*?$/).to_s.strip
+  
+          # extracted comment
+          elsif s.scan %r{\.\s+}
+            entry["extracted_comment"] = s.scan(/.*?$/).to_s.strip
+  
+          # reference
+          elsif s.scan %r{:\s+}
+            entry["reference"] = s.scan(/.*?$/).to_s.strip
+            if entry["reference"] =~ %r{(.*):(\d+)}
+              entry["file"] = $1.to_s.strip
+              entry["line"] = $2.to_s.strip
+            end
+  
+          # flag
+          elsif s.scan %r{,\s+}
+            flags = s.scan(/.*?$/).split(",").compact.map{|x| x.strip}
+            fuzzy = flags.delete("fuzzy")
+            unless fuzzy
+              entry["flag"] = "ok"
+            else
+              flags.delete_if{|x| not I18n::Translate::FLAGS.include?(x)}
+              entry["flag"] = flags.first unless flags.empty?
+              entry["fuzzy"] = true
+            end
+  
+          # old default
+          elsif s.scan %r{\| msgid\s+"}
+            match = s.scan(%r{.*"$}).to_s[0..-2]
+            entry["old_default"] = match
+            # expect that this entry has no key
+            # if does, will be overwriten later
+            key = entry["old_default"].dup
+          end
+        end # end of scan for comments
+
+        # key (context)
+        if s.scan %r{msgctxt\s+"}
+          key = get_string(s)
+          last = "key"
+
+        # default
+        elsif s.scan %r{msgid\s+"}
+          match = get_string(s)
+          if match.empty?
+            last = "po-header"
+          else
+            last = "default"
+            entry[last] = uninspect(match)
+            key = entry[last].dup unless key
+          end
+
+        # translation
+        elsif s.scan %r{msgstr\s+"}
+          match = get_string(s)
+          last = "translation" unless last == "po-header"
+          entry[last] = uninspect(match)
+
+        # string continuation
+        elsif s.scan %r{"}
+          match = get_string(s)
+          if last == "key"
+            key = "#{key}#{match}"
+          elsif last == "po-header"
+            case match
+            when %r{Content-Type: text/plain; charset=(.*)}
+              enc = uninspect($1.to_s).strip
+              @translate.options[:encoding] = enc unless enc.empty?
+            when %r{X-Language: (.*)}
+              # skip language is set from filename
+            end
+          elsif last
+            entry[last] = "#{entry[last]}#{uninspect(match)}"
+          end
+        end
+      end
+
+      # last line at end of file
+      if not entry.empty? and key
+        I18n::Translate.set(key, entry, hash, @translate.options[:separator])
+      end
+
+      {@translate.lang => hash}
+    end
+
+
+    def export(data)
+      target = data[@translate.lang]
+      str = ""
+      keys = I18n::Translate.hash_to_keys(@translate.default).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~
+      keys.each do |key|
+        entry = [""]
+        value = @translate.find(key, target)
+        next unless value
+
+        if value.kind_of?(String)
+          # leave out msgctxt if using po strings as a key
+          default = @translate.find(key, @translate.default)
+          entry << %~msgctxt #{key.inspect}~ if key != default
+          entry << %~msgid #{default.to_s.inspect}~
+          entry << %~msgstr #{value.to_s.inspect}~
+        else
+          entry << %~#  #{value["comment"].to_s.strip}~ unless value["comment"].to_s.strip.empty?
+          entry << %~#. #{value["extracted_comment"].to_s.strip}~ unless value["extracted_comment"].to_s.strip.empty?
+          if not value["reference"].to_s.strip.empty?
+            entry << %~#: #{value["reference"].to_s.strip}~
+          elsif value["file"] or value["line"]
+            entry << %~#: #{value["file"].to_s.strip}:#{value["line"].to_s.strip}~
+          end
+          key_default = nil
+          key_default = value["default"] if value["default"] == key
+          key_default = value["old_default"] if value["old_default"] == key
+          flags = []
+          flags << "fuzzy" if (not value["flag"].nil?) and (value["flag"] != "ok")
+          flags << value["flag"] unless value["flag"].to_s.strip.empty?
+          entry << %~#, #{flags.join(", ")}~ unless flags.empty?
+          entry << %~#| msgid #{value["old_default"].to_s.inspect}~ unless value["old_default"].to_s.empty?
+          entry << %~msgctxt #{key.inspect}~ if key != key_default
+          entry << %~msgid #{value["default"].to_s.inspect}~
+          entry << %~msgstr #{value["translation"].to_s.inspect}~
+        end
+
+        entry << ""
+
+        str << entry.join("\n")
+      end
+
+      str
+    end
+
+    private
+
+    def get_string scanner
+      scanner.scan(%r{.*?"$}).to_s[0..-2]
+    end
+
+  end
+
+end

data/lib/i18n/processor/properties.rb

@@ -8,6 +8,13 @@ module I18n::Translate::Processor
   class Properties < Template
     FORMAT = ['properties']
 
+    WHITE_SPACE = / |\n|\t|\f|\r|\\u0020|\\u0009|\\u000C/
+    ASSIGN = /(?:#{WHITE_SPACE})*?(?:=|:)(?:#{WHITE_SPACE})*/
+    KEY = /^((?:[^\\:=]|\\:|\\=|\\ )+?)/m
+    VALUE_MULTILINE = /(.*?(?:\\\\)*)\\$/
+    VALUE = /(.*?(?:\\\\)*$)/
+    VALUE_END = /([^=]+?(?:\\\\)*$)/
+
   protected
 
     def import(data)
@@ -15,44 +22,53 @@ module I18n::Translate::Processor
 
       key = nil
       value = nil
+      status = :first
       line_number = 0
       data.each_line do |line|
         line_number += 1
-        # skip empty line and comments
-        next if (line =~ %r{^\s*$}) or (line =~ %r{^#.*})
+        # skip empty line and comments (first non white character is # or !)
+        next if (line =~ %r{^(#{WHITE_SPACE})*$}) or (line =~ %r{^(#{WHITE_SPACE})*(#|!).*})
         
-        case line
         # multiline string
-        when %r{^([^=]+)\s*=\s*(.*)\\$}
-          key = $1.to_s.strip
-          value = $2.to_s.strip
+        if line[%r{#{KEY}#{ASSIGN}#{VALUE_MULTILINE}}] and (status == :first)
+          status = :inside
+          key = $1.to_s
+          value = $2.to_s
 
         # continuous multiline string
-        when %r{^\s*([^=]+)\\$}
-          value << $1.to_s.strip
+        elsif line[%r{^(?:#{WHITE_SPACE})*#{VALUE_MULTILINE}}] and (status == :inside)
+          value << $1.to_s
 
         # end of continuous string
-        when %r{^\s*([^=]+)$}
+        elsif line[%r{^(?:#{WHITE_SPACE})*#{VALUE_END}$}] and (status == :inside)
           value << $1.to_s.strip
-          I18n::Translate.set(key, uninspect(value), hash, @translate.options[:separator])
+          I18n::Translate.set(uninspect(key), uninspect(value), hash, @translate.options[:separator])
           value = nil
+          status = :first
 
         # simple key = value
-        when %r{^([^=]+)\s*=\s*(.*)$}
+        elsif line[%r{#{KEY}#{ASSIGN}#{VALUE}}]
           key, value = $1.to_s.strip, $2.to_s.strip
-          I18n::Translate.set(key, uninspect(value), hash, @translate.options[:separator])
+          I18n::Translate.set(uninspect(key), uninspect(value), hash, @translate.options[:separator])
+
+         # empty key
+        elsif line[/#{KEY}$/]
+          key = $1.to_s.strip
+          value = ""
+          I18n::Translate.set(uninspect(key), uninspect(value), hash, @translate.options[:separator])
+        else
+          puts "*** not match: '#{line}'"
         end
       end
 
       {@lang => hash}
     end
 
-
     # this export ignores data
     def export(data)
       target = data[@translate.lang]
       str = ""
-      keys = I18n::Translate.hash_to_keys(@translate.default).sort
+      keys = I18n::Translate.hash_to_keys(target).sort
 
       keys.each do |key|
         value = @translate.find(key, target)
@@ -61,13 +77,13 @@ module I18n::Translate::Processor
 
 
         if value.kind_of?(String)
-          entry = value.strip
+          entry = value
         else
-          entry = value["translation"].to_s.strip
+          entry = value["translation"].to_s
         end
 
         # create record in format: key = value
-        str << key << " = " << entry.gsub("\n", "\\n") << "\n"
+        str << key.gsub(/( |:|=)/){|m| "\\#{m}"} << " = " << entry.gsub("\n", "\\n") << "\n"
       end
 
       str

data/lib/i18n/processor/ts.rb

@@ -53,6 +53,7 @@ module I18n::Translate::Processor
           entry["comment"] = get(message, "translatorcomment").to_s.strip
           entry["translation"] = get(message, "translation")
           fuzzy = get(message, "translation", "type").to_s.strip
+          entry["flag"] = fuzzy if fuzzy == "obsolete"
           entry["fuzzy"] = true unless fuzzy.empty?
           flag = get(message, "extra-po-flags").to_s.strip
           entry["flag"] = flag unless flag.empty?
@@ -77,7 +78,7 @@ module I18n::Translate::Processor
 <TS version="2.0" language="#{@translate.lang}">
 EOF
 
-      keys = I18n::Translate.hash_to_keys(@translate.default).sort
+      keys = I18n::Translate.hash_to_keys(target).sort
       keys.each do |key|
         value = @translate.find(key, target)
         next unless value
@@ -94,7 +95,7 @@ EOF
     </context>
 EOF
         else
-          fuzzy = ((value["flag"] == "ok") or value["flag"].to_s.strip.empty?) ? "" : %~ type="unfinished"~
+          fuzzy = ((value["flag"] == "ok") or value["flag"].to_s.strip.empty?) ? "" : (value["flag"] == "obsolete") ? %~ type="obsolete"~ : %~ type="unfinished"~
           xml += <<EOF
     <context>
         <name>#{::CGI.escapeHTML(key)}</name>

data/lib/i18n/translate.rb

@@ -28,7 +28,7 @@ require 'find'
 #   extracted_comment: po compatibility
 #   file: file where it is # po compatibility
 #   line: the lines, where is this key used #  po compatibility
-#   flag: ok || incomplete || changed || untranslated
+#   flag: ok || incomplete || changed || untranslated || obsolete
 #   fuzzy: true # exists only where flag != ok (nice to have when you want
 #                 edit files manualy)
 #
@@ -48,7 +48,7 @@ require 'find'
 #
 module I18n::Translate
 
-  FLAGS = %w(ok incomplete changed untranslated)
+  FLAGS = %w(ok incomplete changed untranslated obsolete)
   #FORMATS = %w(yml rb po pot ts properties)       # the first one is preferred if :format => auto
   # function I18n::Translate::Processor.init will register known
   # formats
@@ -103,12 +103,26 @@ module I18n::Translate
       h = h[chunk]
     end
     unless value
-      h[path[-1]] = nil
+      h.delete(path[-1])
     else
       h[path[-1]] = value
     end
   end
 
+  def self.delete(key, hash, separator=".")
+    path = key.split(separator)
+    set(key, nil, hash, separator)
+    i = path.size - 1
+    while i >= 0
+      k = path[0..i].join(separator)
+      trg = find(k, hash, separator)
+      if trg and trg.kind_of?(Hash) and trg.empty?
+        set(k, nil, hash, separator)
+      end
+      i -= 1
+    end
+  end
+
   # scans :locale_dir for files with valid formats and returns
   # list of files with locales. If block is given then
   # it creates Translate object for each entry and pass it to the block
@@ -175,7 +189,8 @@ module I18n::Translate
       :default => "default",   # default name for file containing default app's key => string
       :force_encoding => true, # in ruby 1.9 forces string encoding
       :encoding => "utf-8",    # encoding name to be forced to
-      :format => "auto"        # auto, rb, yml
+      :format => "auto",       # auto, rb, yml
+      :merge => "soft",        # hard or soft: hard strips old keys from target and soft set it to obsolete
     }
 
     attr_reader :default, :target, :merge, :options, :lang, :default_file, :lang_file
@@ -225,8 +240,9 @@ module I18n::Translate
     #     'old_translation' => '',      # if flag == 'changed' then old_translation = t and t = ''
     #     'translation' => '',          # value set in target file
     #     'comment' => ''               # a comment added by a translator
-    #     'flag' => ok || incomplete || changed || untranslated    # set by merging tool except incomplete
-    #                                                               which is set by translator
+    #     'flag' => ok || incomplete || changed || untranslated || obsolete
+    #                                   # set by merging tool except incomplete
+    #                                     which is set by translator
     #    # other keys helded for compatibility with other formats
     #   }
     def [](key)
@@ -279,6 +295,11 @@ module I18n::Translate
       I18n::Translate.find(key, hash, separator)
     end
 
+    def delete(key)
+      I18n::Translate.delete(key, @default, @options[:separator])
+      I18n::Translate.delete(key, @target, @options[:separator])
+    end
+
     # will create path in @target for 'key' and set the 'value'
     def []=(key, value)
       I18n::Translate.set(key, value, @target, @options[:separator])
@@ -346,6 +367,32 @@ module I18n::Translate
 
         self[key] = trg
       end
+      obsolete!
+    end
+
+    def obsolete!(merge = @options[:merge])
+      def_keys = I18n::Translate.hash_to_keys(@default, @options[:separator]).sort
+      trg_keys = I18n::Translate.hash_to_keys(@target, @options[:separator]).sort
+
+      obsolete_keys = trg_keys - def_keys
+      obsolete_keys.each do |key|
+        if merge == "hard"
+          I18n::Translate.delete(key, @target, @options[:separator])
+          next
+        end
+
+        trg = find(key)
+        next unless trg
+
+        if trg.kind_of?(String)
+          trg = {"translation" => trg, "flag" => "obsolete"}
+        else
+          trg["flag"] = "obsolete"
+          trg["fuzzy"] = true
+        end
+
+        I18n::Translate.set(key, trg, @target, @options[:separator])
+      end
     end
 
     # re-read @target data from the disk and create @merge
@@ -380,7 +427,7 @@ module I18n::Translate
     end
 
     # returns statistics hash
-    # {:total => N, :ok => N, :changed => N, :incomplete => N, :untranslated => N, :fuzzy => N, :progress => N}
+    # {:total => N, :ok => N, :changed => N, :obsolete => N, :incomplete => N, :untranslated => N, :fuzzy => N, :progress => N}
     def stat
       stat = {
         :total => @merge.size,
@@ -388,6 +435,7 @@ module I18n::Translate
         :changed => @merge.select{|e| e["flag"] == "changed"}.size,
         :incomplete => @merge.select{|e| e["flag"] == "incomplete"}.size,
         :untranslated => @merge.select{|e| e["flag"] == "untranslated"}.size,
+        :obsolete => @merge.select{|e| e["flag"] == "obsolete"}.size,
         :fuzzy => @merge.select{|e| e["flag"] != "ok"}.size
       }
       stat[:progress] = (stat[:ok].to_f / stat[:total].to_f) * 100

data/test/all.rb

@@ -8,6 +8,7 @@ $KCODE='UTF8'
 require 'test/unit'
 require 'rubygems'
 require 'yaml'
+require 'pp'
 
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), ".."))
 require 'lib/i18n-translate'
@@ -64,7 +65,13 @@ def diff(src, trg)
     src.keys.each { |key| puts "src key: #{key}" unless trg.keys.include?(key) }
     trg.keys.each { |key| puts "trg key: #{key}" unless src.keys.include?(key) }
     src.keys.each do |key, value|
-      puts "#{key} #{src[key].inspect} != #{trg[key].inspect}" if src[key] != trg[key]
+      if src[key] != trg[key]
+        print "#{key}: "
+        pp src[key]
+        puts "!="
+        pp trg[key]
+      end
+      #puts "#{key} #{src[key].inspect} != #{trg[key].inspect}" if src[key] != trg[key]
     end
   elsif src.kind_of?(Array) and trg.kind_of?(Array)
     src.each {|k| puts "not in trg '#{k}'" unless trg.include?(k)}

data/test/processor.rb

@@ -10,7 +10,7 @@ module I18n::Test
     def __prepare(processor, file)
       # prepare object with correct data from yaml
       @tr = I18n::Translate::Translate.new('cze', {:locale_dir => $src_dir, :default_format => 'yml', :format => 'yml'})
-      @tr.assign(@tr.target)
+      @tr.assign(@tr.merge)
 
       # prepare reader and writer
       @src_file = File.join($src_dir, file)

data/test/tc_backend_properties.rb

@@ -13,4 +13,20 @@ class TestBackendProperties < Test::Unit::TestCase
 
   include I18n::Test::Backend
 
+  def test_1000_colon_as_assign_operator
+    assert_equal( "apple, banana, pear, cantaloupe, watermelon, kiwi, mango", I18n.t("fruits") )
+  end
+
+  def test_1010_space_at_key_begining
+    assert_equal( "Beauty", I18n.t("Truth") )
+  end
+
+  def test_1020_escaped_operators_in_key
+    assert_equal( "operators", I18n.t("esc=aped:operators") )
+  end
+
+  def test_1030_key_without_assign_and_value
+    assert_equal( "translation missing: cze.empty_key", I18n.t("empty_key") )
+  end
+
 end

data/test/tc_processor_ts.rb

@@ -12,7 +12,7 @@ class TestProcessorTS < Test::Unit::TestCase
 
   include I18n::Test::Processor
 
-    def test_0030_read_po_to_ts
+    def test_1010_read_po_to_ts
       t = I18n::Translate::Translate.new('cze', {:locale_dir => $src_dir, :default_format => 'yml', :format => 'yml'})
       file = File.join($src_dir, 'po_to_ts.ts')
       reader = I18n::Translate::Processor::TS.new(file, t)

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: i18n-translators-tools
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Petr Kovar
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 +02:00
+date: 2010-11-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +25,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 0
-        - 4
-        - 1
-        version: 0.4.1
+        - 5
+        - 0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -50,10 +47,13 @@ dependencies:
   version_requirements: *id002
 description: |
   This package brings you useful utility and library which can help you to handle
-  locale files and translations in your Ruby projects. Offers also built-in 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.
+  locale files and translations in your Ruby projects.
+  It is build upon i18n library and extends it's simple format so you can simply
+  track field changes or keep translator's notes. Conversion back to simple format
+  is possible and as simple as call 'i18n-translate strip'. Offers also built-in
+  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: 
@@ -74,6 +74,7 @@ files:
 - lib/i18n/backend/translate.rb
 - lib/i18n/processor/properties.rb
 - lib/i18n/processor/ts.rb
+- lib/i18n/processor/gettext_strscan.rb
 - lib/i18n/processor/ruby.rb
 - lib/i18n/processor/yaml.rb
 - lib/i18n/processor/gettext.rb
@@ -124,7 +125,7 @@ post_install_message: |
   
   Backends:
     * Extended format. i18n-translators-tools brings extended format
-      I18n::Backend::Simple.send(:include, I18n::Backend::Translator)
+      I18n::Backend::Simple.send(:include, I18n::Backend::Translate)
     * Gettext po
       I18n::Backend::Simple.send(:include, I18n::Backend::PO)
     * QT Linguist TS
@@ -151,9 +152,19 @@ post_install_message: |
     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.4
+      * enhanced support for java properties
+      * hard/soft merges. hard deletes deleted keys in target and soft set them to
+        obsolete
+      * 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)
+  
   For more information read README.md and CHANGELOG.md
   
   -----------------------------------------------------------------------------
@@ -171,7 +182,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -180,7 +190,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"