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

[Jérémy Lal]

Author: kapouer-guest
Date: 2010-08-01 14:44:02 +0000 (Sun, 01 Aug 2010)
New Revision: 5738

Added:
   trunk/redmine/debian/patches/i18n-0.4.1.patch
Modified:
   trunk/redmine/debian/patches/series
Log:
Fix problem with libi18n-ruby1.8 0.4.1

Added: trunk/redmine/debian/patches/i18n-0.4.1.patch
===================================================================
--- trunk/redmine/debian/patches/i18n-0.4.1.patch	                        (rev 0)
+++ trunk/redmine/debian/patches/i18n-0.4.1.patch	2010-08-01 14:44:02 UTC (rev 5738)
@@ -0,0 +1,26 @@
+Description: Patch for libi18n-ruby 0.4.1 support
+ See discussion in redmine issue 5608.
+ 
+Origin: upstream, http://www.redmine.org/issues/5608
+Author: Jérémy Lal <kapouer at melix.org>
+
+--- redmine-1.0.0.orig/lib/redmine/i18n.rb
++++ redmine-1.0.0/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.day) : 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.day, :format => (include_date ? :default : :time)) : 
+                                    ((include_date ? "#{format_date(time)} " : "") + "#{local.strftime(Setting.time_format)}")
+     end
+ 

Modified: trunk/redmine/debian/patches/series
===================================================================
--- trunk/redmine/debian/patches/series	2010-08-01 02:06:19 UTC (rev 5737)
+++ trunk/redmine/debian/patches/series	2010-08-01 14:44:02 UTC (rev 5738)
@@ -4,3 +4,4 @@
 0016-plugin_assets_in_var_dir.patch
 0017-dump_schema_to_cache_dir.patch
 0018-remove-shebang.patch
+i18n-0.4.1.patch