| @@ -854,6 +854,8 module ApplicationHelper | |||||
| 854 | 'Calendar._FD = 1;' # Monday |
|
854 | 'Calendar._FD = 1;' # Monday | |
| 855 | when 7 |
|
855 | when 7 | |
| 856 | 'Calendar._FD = 0;' # Sunday |
|
856 | 'Calendar._FD = 0;' # Sunday | |
|
|
857 | when 6 | |||
|
|
858 | 'Calendar._FD = 6;' # Saturday | |||
| 857 | else |
|
859 | else | |
| 858 | '' # use language |
|
860 | '' # use language | |
| 859 | end |
|
861 | end | |
| @@ -5,7 +5,7 | |||||
| 5 |
|
5 | |||
| 6 | <p><%= setting_select :default_language, lang_options_for_select(false) %></p> |
|
6 | <p><%= setting_select :default_language, lang_options_for_select(false) %></p> | |
| 7 |
|
7 | |||
| 8 | <p><%= setting_select :start_of_week, [[day_name(1),'1'], [day_name(7),'7']], :blank => :label_language_based %></p> |
|
8 | <p><%= setting_select :start_of_week, [[day_name(1),'1'], [day_name(6),'6'], [day_name(7),'7']], :blank => :label_language_based %></p> | |
| 9 |
|
9 | |||
| 10 | <p><%= setting_select :date_format, Setting::DATE_FORMATS.collect {|f| [Date.today.strftime(f), f]}, :blank => :label_language_based %></p> |
|
10 | <p><%= setting_select :date_format, Setting::DATE_FORMATS.collect {|f| [Date.today.strftime(f), f]}, :blank => :label_language_based %></p> | |
| 11 |
|
11 | |||
| @@ -68,6 +68,8 module Redmine | |||||
| 68 | case Setting.start_of_week.to_i |
|
68 | case Setting.start_of_week.to_i | |
| 69 | when 1 |
|
69 | when 1 | |
| 70 | @first_dow ||= (1 - 1)%7 + 1 |
|
70 | @first_dow ||= (1 - 1)%7 + 1 | |
|
|
71 | when 6 | |||
|
|
72 | @first_dow ||= (6 - 1)%7 + 1 | |||
| 71 | when 7 |
|
73 | when 7 | |
| 72 | @first_dow ||= (7 - 1)%7 + 1 |
|
74 | @first_dow ||= (7 - 1)%7 + 1 | |
| 73 | else |
|
75 | else | |
| @@ -1,5 +1,5 | |||||
| 1 |
# |
|
1 | # Redmine - project management software | |
| 2 |
# Copyright (C) 2006-20 |
|
2 | # Copyright (C) 2006-2011 Jean-Philippe Lang | |
| 3 | # |
|
3 | # | |
| 4 | # This program is free software; you can redistribute it and/or |
|
4 | # This program is free software; you can redistribute it and/or | |
| 5 | # modify it under the terms of the GNU General Public License |
|
5 | # modify it under the terms of the GNU General Public License | |
| @@ -40,4 +40,24 class CalendarTest < ActiveSupport::TestCase | |||||
| 40 | c = Redmine::Helpers::Calendar.new(Date.today, :en, :week) |
|
40 | c = Redmine::Helpers::Calendar.new(Date.today, :en, :week) | |
| 41 | assert_equal [7, 6], [c.startdt.cwday, c.enddt.cwday] |
|
41 | assert_equal [7, 6], [c.startdt.cwday, c.enddt.cwday] | |
| 42 | end |
|
42 | end | |
|
|
43 | ||||
|
|
44 | def test_monthly_start_day | |||
|
|
45 | [1, 6, 7].each do |day| | |||
|
|
46 | with_settings :start_of_week => day do | |||
|
|
47 | c = Redmine::Helpers::Calendar.new(Date.today, :en, :month) | |||
|
|
48 | assert_equal day , c.startdt.cwday | |||
|
|
49 | assert_equal (day + 5) % 7, c.enddt.cwday | |||
|
|
50 | end | |||
|
|
51 | end | |||
|
|
52 | end | |||
|
|
53 | ||||
|
|
54 | def test_weekly_start_day | |||
|
|
55 | [1, 6, 7].each do |day| | |||
|
|
56 | with_settings :start_of_week => day do | |||
|
|
57 | c = Redmine::Helpers::Calendar.new(Date.today, :en, :week) | |||
|
|
58 | assert_equal day, c.startdt.cwday | |||
|
|
59 | assert_equal (day + 5) % 7 + 1, c.enddt.cwday | |||
|
|
60 | end | |||
|
|
61 | end | |||
|
|
62 | end | |||
| 43 | end |
|
63 | end | |
General Comments 0
You need to be logged in to leave comments.
Login now