jro_apps/redmine Commit - r4774:7ddb1c694aae

Fixed: date part of the time default format doesn't respect the date format (#7639)....

Jean-Philippe Lang -

r4774:7ddb1c694aae

parent child

Context file:

r4774:7ddb1c694aae

Collapse all files

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)
                 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)) :
+                  (include_date ? "#{format_date(local)} " : "") +
-                                               ((include_date ? "#{format_date(time)} " : "") + "#{local.strftime(Setting.time_format)}")
+                    (Setting.time_format.blank? ? ::I18n.l(local, :format => :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 +28 -5

             # 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.expand_path('../../../../test_helper', __FILE__)
             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)
               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 '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
+                set_language_if_valid 'en'
+                now = Time.parse('2011-02-20 15:45:22')
+                with_settings :time_format => '%H:%M' do
+                  with_settings :date_format => '' do
+                    assert_equal '02/20/2011 15:45', format_time(now)
+                    assert_equal '15:45', format_time(now, false)
+                  end
+                  with_settings :date_format => '%Y-%m-%d' do
+                    assert_equal '2011-02-20 15:45', format_time(now)
+                    assert_equal '15:45', format_time(now, false)
+                  end
+                end
+              end
               def test_time_format_default
                 set_language_if_valid 'en'
-                now = Time.now
+                now = Time.parse('2011-02-20 15:45:22')
-                Setting.date_format = ''
+                with_settings :time_format => '' do
-                Setting.time_format = ''
+                  with_settings :date_format => '' do
-                assert_equal I18n.l(now), format_time(now)
+                    assert_equal '02/20/2011 03:45 pm', format_time(now)
-                assert_equal I18n.l(now, :format => :time), format_time(now, false)
+                    assert_equal '03:45 pm', format_time(now, false)
+                  end
+                  with_settings :date_format => '%Y-%m-%d' do
+                    assert_equal '2011-02-20 03:45 pm', format_time(now)
+                    assert_equal '03:45 pm', format_time(now, false)
+                  end
+                end
               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
               def test_fallback
                 ::I18n.backend.store_translations(:en, {:untranslated => "Untranslated string"})
                 ::I18n.locale = 'en'
                 assert_equal "Untranslated string", l(:untranslated)
                 ::I18n.locale = 'fr'
                 assert_equal "Untranslated string", l(:untranslated)
                 ::I18n.backend.store_translations(:fr, {:untranslated => "Pas de traduction"})
                 ::I18n.locale = 'en'
                 assert_equal "Untranslated string", l(:untranslated)
                 ::I18n.locale = 'fr'
                 assert_equal "Pas de traduction", l(:untranslated)
               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