##// END OF EJS Templates
Use abbr_day_name to get the first letter of the day name (#9839)....
Jean-Philippe Lang -
r10019:3119d1996c3c
parent child
Show More
@@ -146,7 +146,7 if show_days
146 width = zoom - 1
146 width = zoom - 1
147 %>
147 %>
148 <div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>" class="gantt_hdr">
148 <div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>" class="gantt_hdr">
149 <%= day_name(wday).first %>
149 <%= day_letter(wday) %>
150 </div>
150 </div>
151 <%
151 <%
152 left = left + width + 1
152 left = left + width + 1
@@ -58,6 +58,10 module Redmine
58 ::I18n.t('date.day_names')[day % 7]
58 ::I18n.t('date.day_names')[day % 7]
59 end
59 end
60
60
61 def day_letter(day)
62 ::I18n.t('date.abbr_day_names')[day % 7].first
63 end
64
61 def month_name(month)
65 def month_name(month)
62 ::I18n.t('date.month_names')[month]
66 ::I18n.t('date.month_names')[month]
63 end
67 end
@@ -25,6 +25,10 class Redmine::I18nTest < ActiveSupport::TestCase
25 User.current.language = nil
25 User.current.language = nil
26 end
26 end
27
27
28 def teardown
29 set_language_if_valid 'en'
30 end
31
28 def test_date_format_default
32 def test_date_format_default
29 set_language_if_valid 'en'
33 set_language_if_valid 'en'
30 today = Date.today
34 today = Date.today
@@ -155,6 +159,18 class Redmine::I18nTest < ActiveSupport::TestCase
155 end
159 end
156 end
160 end
157
161
162 def test_day_name
163 set_language_if_valid 'fr'
164 assert_equal 'dimanche', day_name(0)
165 assert_equal 'jeudi', day_name(4)
166 end
167
168 def test_day_letter
169 set_language_if_valid 'fr'
170 assert_equal 'd', day_letter(0)
171 assert_equal 'j', day_letter(4)
172 end
173
158 def test_valid_languages
174 def test_valid_languages
159 assert valid_languages.is_a?(Array)
175 assert valid_languages.is_a?(Array)
160 assert valid_languages.first.is_a?(Symbol)
176 assert valid_languages.first.is_a?(Symbol)
General Comments 0
You need to be logged in to leave comments. Login now