i18n-translators-tools 0.2.1 → 0.2.2

data/bin/i18n-translate

@@ -115,9 +115,14 @@ def process_locale(tr, command, opts)
     msg="striped"
     save_locale = true
   when 'merge'
-    tr.assign(tr.merge)
-    msg="merged"
-    save_locale = true
+    if File.exists?(tr.default_file)
+      tr.assign(tr.merge)
+      msg="merged"
+      msg << " with #{tr.default_file}" if options[:verbose]
+      save_locale = true
+    else
+      msg="no default file (expected: #{tr.default_file})"
+    end
   when 'convert'
     tr.options[:format] = options[:target]
     msg="converted"

data/i18n-translators-tools.gemspec

@@ -8,13 +8,13 @@ require 'find'
 
 spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
-  s.summary = "I18n transation utility which helps to manage files with locales."
+  s.summary = "I18n translation utility which helps to manage files with locales."
   s.homepage = "http://github.com/pejuko/i18n-translators-tools"
   s.email = "pejuko@gmail.com"
   s.authors = ["Petr Kovar"]
   s.name = 'i18n-translators-tools'
-  s.version = '0.2.1'
-  s.date = '2010-07-27'
+  s.version = '0.2.2'
+  s.date = Time.now.strftime("%Y-%m-%d")
   s.add_dependency('i18n', '>= 0.4.1')
   s.add_dependency('ya2yaml')
   s.require_path = 'lib'
@@ -22,11 +22,11 @@ spec = Gem::Specification.new do |s|
   s.files += Dir["lib/**/*.rb", "test/**/*.{rb,yml,po}"]
   s.executables = ["i18n-translate"]
   s.post_install_message = <<EOF
-=======================================================================
+=============================================================================
 
 I18N TRANSLATORS TOOLS
 
------------------------------------------------------------------------
+-----------------------------------------------------------------------------
 
 Supported formats:
   * yml
@@ -36,7 +36,7 @@ Supported formats:
   * properties
 
 Backends:
-  * Extended format. i18n-translators-tools bring extended format
+  * Extended format. i18n-translators-tools brings extended format
     I18n::Backend::Simple.send(:include, I18n::Backend::Translator)
   * Gettext po
     I18n::Backend::Simple.send(:include, I18n::Backend::PO)
@@ -51,17 +51,23 @@ Functions:
   * translate (built-in simple console translator)
   * statistics
 
-v0.2.1
-  * fix: I18n::Backend::Translate now returns nil if translation is empty string
-         (this allows fallbacks)
+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
 
 For more information read README.md and CHANGELOG.md
 
------------------------------------------------------------------------
+-----------------------------------------------------------------------------
 
 http://github.com/pejuko/i18n-translators-tools
 
-=======================================================================
+=============================================================================
 EOF
   s.description = <<EOF
 This package brings you useful utility which can help you to handle locale files

data/lib/i18n/translate.rb

@@ -173,9 +173,18 @@ module I18n::Translate
     def initialize(lang, opts={})
       @lang = lang.to_s
       raise "Empty locale" if @lang.empty? and not opts[:empty]
+
+      # merge options
       @options = DEFAULT_OPTIONS.merge(opts)
+
+      # select default format
       @options[:default_format] ||= @options[:format]
+      if (@options[:default_format] == @options[:format]) and not opts[:default_format]
+        dfname = file_name(@options[:default], @options[:default_format])
+        @options[:default_format] = "auto" unless File.exists?(dfname)
+      end
 
+      # load default data and translation
       if @lang and not opts[:empty]
         @default, @default_file = load_locale( @options[:default], @options[:default_format] )
         @target, @lang_file = load_locale( @lang )

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: i18n-translators-tools
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Petr Kovar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-27 00:00:00 +02:00
+date: 2010-07-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,11 +108,11 @@ homepage: http://github.com/pejuko/i18n-translators-tools
 licenses: []
 
 post_install_message: |
-  =======================================================================
+  =============================================================================
   
   I18N TRANSLATORS TOOLS
   
-  -----------------------------------------------------------------------
+  -----------------------------------------------------------------------------
   
   Supported formats:
     * yml
@@ -122,7 +122,7 @@ post_install_message: |
     * properties
   
   Backends:
-    * Extended format. i18n-translators-tools bring extended format
+    * Extended format. i18n-translators-tools brings extended format
       I18n::Backend::Simple.send(:include, I18n::Backend::Translator)
     * Gettext po
       I18n::Backend::Simple.send(:include, I18n::Backend::PO)
@@ -137,17 +137,23 @@ post_install_message: |
     * translate (built-in simple console translator)
     * statistics
   
-  v0.2.1
-    * fix: I18n::Backend::Translate now returns nil if translation is empty string
-           (this allows fallbacks)
+  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
   
   For more information read README.md and CHANGELOG.md
   
-  -----------------------------------------------------------------------
+  -----------------------------------------------------------------------------
   
   http://github.com/pejuko/i18n-translators-tools
   
-  =======================================================================
+  =============================================================================
 
 rdoc_options: []
 
@@ -177,6 +183,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: I18n transation utility which helps to manage files with locales.
+summary: I18n translation utility which helps to manage files with locales.
 test_files: []