i18n-translators-tools 0.2 → 0.2.1

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'
+  s.version = '0.2.1'
   s.date = '2010-07-27'
   s.add_dependency('i18n', '>= 0.4.1')
   s.add_dependency('ya2yaml')
@@ -51,6 +51,10 @@ 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)
+
 For more information read README.md and CHANGELOG.md
 
 -----------------------------------------------------------------------

data/lib/i18n/backend/translate.rb

@@ -19,10 +19,13 @@ module I18n
       # the simple and the Translator's
       def translate(locale, key, options = {})
         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]
 
         tr = result[:translation] || result[:t]
+        return nil if tr.to_s.empty?
+
         values = options.except(*I18n::Backend::Base::RESERVED_KEYS)
 
         tr = resolve(locale, key, tr, options)

data/test/backend.rb

@@ -35,15 +35,19 @@ module I18n::Test
       assert_equal( "This text is only in default", I18n.t("missing.fallback") )
     end
 
-    def test_0080_new_line
+    def test_0080_I18n_fallback_empty_string
+      assert_equal( "Empty string", I18n.t("missing.empty") )
+    end
+
+    def test_0090_new_line
       assert_equal( "V tomto textu\nje nový řádek.", I18n.t("test.new_line") )
     end
 
-    def test_0080_quote
+    def test_0100_quote
       assert_equal( "Tento text obsahuje \" -- jednu uvozovku.", I18n.t("test.quote") )
     end
 
-    def test_0080_string_key_without_dots
+    def test_0110_string_key_without_dots
       assert_equal( "tady je nějaký text", I18n.t("some text there") )
     end
 

data/test/locale/src/cze.po

@@ -28,6 +28,10 @@ msgctxt "extended.interpolation"
 msgid "Interpolated text '%{var}'"
 msgstr "Interpolovaný text '%{var}'"
 
+msgctxt "missing.empty"
+msgid "Empty string"
+msgstr ""
+
 msgctxt "simple.interpolation"
 msgid "Interpolated text '%{var}'"
 msgstr "Interpolovaný text '%{var}'"

data/test/locale/src/cze.rb

@@ -34,6 +34,7 @@
         "flag" => "incomplete"
       }
     },
+    "missing" => { "empty" => "" },
     "simple" => {
       "interpolation" => "Interpolovaný text '%{var}'",
       "plural" => {

data/test/locale/src/cze.yml

@@ -26,6 +26,8 @@ cze:
       translation: "Interpolovaný text '%{var}'"
       fuzzy: true
       flag: incomplete
+  missing:
+    empty: ""
   simple:
     text: Text k přeložení
     interpolation: "Interpolovaný text '%{var}'"

data/test/locale/src/default.yml

@@ -10,6 +10,7 @@ default:
     interpolation: "Interpolated text '%{var}'"
   missing:
     fallback: "This text is only in default"
+    empty: "Empty string"
   simple:
     text: Text to translate
     interpolation: "Interpolated text '%{var}'"

data/test/tc_backend_ruby.rb

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# vi: fenc=utf-8:expandtab:ts=2:sw=2:sts=2
+# 
+# @author: Petr Kovar <pejuko@gmail.com>
+#
+
+class TestBackendDefaultRuby < Test::Unit::TestCase
+
+  def setup
+    I18n.load_path = Dir[ "#{$src_dir}/default.yml", "#{$src_dir}/cze.rb" ]
+    I18n.reload!
+  end
+
+  include I18n::Test::Backend
+
+end

data/test/tc_backend_yaml.rb

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# vi: fenc=utf-8:expandtab:ts=2:sw=2:sts=2
+# 
+# @author: Petr Kovar <pejuko@gmail.com>
+#
+
+class TestBackendDefaultYAML < Test::Unit::TestCase
+
+  def setup
+    I18n.load_path = Dir[ "#{$src_dir}/default.yml", "#{$src_dir}/cze.yml" ]
+    I18n.reload!
+  end
+
+  include I18n::Test::Backend
+
+end

data/test/tc_translate.rb

@@ -74,6 +74,7 @@ class TestTranslate < Test::Unit::TestCase
     assert(trb.kind_of?(I18n::Translate::Translate))
     assert_equal(File.join(File.expand_path($src_dir), 'cze.rb'), trb.lang_file)
     assert_equal(@t.default, trb.default)
+    diff(@t.target, trb.target)
     assert_equal(@t.target, trb.target)
   end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: i18n-translators-tools
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  version: "0.2"
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Petr Kovar
@@ -89,9 +90,11 @@ files:
 - test/all.rb
 - test/tc_backend_po.rb
 - test/tc_processor_gettext.rb
+- test/tc_backend_ruby.rb
 - test/tc_backend_translate.rb
 - test/tc_processor_ts.rb
 - test/processor.rb
+- test/tc_backend_yaml.rb
 - test/tc_backend_properties.rb
 - test/tc_translate.rb
 - test/locale/src/cze.yml
@@ -134,6 +137,10 @@ 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)
+  
   For more information read README.md and CHANGELOG.md
   
   -----------------------------------------------------------------------