jro_apps/redmine Commit - r10019:3119d1996c3c

Use abbr_day_name to get the first letter of the day name (#9839)....

Jean-Philippe Lang -

r10019:3119d1996c3c

parent child

Context file:

r10019:3119d1996c3c

Collapse all files

app/views/gantts/show.html.erb +1 -1

             <% @gantt.view = self %>
             <h2><%= @query.new_record? ? l(:label_gantt) : h(@query.name) %></h2>
             <%= form_tag({:controller => 'gantts', :action => 'show',
                          :project_id => @project, :month => params[:month],
                          :year => params[:year], :months => params[:months]},
                          :method => :get, :id => 'query_form') do %>
             <%= hidden_field_tag 'set_filter', '1' %>
             <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
               <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
               <div style="<%= @query.new_record? ? "" : "display: none;" %>">
                 <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
               </div>
             </fieldset>
             <p class="contextual">
               <%= gantt_zoom_link(@gantt, :in) %>
               <%= gantt_zoom_link(@gantt, :out) %>
             </p>
             <p class="buttons">
             <%= text_field_tag 'months', @gantt.months, :size => 2 %>
             <%= l(:label_months_from) %>
             <%= select_month(@gantt.month_from, :prefix => "month", :discard_type => true) %>
             <%= select_year(@gantt.year_from, :prefix => "year", :discard_type => true) %>
             <%= hidden_field_tag 'zoom', @gantt.zoom %>
             <%= link_to_function l(:button_apply), '$("#query_form").submit()', :class => 'icon icon-checked' %>
             <%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 }, :class => 'icon icon-reload' %>
             </p>
             <% end %>
             <%= error_messages_for 'query' %>
             <% if @query.valid? %>
             <%
             zoom = 1
             @gantt.zoom.times { zoom = zoom * 2 }
             subject_width = 330
             header_heigth = 18
             headers_height = header_heigth
             show_weeks = false
             show_days = false
             if @gantt.zoom > 1
                 show_weeks = true
                 headers_height = 2 * header_heigth
                 if @gantt.zoom > 2
                     show_days = true
                     headers_height = 3 * header_heigth
                 end
             end
             # Width of the entire chart
             g_width = ((@gantt.date_to - @gantt.date_from + 1) * zoom).to_i
             @gantt.render(:top => headers_height + 8,
                           :zoom => zoom,
                           :g_width => g_width,
                           :subject_width => subject_width)
             g_height = [(20 * (@gantt.number_of_rows + 6)) + 150, 206].max
             t_height = g_height + headers_height
             %>
             <% if @gantt.truncated %>
               <p class="warning"><%= l(:notice_gantt_chart_truncated, :max => @gantt.max_rows) %></p>
             <% end %>
             <table style="width:100%; border:0; border-collapse: collapse;">
             <tr>
             <td style="width:<%= subject_width %>px; padding:0px;">
             <div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width + 1 %>px;">
             <div style="right:-2px;width:<%= subject_width %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr"></div>
             <div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;overflow:hidden;" class="gantt_hdr"></div>
             <div class="gantt_subjects">
             <%= @gantt.subjects.html_safe %>
             </div>
             </div>
             </td>
             <td>
             <div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;">
             <div style="width:<%= g_width - 1 %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr">&nbsp;</div>
             <%
             #
             # Months headers
             #
             month_f = @gantt.date_from
             left = 0
             height = (show_weeks ? header_heigth : header_heigth + g_height)
             @gantt.months.times do
               width = (((month_f >> 1) - month_f) * zoom - 1).to_i
               %>
               <div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
               <%= link_to h("#{month_f.year}-#{month_f.month}"), @gantt.params.merge(:year => month_f.year, :month => month_f.month), :title => "#{month_name(month_f.month)} #{month_f.year}"%>
               </div>
               <%
               left = left + width + 1
               month_f = month_f >> 1
             end %>
             <%
             #
             # Weeks headers
             #
             if show_weeks
               left = 0
               height = (show_days ? header_heigth - 1 : header_heigth - 1 + g_height)
               if @gantt.date_from.cwday == 1
                 # @date_from is monday
                 week_f = @gantt.date_from
               else
                 # find next monday after @date_from
                 week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1)
                 width = (7 - @gantt.date_from.cwday + 1) * zoom - 1
                 %>
                 <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">&nbsp;</div>
                 <%
                 left = left + width + 1
               end %>
               <%
               while week_f <= @gantt.date_to
                 width = ((week_f + 6 <= @gantt.date_to) ? 7 * zoom - 1 : (@gantt.date_to - week_f + 1) * zoom - 1).to_i
                 %>
                 <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
                 <small><%= week_f.cweek if width >= 16 %></small>
                 </div>
                 <%
                 left = left + width + 1
                 week_f = week_f + 7
               end
             end %>
             <%
             #
             # Days headers
             #
             if show_days
               left = 0
               height = g_height + header_heigth - 1
               wday = @gantt.date_from.cwday
               (@gantt.date_to - @gantt.date_from + 1).to_i.times do
               width =  zoom - 1
               %>
               <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">
