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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3e1d6ce..cdb64f4 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -659,8 +659,18 @@ module ApplicationHelper
     unless @calendar_headers_tags_included
       @calendar_headers_tags_included = true
       content_for :header_tags do
+        start_of_week = case Setting.start_of_week.to_i
+        when 1
+          'Calendar._FD = 1;' # Monday
+        when 7
+          'Calendar._FD = 0;' # Sunday
+        else
+          '' # use language
+        end
+        
         javascript_include_tag('calendar/calendar') +
         javascript_include_tag("calendar/lang/calendar-#{current_language.to_s.downcase}.js") +
+        javascript_tag(start_of_week) +  
         javascript_include_tag('calendar/calendar-setup') +
         stylesheet_link_tag('calendar')
       end

diff --git a/app/views/settings/_display.rhtml b/app/views/settings/_display.rhtml
index 351760f..10a0819 100644 (file)
--- a/app/views/settings/_display.rhtml
+++ b/app/views/settings/_display.rhtml
@@ -7,6 +7,9 @@
 <p><label><%= l(:setting_default_language) %></label>
 <%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %></p>
 
+<p><label><%= l(:setting_start_of_week) %></label>
+<%= select_tag 'settings[start_of_week]', options_for_select( [[l(:label_language_based), ''], [day_name(1),'1'], [day_name(7),'7']] , Setting.start_of_week) %></p>
+
 <p><label><%= l(:setting_date_format) %></label>
 <%= select_tag 'settings[date_format]', options_for_select( [[l(:label_language_based), '']] + Setting::DATE_FORMATS.collect {|f| [Date.today.strftime(f), f]}, Setting.date_format) %></p>
 

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 07dfe79..0ca7cdd 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -853,3 +853,4 @@ bg:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 9bf78ab..8e317f7 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -877,3 +877,4 @@ bs:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 77cd1fc..d23aa30 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -856,3 +856,4 @@ ca:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 095e412..a90fbf8 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -859,3 +859,4 @@ cs:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 6fbfd0f..2bb10f5 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -879,3 +879,4 @@ da:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 7db4cf4..960af08 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -879,3 +879,4 @@ de:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 32129de..1792e91 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -859,3 +859,4 @@ el:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6491af5..89fee2e 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -322,6 +322,7 @@ en:
   setting_issue_done_ratio: Calculate the issue done ratio with
   setting_issue_done_ratio_issue_field: Use the issue field
   setting_issue_done_ratio_issue_status: Use the issue status
+  setting_start_of_week: Start calendars on
   
   permission_add_project: Create project
   permission_edit_project: Edit project

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 2775ae7..067037f 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -900,3 +900,4 @@ es:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 89dcdb6..d880929 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -889,3 +889,4 @@ fi:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 0324f8d..c203944 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -882,3 +882,4 @@ fr:
   field_active: Actif
   enumeration_system_activity: Activité système
   setting_gravatar_default: Default Gravatar image
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 873daa5..9ac4095 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -879,3 +879,4 @@ gl:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/he.yml b/config/locales/he.yml
index a7a6690..b71548c 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -863,3 +863,4 @@ he:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 8e4a977..1f3a9b5 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -884,3 +884,4 @@
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/it.yml b/config/locales/it.yml
index b149e88..46c00c9 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -866,3 +866,4 @@ it:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index c5a0e34..f547a37 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -888,3 +888,4 @@ ja:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 73f1233..51a7076 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -919,3 +919,4 @@ ko:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 605e73b..bd02c2f 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -889,3 +889,4 @@ lt:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 7fc547d..d80581c 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -841,3 +841,4 @@ nl:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/no.yml b/config/locales/no.yml
index 0964853..7bc6261 100644 (file)
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -854,3 +854,4 @@
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index f2a6ab9..0bf2d5c 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -882,3 +882,4 @@ pl:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index c34de1c..aae9719 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -885,3 +885,4 @@ pt-BR:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 29f5cd2..fa9cb57 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -871,3 +871,4 @@ pt:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index bd37a3f..c348f78 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -856,3 +856,4 @@ ro:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 3d8c0ac..bd1d71b 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -967,3 +967,4 @@ ru:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 20369ea..37f26d0 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -858,3 +858,4 @@ sk:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index df6eb64..a018dc8 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -855,3 +855,4 @@ sl:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 6ae247e..a4e36e3 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -874,3 +874,4 @@
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index a95d9a3..35b5fc2 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -908,3 +908,4 @@ sv:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/th.yml b/config/locales/th.yml
index 961ce24..2036138 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -856,3 +856,4 @@ th:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index c819760..9f721e0 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -886,3 +886,4 @@ tr:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 1da1159..3d92016 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -855,3 +855,4 @@ uk:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index cdaa413..0a25b25 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -918,3 +918,4 @@ vi:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 442d850..33f41a2 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -950,3 +950,4 @@
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 97173fc..18661d6 100644 (file)
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -883,3 +883,4 @@ zh:
   notice_issue_done_ratios_updated: Issue done ratios updated.
   error_workflow_copy_source: Please select a source tracker or role
   label_update_issue_done_ratios: Update issue done ratios
+  setting_start_of_week: Start calendars on

diff --git a/config/settings.yml b/config/settings.yml
index 754c024..1cbcba5 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -172,3 +172,5 @@ openid:
   default: 0
 gravatar_default:
   default: ''
+start_of_week:
+  default: ''

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