Merge branch 'master' of github.com:svenfuchs/i18n

thedarkone · Feb 27, 2011 · 1b3e434 · 1b3e434
2 parents 21d251b + 1c53c5d
commit 1b3e434
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ vendor/**/*
 *.swp
 pkg
 .bundle
+.rvmrc
diff --git a/lib/i18n/backend/fallbacks.rb b/lib/i18n/backend/fallbacks.rb
@@ -54,7 +54,7 @@ def translate(locale, key, options = {})
       end
 
       def extract_string_or_lambda_default!(options)
-        defaults = Array(options[:default])
+        defaults = [options[:default]].flatten
         if index = find_first_string_or_lambda_default(defaults)
           options[:default] = defaults[0, index]
           defaults[index]

diff --git a/test/backend/fallbacks_test.rb b/test/backend/fallbacks_test.rb
@@ -65,6 +65,10 @@ def setup
     assert_raise(I18n::MissingTranslationData) { I18n.t(:faa, :locale => :en, :raise => true) }
     assert_raise(I18n::MissingTranslationData) { I18n.t(:faa, :locale => :de, :raise => true) }
   end
+
+  test "should ensure that default is not splitted on new line char" do
+    assert_equal "Default \n Bar", I18n.t(:missing_bar, :default => "Default \n Bar")
+  end
 end
 
 class I18nBackendFallbacksLocalizeTest < Test::Unit::TestCase