-              <%= day_name(wday).first %>
+              <%= day_letter(wday) %>
               </div>
               <%
               left = left + width + 1
               wday = wday + 1
               wday = 1 if wday > 7
               end
             end %>
             <%= @gantt.lines.html_safe %>
             <%
             #
             # Today red line (excluded from cache)
             #
             %>
             <% if Date.today >= @gantt.date_from and Date.today <= @gantt.date_to %>
               <div style="position: absolute;height:<%= g_height %>px;top:<%= headers_height + 1 %>px;left:<%= (((Date.today - @gantt.date_from + 1) * zoom).floor() - 1).to_i %>px;width:10px;border-left: 1px dashed red;">&nbsp;</div>
             <% end %>
             </div>
             </td>
             </tr>
             </table>
             <table style="width:100%">
             <tr>
             <td align="left"><%= link_to_content_update("\xc2\xab " + l(:label_previous), params.merge(@gantt.params_previous)) %></td>
             <td align="right"><%= link_to_content_update(l(:label_next) + " \xc2\xbb", params.merge(@gantt.params_next)) %></td>
             </tr>
             </table>
             <% other_formats_links do |f| %>
               <%= f.link_to 'PDF', :url => params.merge(@gantt.params) %>
               <%= f.link_to('PNG', :url => params.merge(@gantt.params)) if @gantt.respond_to?('to_image') %>
             <% end %>
             <% end # query.valid? %>
             <% content_for :sidebar do %>
               <%= render :partial => 'issues/sidebar' %>
             <% end %>
             <% html_title(l(:label_gantt)) -%>

lib/redmine/i18n.rb +4 0

             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
                   options = {}
                   options[:format] = Setting.date_format unless Setting.date_format.blank?
                   options[:locale] = User.current.language unless User.current.language.blank?
                   ::I18n.l(date.to_date, options)
                 end
                 def format_time(time, include_date = true)
                   return nil unless time
                   options = {}
                   options[:format] = (Setting.time_format.blank? ? :time : Setting.time_format)
                   options[:locale] = User.current.language unless User.current.language.blank?
                   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)
                   (include_date ? "#{format_date(local)} " : "") + ::I18n.l(local, options)
                 end
                 def day_name(day)
                   ::I18n.t('date.day_names')[day % 7]
                 end
+                def day_letter(day)
+                  ::I18n.t('date.abbr_day_names')[day % 7].first
+                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 +16 0

             # Redmine - project management software
             # Copyright (C) 2006-2012  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
                 User.current.language = nil
               end
+              def teardown
+                set_language_if_valid 'en'
+              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_format_default_with_user_locale
                 set_language_if_valid 'es'
                 today = now = Time.parse('2011-02-20 14:00:00')
                 Setting.date_format = '%d %B %Y'
                 User.current.language = 'fr'
                 s1 = "20 f\xc3\xa9vrier 2011"
                 s1.force_encoding("UTF-8") if s1.respond_to?(:force_encoding)
                 assert_equal s1, format_date(today)
                 User.current.language = nil
                 assert_equal '20 Febrero 2011', 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_for_each_zone
                 ActiveSupport::TimeZone.all.each do |zone|
                   User.current.stubs(:time_zone).returns(zone.name)
                   assert_nothing_raised "#{zone} failure" do
                     format_time(Time.now)
                   end
                 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.parse('2011-02-20 15:45:22')
                 with_settings :time_format => '' do
                   with_settings :date_format => '' do
                     assert_equal '02/20/2011 03:45 pm', format_time(now)
                     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_default_with_user_locale
                 set_language_if_valid 'en'
                 User.current.language = 'fr'
                 now = Time.parse('2011-02-20 15:45:22')
                 with_settings :time_format => '' do
                   with_settings :date_format => '' do
                     assert_equal '20/02/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
                 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
                 Setting.date_format = '%d %m %Y'
                 Setting.time_format = '%H %M'
                 assert_equal now.strftime('%d %m %Y %H %M'), format_time(now.utc)
                 assert_equal now.strftime('%H %M'), format_time(now.utc, 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
                     size = number_to_human_size(257024)
                     assert_match /251/, size
                   end
                 end
               end
+              def test_day_name
+                set_language_if_valid 'fr'
+                assert_equal 'dimanche', day_name(0)
+                assert_equal 'jeudi', day_name(4)
+              end
+              def test_day_letter
+                set_language_if_valid 'fr'
+                assert_equal 'd', day_letter(0)
+                assert_equal 'j', day_letter(4)
+              end
               def test_valid_languages
                 assert valid_languages.is_a?(Array)
                 assert valid_languages.first.is_a?(Symbol)
               end
               def test_locales_validness
                 lang_files_count = Dir["#{Rails.root}/config/locales/*.yml"].size
                 assert_equal lang_files_count, valid_languages.size
                 valid_languages.each do |lang|
                   assert set_language_if_valid(lang)
                 end
                 set_language_if_valid('en')
               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
               def test_utf8
                 set_language_if_valid 'ja'
                 str_ja_yes  = "\xe3\x81\xaf\xe3\x81\x84"
                 i18n_ja_yes = l(:general_text_Yes)
                 if str_ja_yes.respond_to?(:force_encoding)
                   str_ja_yes.force_encoding('UTF-8')
                   assert_equal "UTF-8", i18n_ja_yes.encoding.to_s
                 end
                 assert_equal str_ja_yes, i18n_ja_yes
               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