From c31a6719735114c371e5da68eb3787b8713c5360 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 13 Dec 2009 04:06:55 +0000 Subject: Added a setting to configure the day that week start on (Monday or Sunday). (#4363) git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3166 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/helpers/calendar.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'lib/redmine') diff --git a/lib/redmine/helpers/calendar.rb b/lib/redmine/helpers/calendar.rb index 3e703ea6d..ec474025b 100644 --- a/lib/redmine/helpers/calendar.rb +++ b/lib/redmine/helpers/calendar.rb @@ -65,7 +65,14 @@ module Redmine # Return the first day of week # 1 = Monday ... 7 = Sunday def first_wday - @first_dow ||= (l(:general_first_day_of_week).to_i - 1)%7 + 1 + case Setting.start_of_week.to_i + when 1 + @first_dow ||= (1 - 1)%7 + 1 + when 7 + @first_dow ||= (7 - 1)%7 + 1 + else + @first_dow ||= (l(:general_first_day_of_week).to_i - 1)%7 + 1 + end end def last_wday -- cgit v1.2.3