[DRE-commits] r5989 - trunk/redmine/debian/patches

[Jérémy Lal]

Author: kapouer-guest
Date: 2010-12-23 23:57:33 +0000 (Thu, 23 Dec 2010)
New Revision: 5989

Modified:
   trunk/redmine/debian/patches/i18n_0.4.1.patch
Log:
Disable i18n gem check (because it's failing, even with 0.4.1).

Modified: trunk/redmine/debian/patches/i18n_0.4.1.patch
===================================================================
--- trunk/redmine/debian/patches/i18n_0.4.1.patch	2010-12-23 22:19:49 UTC (rev 5988)
+++ trunk/redmine/debian/patches/i18n_0.4.1.patch	2010-12-23 23:57:33 UTC (rev 5989)
@@ -1,14 +1,24 @@
+Disable loading of i18n 0.4.2 gem : 0.4.1 is available by default in rails 2.3.5.
 --- a/config/boot.rb
 +++ b/config/boot.rb
-@@ -112,9 +112,9 @@
+@@ -110,13 +110,13 @@
+ # 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
+-require 'rubygems'
+-begin
 -  gem 'i18n', '0.4.2'
-+  gem 'i18n', '0.4.1'
- rescue Gem::LoadError => load_error
+-rescue Gem::LoadError => load_error
 -  $stderr.puts %(Missing the i18n 0.4.2 gem. Please `gem install -v=0.4.2 i18n`)
-+  $stderr.puts %(Missing the i18n 0.4.1 gem. Please `gem install -v=0.4.1 i18n`)
-   exit 1
- end
+-  exit 1
+-end
++#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!