jro_apps/redmine Commit - r4069:768d67f27bf6

Workaround for i18n 0.4.x with the old style syntax. #6428 #5608...

Eric Davis -

r4069:768d67f27bf6

parent child

Context file:

r4069:768d67f27bf6

Collapse all files

config/initializers/10-patches.rb +14 0

             require 'active_record'
             module ActiveRecord
               class Base
                 include Redmine::I18n
                 # Translate attribute names for validation errors display
                 def self.human_attribute_name(attr)
                   l("field_#{attr.to_s.gsub(/_id$/, '')}")
                 end
               end
             end
             module ActiveRecord
               class Errors
                 def full_messages(options = {})
                   full_messages = []
                   @errors.each_key do |attr|
                     @errors[attr].each do |message|
                       next unless message
                       if attr == "base"
                         full_messages << message
                       elsif attr == "custom_values"
                         # Replace the generic "custom values is invalid"
                         # with the errors on custom values
                         @base.custom_values.each do |value|
                           value.errors.each do |attr, msg|
                             full_messages << value.custom_field.name + ' ' + msg
                           end
                         end
                       else
                         attr_name = @base.class.human_attribute_name(attr)
                         full_messages << attr_name + ' ' + message.to_s
                       end
                     end
                   end
                   full_messages
                 end
               end
             end
             module ActionView
               module Helpers
                 module DateHelper
                   # distance_of_time_in_words breaks when difference is greater than 30 years
                   def distance_of_date_in_words(from_date, to_date = 0, options = {})
                     from_date = from_date.to_date if from_date.respond_to?(:to_date)
                     to_date = to_date.to_date if to_date.respond_to?(:to_date)
                     distance_in_days = (to_date - from_date).abs
                     I18n.with_options :locale => options[:locale], :scope => :'datetime.distance_in_words' do |locale|
                       case distance_in_days
                         when 0..60     then locale.t :x_days,             :count => distance_in_days.round
                         when 61..720   then locale.t :about_x_months,     :count => (distance_in_days / 30).round
                         else                locale.t :over_x_years,       :count => (distance_in_days / 365).floor
                       end
                     end
                   end
                 end
               end
             end
             ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "#{html_tag}" }
             # Adds :async_smtp and :async_sendmail delivery methods
             # to perform email deliveries asynchronously
             module AsynchronousMailer
               %w(smtp sendmail).each do |type|
                 define_method("perform_delivery_async_#{type}") do |mail|
                   Thread.start do
                     send "perform_delivery_#{type}", mail
                   end
                 end
               end
             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

lib/redmine/i18n.rb +2 -2

             module Redmine
               module I18n
                 def self.included(base)
                   base.extend Redmine::I18n
                 end
                 def l(*args)
                   case args.size
                   when 1
                     ::I18n.t(*args)
                   when 2
                     if args.last.is_a?(Hash)
                       ::I18n.t(*args)
                     elsif args.last.is_a?(String)
                       ::I18n.t(args.first, :value => args.last)
                     else
                       ::I18n.t(args.first, :count => args.last)
                     end
                   else
                     raise "Translation string with multiple values: #{args.first}"
                   end
                 end
                 def l_or_humanize(s, options={})
                   k = "#{options[:prefix]}#{s}".to_sym
                   ::I18n.t(k, :default => s.to_s.humanize)
                 end
                 def l_hours(hours)
                   hours = hours.to_f
                   l((hours < 2.0 ? :label_f_hour : :label_f_hour_plural), :value => ("%.2f" % hours.to_f))
                 end
                 def ll(lang, str, value=nil)
                   ::I18n.t(str.to_s, :value => value, :locale => lang.to_s.gsub(%r{(.+)\-(.+)$}) { "#{$1}-#{$2.upcase}" })
                 end
                 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)
                   return nil unless time
                   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
                 def day_name(day)
                   ::I18n.t('date.day_names')[day % 7]
                 end
                 def month_name(month)
                   ::I18n.t('date.month_names')[month]
                 end
                 def valid_languages
                   @@valid_languages ||= Dir.glob(File.join(RAILS_ROOT, 'config', 'locales', '*.yml')).collect {|f| File.basename(f).split('.').first}.collect(&:to_sym)
                 end
                 def find_language(lang)
                   @@languages_lookup = valid_languages.inject({}) {|k, v| k[v.to_s.downcase] = v; k }
                   @@languages_lookup[lang.to_s.downcase]
                 end
                 def set_language_if_valid(lang)
                   if l = find_language(lang)
                     ::I18n.locale = l
                   end
                 end
                 def current_language
                   ::I18n.locale
                 end
               end
             end

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

             # Redmine - project management software
             # Copyright (C) 2006-2009  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../../../test_helper'
             class Redmine::I18nTest < ActiveSupport::TestCase
               include Redmine::I18n
               include ActionView::Helpers::NumberHelper
               def setup
                 @hook_module = Redmine::Hook
               end
               def test_date_format_default
                 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
                 set_language_if_valid 'en'
                 today = Date.today
                 Setting.date_format = '%d %m %Y'
                 assert_equal today.strftime('%d %m %Y'), format_date(today)
               end
               def test_date_and_time_for_each_language
                 Setting.date_format = ''
                 valid_languages.each do |lang|
                   set_language_if_valid lang
                   assert_nothing_raised "#{lang} failure" do
                     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)
                   assert_equal 7, l('date.day_names').size
                   assert l('date.month_names').is_a?(Array)
                   assert_equal 13, l('date.month_names').size
                 end
               end
               def test_time_format_default
                 set_language_if_valid 'en'
                 now = Time.now
                 Setting.date_format = ''
                 Setting.time_format = ''
-                assert_equal I18n.l(now), format_time(now)
+                assert_equal I18n.l(now, :count => now.strftime('%d')), 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), format_time(now, false)
               end
               def test_time_format
                 set_language_if_valid 'en'
                 now = Time.now
                 Setting.date_format = '%d %m %Y'
                 Setting.time_format = '%H %M'
                 assert_equal now.strftime('%d %m %Y %H %M'), format_time(now)
                 assert_equal now.strftime('%H %M'), format_time(now, false)
               end
               def test_utc_time_format
                 set_language_if_valid 'en'
                 now = Time.now.utc
                 Setting.date_format = '%d %m %Y'
                 Setting.time_format = '%H %M'
                 assert_equal Time.now.strftime('%d %m %Y %H %M'), format_time(now)
                 assert_equal Time.now.strftime('%H %M'), format_time(now, false)
               end
               def test_number_to_human_size_for_each_language
                 valid_languages.each do |lang|
                   set_language_if_valid lang
                   assert_nothing_raised "#{lang} failure" do
                     number_to_human_size(1024*1024*4)
                   end
                 end
               end
               def test_valid_languages
                 assert valid_languages.is_a?(Array)
                 assert valid_languages.first.is_a?(Symbol)
               end
               def test_valid_language
                 to_test = {'fr' => :fr,
                            'Fr' => :fr,
                            'zh' => :zh,
                            'zh-tw' => :"zh-TW",
                            'zh-TW' => :"zh-TW",
                            'zh-ZZ' => nil }
                 to_test.each {|lang, expected| assert_equal expected, find_language(lang)}
               end
             end

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