diff config/initializers/.svn/text-base/10-patches.rb.svn-base @ 245:051f544170fe

* Update to SVN trunk revision 4993
author Chris Cannam
date Thu, 03 Mar 2011 11:42:28 +0000
parents 8661b858af72
children 0c939c159af4
line wrap: on
line diff
--- a/config/initializers/.svn/text-base/10-patches.rb.svn-base	Thu Mar 03 11:40:10 2011 +0000
+++ b/config/initializers/.svn/text-base/10-patches.rb.svn-base	Thu Mar 03 11:42:28 2011 +0000
@@ -79,16 +79,12 @@
 
 ActionMailer::Base.send :include, AsynchronousMailer
 
-# TODO: Hack to support i18n 4.x on Rails 2.3.5.  Remove post 2.3.6.
-# See http://www.redmine.org/issues/6428 and http://www.redmine.org/issues/5608
-module I18n
-  module Backend
-    module Base
-      def warn_syntax_deprecation!(*args)
-        return if @skip_syntax_deprecation
-        warn "The {{key}} interpolation syntax in I18n messages is deprecated and will be removed in Redmine 1.2. Please use %{key} instead, see http://www.redmine.org/issues/7013 for more information."
-        @skip_syntax_deprecation = true
-      end
+# TMail::Unquoter.convert_to_with_fallback_on_iso_8859_1 introduced in TMail 1.2.7
+# triggers a test failure in test_add_issue_with_japanese_keywords(MailHandlerTest)
+module TMail
+  class Unquoter
+    class << self
+      alias_method :convert_to, :convert_to_without_fallback_on_iso_8859_1
     end
   end
 end