[DRE-commits] [SCM] redmine.git branch, master, updated. upstream/1.1.3-16-gc332e14

[Jérémy Lal]

The following commit has been merged in the master branch:
commit 397d14465b4a9c4f75d6a95ac9eff39d91d75835
Author: Jérémy Lal <kapouer at melix.org>
Date:   Mon May 30 18:32:11 2011 +0200

    i18n with rails 2.3.11 works without hacks, so just remove them.

diff --git a/debian/patches/2010_use_i18n_0.4.1.patch b/debian/patches/2010_use_i18n_0.4.1.patch
index 8c795c9..6752805 100644
--- a/debian/patches/2010_use_i18n_0.4.1.patch
+++ b/debian/patches/2010_use_i18n_0.4.1.patch
@@ -27,17 +27,3 @@ Last-Update: 2010-12-24
  
  # All that for this:
  Rails.boot!
---- a/config/initializers/10-patches.rb
-+++ b/config/initializers/10-patches.rb
-@@ -121,3 +121,11 @@
-     end
-   end
- end
-+
-+# Second hack to support redmine transition to i18n 0.4.2
-+class I18n::Backend::Simple
-+  def interpolate(locale, string, values = {})
-+    interpolate_without_deprecated_syntax(locale, string, values)
-+ end
-+end
-+

-- 
redmine.git