1 files changed, 9 insertions, 10 deletions
diff --git a/lib/redmine/helpers/calendar.rb b/lib/redmine/helpers/calendar.rb
index 69ed62b05..9f3962236 100644
--- a/lib/redmine/helpers/calendar.rb
+++ b/lib/redmine/helpers/calendar.rb
@@ -83,20 +83,19 @@ module Redmine
       # Return the first day of week
       # 1 = Monday ... 7 = Sunday
       def first_wday
-        case Setting.start_of_week.to_i
-        when 1
-          @first_dow ||= (1 - 1)%7 + 1
-        when 6
-          @first_dow ||= (6 - 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
+        @first_wday ||= begin
+          start_of_week = Setting.start_of_week.to_i
+          case start_of_week
+          when 1, 6, 7
+            ((start_of_week - 1) % 7) + 1
+          else
+            ((l(:general_first_day_of_week).to_i - 1) % 7) + 1
+          end
         end
       end
 
       def last_wday
-        @last_dow ||= (first_wday + 5)%7 + 1
+        @last_wday ||= ((first_wday + 5) % 7) + 1
       end
     end
   end