##// END OF EJS Templates
jro_apps » redmine
RSS
Fixed: date part of the time default format doesn't respect the date format (#7639)....
Jean-Philippe Lang -
r4774:7ddb1c694aae
parent child
Show More
Side by Side Unified
Context file:
r4774:7ddb1c694aae Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,79 +1,79
1 1 module Redmine
2 2 module I18n
3 3 def self.included(base)
4 4 base.extend Redmine::I18n
5 5 end
6 6
7 7 def l(*args)
8 8 case args.size
9 9 when 1
10 10 ::I18n.t(*args)
11 11 when 2
12 12 if args.last.is_a?(Hash)
13 13 ::I18n.t(*args)
14 14 elsif args.last.is_a?(String)
15 15 ::I18n.t(args.first, :value => args.last)
16 16 else
17 17 ::I18n.t(args.first, :count => args.last)
18 18 end
19 19 else
20 20 raise "Translation string with multiple values: #{args.first}"
21 21 end
22 22 end
23 23
24 24 def l_or_humanize(s, options={})
25 25 k = "#{options[:prefix]}#{s}".to_sym
26 26 ::I18n.t(k, :default => s.to_s.humanize)
27 27 end
28 28
29 29 def l_hours(hours)
30 30 hours = hours.to_f
31 31 l((hours < 2.0 ? :label_f_hour : :label_f_hour_plural), :value => ("%.2f" % hours.to_f))
32 32 end
33 33
34 34 def ll(lang, str, value=nil)
35 35 ::I18n.t(str.to_s, :value => value, :locale => lang.to_s.gsub(%r{(.+)\-(.+)$}) { "#{$1}-#{$2.upcase}" })
36 36 end
37 37
38 38 def format_date(date)
39 39 return nil unless date
40 40 Setting.date_format.blank? ? ::I18n.l(date.to_date) : date.strftime(Setting.date_format)
41 41 end
42 42
43 43 def format_time(time, include_date = true)
44 44 return nil unless time
45 45 time = time.to_time if time.is_a?(String)
46 46 zone = User.current.time_zone
47 47 local = zone ? time.in_time_zone(zone) : (time.utc? ? time.localtime : time)
48 Setting.time_format.blank? ? ::I18n.l(local, :format => (include_date ? :default : :time)) :
49 ((include_date ? "#{format_date(time)} " : "") + "#{local.strftime(Setting.time_format)}")
48 (include_date ? "#{format_date(local)} " : "") +
49 (Setting.time_format.blank? ? ::I18n.l(local, :format => :time) : local.strftime(Setting.time_format))
50 50 end
51 51
52 52 def day_name(day)
53 53 ::I18n.t('date.day_names')[day % 7]
54 54 end
55 55
56 56 def month_name(month)
57 57 ::I18n.t('date.month_names')[month]
58 58 end
59 59
60 60 def valid_languages
61 61 @@valid_languages ||= Dir.glob(File.join(RAILS_ROOT, 'config', 'locales', '*.yml')).collect {|f| File.basename(f).split('.').first}.collect(&:to_sym)
62 62 end
63 63
64 64 def find_language(lang)
65 65 @@languages_lookup = valid_languages.inject({}) {|k, v| k[v.to_s.downcase] = v; k }
66 66 @@languages_lookup[lang.to_s.downcase]
67 67 end
68 68
69 69 def set_language_if_valid(lang)
70 70 if l = find_language(lang)
71 71 ::I18n.locale = l
72 72 end
73 73 end
74 74
75 75 def current_language
76 76 ::I18n.locale
77 77 end
78 78 end
79 79 end
Show file before | Show file after | Hide comments
@@ -1,126 +1,149
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2009 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require File.expand_path('../../../../test_helper', __FILE__)
19 19
20 20 class Redmine::I18nTest < ActiveSupport::TestCase
21 21 include Redmine::I18n
22 22 include ActionView::Helpers::NumberHelper
23 23
24 24 def setup
25 25 @hook_module = Redmine::Hook
26 26 end
27 27
28 28 def test_date_format_default
29 29 set_language_if_valid 'en'
30 30 today = Date.today
31 31 Setting.date_format = ''
32 32 assert_equal I18n.l(today), format_date(today)
33 33 end
34 34
35 35 def test_date_format
36 36 set_language_if_valid 'en'
37 37 today = Date.today
38 38 Setting.date_format = '%d %m %Y'
39 39 assert_equal today.strftime('%d %m %Y'), format_date(today)
40 40 end
41 41
42 42 def test_date_and_time_for_each_language
43 43 Setting.date_format = ''
44 44 valid_languages.each do |lang|
45 45 set_language_if_valid lang
46 46 assert_nothing_raised "#{lang} failure" do
47 47 format_date(Date.today)
48 48 format_time(Time.now)
49 49 format_time(Time.now, false)
50 50 assert_not_equal 'default', ::I18n.l(Date.today, :format => :default), "date.formats.default missing in #{lang}"
51 51 assert_not_equal 'time', ::I18n.l(Time.now, :format => :time), "time.formats.time missing in #{lang}"
52 52 end
53 53 assert l('date.day_names').is_a?(Array)
54 54 assert_equal 7, l('date.day_names').size
55 55
56 56 assert l('date.month_names').is_a?(Array)
57 57 assert_equal 13, l('date.month_names').size
58 58 end
59 59 end
60 60
61 def test_time_format
62 set_language_if_valid 'en'
63 now = Time.parse('2011-02-20 15:45:22')
64 with_settings :time_format => '%H:%M' do
65 with_settings :date_format => '' do
66 assert_equal '02/20/2011 15:45', format_time(now)
67 assert_equal '15:45', format_time(now, false)
68 end
69
70 with_settings :date_format => '%Y-%m-%d' do
71 assert_equal '2011-02-20 15:45', format_time(now)
72 assert_equal '15:45', format_time(now, false)
73 end
74 end
75 end
76
61 77 def test_time_format_default
62 78 set_language_if_valid 'en'
63 now = Time.now
64 Setting.date_format = ''
65 Setting.time_format = ''
66 assert_equal I18n.l(now), format_time(now)
67 assert_equal I18n.l(now, :format => :time), format_time(now, false)
79 now = Time.parse('2011-02-20 15:45:22')
80 with_settings :time_format => '' do
81 with_settings :date_format => '' do
82 assert_equal '02/20/2011 03:45 pm', format_time(now)
83 assert_equal '03:45 pm', format_time(now, false)
84 end
85
86 with_settings :date_format => '%Y-%m-%d' do
87 assert_equal '2011-02-20 03:45 pm', format_time(now)
88 assert_equal '03:45 pm', format_time(now, false)
89 end
90 end
68 91 end
69 92
70 93 def test_time_format
71 94 set_language_if_valid 'en'
72 95 now = Time.now
73 96 Setting.date_format = '%d %m %Y'
74 97 Setting.time_format = '%H %M'
75 98 assert_equal now.strftime('%d %m %Y %H %M'), format_time(now)
76 99 assert_equal now.strftime('%H %M'), format_time(now, false)
77 100 end
78 101
79 102 def test_utc_time_format
80 103 set_language_if_valid 'en'
81 104 now = Time.now.utc
82 105 Setting.date_format = '%d %m %Y'
83 106 Setting.time_format = '%H %M'
84 107 assert_equal Time.now.strftime('%d %m %Y %H %M'), format_time(now)
85 108 assert_equal Time.now.strftime('%H %M'), format_time(now, false)
86 109 end
87 110
88 111 def test_number_to_human_size_for_each_language
89 112 valid_languages.each do |lang|
90 113 set_language_if_valid lang
91 114 assert_nothing_raised "#{lang} failure" do
92 115 number_to_human_size(1024*1024*4)
93 116 end
94 117 end
95 118 end
96 119
97 120 def test_valid_languages
98 121 assert valid_languages.is_a?(Array)
99 122 assert valid_languages.first.is_a?(Symbol)
100 123 end
101 124
102 125 def test_valid_language
103 126 to_test = {'fr' => :fr,
104 127 'Fr' => :fr,
105 128 'zh' => :zh,
106 129 'zh-tw' => :"zh-TW",
107 130 'zh-TW' => :"zh-TW",
108 131 'zh-ZZ' => nil }
109 132
110 133 to_test.each {|lang, expected| assert_equal expected, find_language(lang)}
111 134 end
112 135
113 136 def test_fallback
114 137 ::I18n.backend.store_translations(:en, {:untranslated => "Untranslated string"})
115 138 ::I18n.locale = 'en'
116 139 assert_equal "Untranslated string", l(:untranslated)
117 140 ::I18n.locale = 'fr'
118 141 assert_equal "Untranslated string", l(:untranslated)
119 142
120 143 ::I18n.backend.store_translations(:fr, {:untranslated => "Pas de traduction"})
121 144 ::I18n.locale = 'en'
122 145 assert_equal "Untranslated string", l(:untranslated)
123 146 ::I18n.locale = 'fr'
124 147 assert_equal "Pas de traduction", l(:untranslated)
125 148 end
126 149 end
General Comments 0
You need to be logged in to leave comments. Login now