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 3e1d6cea81b4129314ad419bcdfb429b3ff215d2..cdb64f4173859234fbee4db209047b7341aaf702 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 351760fa1a0f9e522997c2fa630476cbd1d28653..10a08193550ee702fddbfcfda59f32a54a7123ee 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 07dfe794f0b38e8c6692a097f205b0184d62eca1..0ca7cddb6f939298c2f77ffd761af52a00e80d08 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 9bf78abf24138fb0ff4b8d062351dc9a9679817e..8e317f7dddf0a60c36ba4776a7676acb79f327cd 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 77cd1fce10b83bf9ae2ff3e80c38b0d76fe76997..d23aa30eb3617df6aed50c9b51c658abd3b7fbe4 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 095e412365ad50a53ae68a9909722e731e0b39c5..a90fbf80fc4a7642bb9b1dfc9afca524529853d8 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 6fbfd0f5779005bd8789d1e3a3491c8a5f389b0d..2bb10f5502e67e8f80a98dd44c8b442fcd4dc78d 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 7db4cf469a85897f3a02608f35b2da03379ee842..960af08a134290090003aab94b87562b6940f942 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 32129deb1f62ac419dc7159e2be70c7883551f00..1792e9164446da04e0d4d6390f7b4bb4b441cad4 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 6491af515d0668e7151fce214929d573a3932b92..89fee2e3b7ce2ffbb975fb6bc8c70f08d749465a 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 2775ae77e1e32bde8b837ca11b412140faaf9312..067037f164c1ea735320c8784330fc5f84889296 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 89dcdb6f8cb1c9a52473bb80e8c94a10d8e20eea..d8809294cffbdd51989bff00870f742bcb19e165 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 0324f8d4234dc6a16a4bed5c82cf4d2ace5c57df..c203944c46fd6ce550c8ab8621a27f3f1a639aa5 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 873daa57fbceb071613fc6e7076c3f2e224944ca..9ac4095050f3ae6a4903a1a32c859c2038be65f8 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 a7a6690d5788a3a93a0d128bafc351726ab8999c..b71548ccafa72ef1613ba4a173e2a18371180218 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 8e4a977e5589256ee43777231c7cf607289b3e78..1f3a9b595b5345d6b63fb5a0bf776ad89bd9924f 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 b149e88d27ca634052c3ceea02f59f3d95f38fd6..46c00c90ce08f5923333c94f1713bc61a407f48d 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 c5a0e3455fe2e3728eb27abffca24fc9feac9603..f547a3785b44dac54cad49bcedc9a7144499e3dc 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 73f12331f31cc7320962b9f37d05b9af9c22ab5b..51a70762df5c3acfb97bcf54676f3be02b765123 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 605e73be2763ffb1e42807bcc65d6b2b2405eaa8..bd02c2f51da25b3bd33cd39284bf79f7af3e698d 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 7fc547d2e1e72f63f3692105b58a87d16dc970c0..d80581cf548bfcefa705c2c5422c3f1326edea7a 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 096485396a3d20765d487d1d683df99e5c3f31f2..7bc626181788a0ed5613fa8eb5ce5052563f054c 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 f2a6ab96abba4c1af5d3cc777709d9c8afb694ad..0bf2d5cd557184e724e6c4a0dee342949cb0a3c0 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 c34de1c6463b399b2eabe9aac47824a393c6dca1..aae971933420da824304d84e11e5050ab0aaf3ed 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 29f5cd28bf21306b78847a95740ce992b96af1bc..fa9cb57a753ec2a0557aa18808d0fdd74014cf28 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 bd37a3fd38f6f865d7020099f67db59ee50e6f9c..c348f7856c1528bfc31a3966470f835ea05c78f7 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 3d8c0ac0829cd3a6750e4ecc34ad6cf32ff20619..bd1d71b47f284d6cc84b4cb0c40b1856e3d71313 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 20369eaa1de923281f7a3c19b447b2509b0a0ba4..37f26d005240649055608af976dce83ea2389f23 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 df6eb64cc28173de7c5f92d85b571985ad3d00d3..a018dc80a03b521479caa2ac44d8ef6ef2bc77a1 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 6ae247e7766d35fd579c4924abc41418e9fd784d..a4e36e3cfeabe9488ddaf3e824a1ba49365ca0b4 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 a95d9a348f72fde2a0cf22f497c11a3847aff8ea..35b5fc2126d25251cf51aef64ba65b47b4027642 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 961ce24938b9498181c9c6caabc23c04d7b2230b..2036138f07d74a700f640951c28b8bc66d39b712 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 c81976014f19d03b2360d4cbd1312be845e35c42..9f721e0994638887f5ccef405f9a6f73dbf93c3f 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 1da11598767c71739d89ec9d13118a7045d98a31..3d92016a4cf993e09d3b77bda9e16804347e0386 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 cdaa4136bfd704724f7b7245ef93239b26e3a8df..0a25b25d522c5ebdcc495578ecbd2bea4d5eb292 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 442d85039b380c5fe0eb6f34656ea51375b30bcb..33f41a284c7a176aedb31bf4725ccfac8e54f6cb 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 97173fc75c3c34969be83aa7f04f9397e56636f4..18661d6daa996399e647d5d90c607e1d36fac9c8 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 754c0248ae277360536f8fa28250a70018b8defd..1cbcba5237160ce24e1602c143c47bb55037b30a 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 3e703ea6da90fd939f6897d9fba21aa703b1e987..ec474025b91ed633f14fef68b7bda0b4f10ebaac 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