From a4be202b0f519433070e7a7256dea6e7fa6df581 Mon Sep 17 00:00:00 2001
From: knapo <knapo@knapo.net>
Date: Thu, 24 Feb 2011 22:16:44 +0100
Subject: [PATCH 1/2] Add .rvmrc to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index c7768c2b..b066d1ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ vendor/**/*
 *.swp
 pkg
 .bundle
+.rvmrc

From 1c53c5d05544830aedc61e3123ec50555bddbb7c Mon Sep 17 00:00:00 2001
From: knapo <knapo@knapo.net>
Date: Thu, 24 Feb 2011 22:18:06 +0100
Subject: [PATCH 2/2] Fix #81. Prevent splitting string on new line in
 Fallbacks backend

---
 lib/i18n/backend/fallbacks.rb  | 2 +-
 test/backend/fallbacks_test.rb | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/i18n/backend/fallbacks.rb b/lib/i18n/backend/fallbacks.rb
index 4857d0ab..b05d2e7a 100644
--- 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
index e59637a9..e7436390 100644
--- 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