Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-11 07:46:02 +01:00
Code Issues Packages Projects Releases Activity

Adds the date format for ambiguous dates (#19243).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@14048 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-03-07 08:12:08 +00:00
parent 2800598832
commit f821eaf722
3 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/helpers/settings_helper.rb
View File

@@ -124,5 +124,16 @@ module SettingsHelper
] ]
options.map {|label, value| [l(label), value.to_s]} options.map {|label, value| [l(label), value.to_s]}
end
# Returns the options for the date_format setting
def date_format_setting_options(locale)
Setting::DATE_FORMATS.map do |f|
today = ::I18n.l(Date.today, :locale => locale, :format => f)
format = f.gsub('%', '').gsub(/[dmY]/) do
{'d' => 'dd', 'm' => 'mm', 'Y' => 'yyyy'}[$&]
end
["#{today} (#{format})", f]
end
end end
end end

2
app/views/settings/_display.html.erb
View File

@@ -11,7 +11,7 @@
<p><%= setting_select :start_of_week, [[day_name(1),'1'], [day_name(6),'6'], [day_name(7),'7']], :blank => :label_language_based %></p> <p><%= setting_select :start_of_week, [[day_name(1),'1'], [day_name(6),'6'], [day_name(7),'7']], :blank => :label_language_based %></p>
<% locale = User.current.language.blank? ? ::I18n.locale : User.current.language %> <% locale = User.current.language.blank? ? ::I18n.locale : User.current.language %>
<p><%= setting_select :date_format, Setting::DATE_FORMATS.collect {|f| [::I18n.l(Date.today, :locale => locale, :format => f), f]}, :blank => :label_language_based %></p> <p><%= setting_select :date_format, date_format_setting_options(locale), :blank => :label_language_based %></p>
<p><%= setting_select :time_format, Setting::TIME_FORMATS.collect {|f| [::I18n.l(Time.now, :locale => locale, :format => f), f]}, :blank => :label_language_based %></p> <p><%= setting_select :time_format, Setting::TIME_FORMATS.collect {|f| [::I18n.l(Time.now, :locale => locale, :format => f), f]}, :blank => :label_language_based %></p>

31
test/unit/helpers/settings_helper_test.rb Normal file
View File

@@ -0,0 +1,31 @@
# Redmine - project management software
# Copyright (C) 2006-2015 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 SettingsHelperTest < ActionView::TestCase
include SettingsHelper
include Redmine::I18n
include ERB::Util
def test_date_format_setting_options_should_include_human_readable_format
Date.stubs(:today).returns(Date.parse("2015-07-14"))
options = date_format_setting_options('en')
assert_include ["2015-07-14 (yyyy-mm-dd)", "%Y-%m-%d"], options
end
end