From 768d67f27bf6804ec52afae7cefc2724ff9af654 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 26 Sep 2010 17:13:52 +0000 Subject: [PATCH] Workaround for i18n 0.4.x with the old style syntax. #6428 #5608 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This will also silance the whole trace with the deprecation warning. Contributed by Felix Schäfer git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4183 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/initializers/10-patches.rb | 14 ++++++++++++++ lib/redmine/i18n.rb | 4 ++-- test/unit/lib/redmine/i18n_test.rb | 8 ++++---- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb index cdc3bfd79..4753dae3d 100644 --- a/config/initializers/10-patches.rb +++ b/config/initializers/10-patches.rb @@ -78,3 +78,17 @@ module AsynchronousMailer 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! + return if @skip_syntax_deprecation + warn "The {{key}} interpolation syntax in I18n messages is deprecated. Please use %{key} instead.\nDowngrade your i18n gem to 0.3.7 (everything above must be deinstalled) to remove this warning, see http://www.redmine.org/issues/5608 for more information." + @skip_syntax_deprecation = true + end + end + end +end diff --git a/lib/redmine/i18n.rb b/lib/redmine/i18n.rb index 1bfca81e4..e7aac9f7e 100644 --- a/lib/redmine/i18n.rb +++ b/lib/redmine/i18n.rb @@ -37,7 +37,7 @@ module Redmine def format_date(date) return nil unless date - Setting.date_format.blank? ? ::I18n.l(date.to_date) : date.strftime(Setting.date_format) + Setting.date_format.blank? ? ::I18n.l(date.to_date, :count => date.strftime('%d')) : date.strftime(Setting.date_format) end def format_time(time, include_date = true) @@ -45,7 +45,7 @@ module Redmine time = time.to_time if time.is_a?(String) zone = User.current.time_zone local = zone ? time.in_time_zone(zone) : (time.utc? ? time.localtime : time) - Setting.time_format.blank? ? ::I18n.l(local, :format => (include_date ? :default : :time)) : + Setting.time_format.blank? ? ::I18n.l(local, :count => local.strftime('%d'), :format => (include_date ? :default : :time)) : ((include_date ? "#{format_date(time)} " : "") + "#{local.strftime(Setting.time_format)}") end diff --git a/test/unit/lib/redmine/i18n_test.rb b/test/unit/lib/redmine/i18n_test.rb index 666bd7481..df1942e95 100644 --- a/test/unit/lib/redmine/i18n_test.rb +++ b/test/unit/lib/redmine/i18n_test.rb @@ -29,7 +29,7 @@ class Redmine::I18nTest < ActiveSupport::TestCase set_language_if_valid 'en' today = Date.today Setting.date_format = '' - assert_equal I18n.l(today), format_date(today) + assert_equal I18n.l(today, :count => today.strftime('%d')), format_date(today) end def test_date_format @@ -47,7 +47,7 @@ class Redmine::I18nTest < ActiveSupport::TestCase format_date(Date.today) format_time(Time.now) format_time(Time.now, false) - assert_not_equal 'default', ::I18n.l(Date.today, :format => :default), "date.formats.default missing in #{lang}" + assert_not_equal 'default', ::I18n.l(Date.today, :count => Date.today.strftime('%d'), :format => :default), "date.formats.default missing in #{lang}" assert_not_equal 'time', ::I18n.l(Time.now, :format => :time), "time.formats.time missing in #{lang}" end assert l('date.day_names').is_a?(Array) @@ -63,8 +63,8 @@ class Redmine::I18nTest < ActiveSupport::TestCase now = Time.now Setting.date_format = '' Setting.time_format = '' - assert_equal I18n.l(now), format_time(now) - assert_equal I18n.l(now, :format => :time), format_time(now, false) + assert_equal I18n.l(now, :count => now.strftime('%d')), format_time(now) + assert_equal I18n.l(now, :count => now.strftime('%d'), :format => :time), format_time(now, false) end def test_time_format -- 2.39.5