Merged r4516 from trunk (i18n 0.4.2 gem is now required: 'gem install -v=0.4.2 i18n', see #7013).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4532 e93f8b46-1217-0410-a6f0-8f06a7374b81

config/boot.rb

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

config/initializers/10-patches.rb

@@ -86,7 +86,7 @@ module I18n
     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