jro_apps/redmine Commit - r4402:3c1576e364c9

Manually require i18n 0.4.2 before Rails tries to load the most recent gem (#7013)....

Jean-Philippe Lang -

r4402:3c1576e364c9

parent child

Context file:

r4402:3c1576e364c9

Collapse all files

config/boot.rb +12 0

@@ -106,5 +106,17 module Rails
106	end	106	end
107	end	107	end
108		108
		109	# TODO: Workaround for #7013 to be removed for 1.2.0
		110	# Loads i18n 0.4.2 before Rails loads any more recent gem
		111	# 0.5.0 is not compatible with the old interpolation syntax
		112	# Plugins will have to migrate to the new syntax for 1.2.0
		113	require 'rubygems'
		114	begin
		115	gem 'i18n', '0.4.2'
		116	rescue Gem::LoadError => load_error
		117	$stderr.puts %(Missing the i18n 0.4.2 gem. Please `gem install -v=0.4.2 i18n`)
		118	exit 1
		119	end
		120
109	# All that for this:	121	# All that for this:
110	Rails.boot!	122	Rails.boot!

config/initializers/10-patches.rb +1 -1

                 module Base
                   def warn_syntax_deprecation!(*args)
                     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."
+                    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
                 end

lib/redmine/i18n.rb +2 -2

                 def format_date(date)
                   return nil unless date
-                  Setting.date_format.blank? ? ::I18n.l(date.to_date, :count => date.strftime('%d')) : date.strftime(Setting.date_format)
+                  Setting.date_format.blank? ? ::I18n.l(date.to_date) : date.strftime(Setting.date_format)
                 end
                 def format_time(time, include_date = true)
                   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, :count => local.strftime('%d'), :format => (include_date ? :default : :time)) :
+                  Setting.time_format.blank? ? ::I18n.l(local, :format => (include_date ? :default : :time)) :
                                                ((include_date ? "#{format_date(time)} " : "") + "#{local.strftime(Setting.time_format)}")
                 end

test/unit/lib/redmine/i18n_test.rb +4 -4

                 set_language_if_valid 'en'
                 today = Date.today
                 Setting.date_format = ''
-                assert_equal I18n.l(today, :count => today.strftime('%d')), format_date(today)
+                assert_equal I18n.l(today), format_date(today)
               end
               def test_date_format
                     format_date(Date.today)
                     format_time(Time.now)
                     format_time(Time.now, false)
-                    assert_not_equal 'default', ::I18n.l(Date.today, :count => Date.today.strftime('%d'), :format => :default), "date.formats.default missing in #{lang}"
+                    assert_not_equal 'default', ::I18n.l(Date.today, :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)
                 now = Time.now
                 Setting.date_format = ''
                 Setting.time_format = ''
-                assert_equal I18n.l(now, :count => now.strftime('%d')), format_time(now)
+                assert_equal I18n.l(now), format_time(now)
-                assert_equal I18n.l(now, :count => now.strftime('%d'), :format => :time), format_time(now, false)
+                assert_equal I18n.l(now, :format => :time), format_time(now, false)
               end
               def test_time_format

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages