comparison 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
comparison
equal deleted inserted replaced
244:8972b600f4fb 245:051f544170fe
77 end 77 end
78 end 78 end
79 79
80 ActionMailer::Base.send :include, AsynchronousMailer 80 ActionMailer::Base.send :include, AsynchronousMailer
81 81
82 # TODO: Hack to support i18n 4.x on Rails 2.3.5. Remove post 2.3.6. 82 # TMail::Unquoter.convert_to_with_fallback_on_iso_8859_1 introduced in TMail 1.2.7
83 # See http://www.redmine.org/issues/6428 and http://www.redmine.org/issues/5608 83 # triggers a test failure in test_add_issue_with_japanese_keywords(MailHandlerTest)
84 module I18n 84 module TMail
85 module Backend 85 class Unquoter
86 module Base 86 class << self
87 def warn_syntax_deprecation!(*args) 87 alias_method :convert_to, :convert_to_without_fallback_on_iso_8859_1
88 return if @skip_syntax_deprecation
89 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."
90 @skip_syntax_deprecation = true
91 end
92 end 88 end
93 end 89 end
94 end 90 end
95 91
96 module ActionController 92 module ActionController