Merge pull request #107 from lassebunk/allow-blank-translations

Allow blank translations. Fixes #101
rsl · Apr 29, 2013 · 26883df · 26883df
2 parents 7e0456e + a329fcb
commit 26883df
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/lib/stringex/localization.rb b/lib/stringex/localization.rb
@@ -37,7 +37,7 @@ def translate(scope, key, options = {})
 
         translation = initial_translation(scope, key, locale)
 
-        return translation unless translation.to_s.empty?
+        return translation unless translation.nil?
 
         if locale != default_locale
           translate scope, key, options.merge(:locale => default_locale)

diff --git a/lib/stringex/localization/backend/i18n.rb b/lib/stringex/localization/backend/i18n.rb
@@ -30,7 +30,10 @@ def store_translations(locale, scope, data)
           end
 
           def initial_translation(scope, key, locale)
-            ::I18n.translate(key, :scope => [:stringex, scope], :locale => locale, :default => "")
+            # I18n can't return a nil as default as this gets interpreted as if no default
+            # is specified, so we use a string instead.
+            translated = ::I18n.translate(key, :scope => [:stringex, scope], :locale => locale, :default => "__default__")
+            translated == "__default__" ? nil : translated
           end
 
           def load_translations(locale = nil)

diff --git a/locales/da.yml b/locales/da.yml
@@ -39,7 +39,7 @@ da:
       frac14: en fjerdedel
       frac12: halv
       frac34: tre fjerdedele
-      gt: >
+      gt: ">"
       lt: <
       nbsp: " "
       pound: " pund "

diff --git a/locales/en.yml b/locales/en.yml
@@ -39,7 +39,7 @@ en:
       frac14: one fourth
       frac12: half
       frac34: three fourths
-      gt: >
+      gt: ">"
       lt: <
       nbsp: " "
       pound: " pounds "

diff --git a/test/localization_test.rb b/test/localization_test.rb
@@ -109,4 +109,15 @@ def test_can_translate_using_i18n
       assert_equal value, Stringex::Localization.translate(:test_i18n_translation, key)
     end
   end
+
+  def test_allows_blank_translations
+    [:internal, :i18n].each do |backend|
+      Stringex::Localization.backend = backend
+
+      assert_equal "Test blank", "Test&nbsp;blank".convert_miscellaneous_html_entities
+
+      Stringex::Localization.store_translations :en, :html_entities, { :nbsp => "" }
+      assert_equal "Testblank", "Test&nbsp;blank".convert_miscellaneous_html_entities
+    end
+  end
 end