Added a setting to configure the day that week start on (Monday or Sunday). (#4363)

[redminele/redmine.git] / lib / redmine / helpers / calendar.rb

diff --git a/lib/redmine/helpers/calendar.rb b/lib/redmine/helpers/calendar.rb
index 3e703ea..ec47402 100644 (file)
--- 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