Updgraded Rails to 2.3.11 (#6887).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4904 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -79,16 +79,12 @@ end
|
||||
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user