<p><%= setting_select :default_language, lang_options_for_select(false) %></p>
-<p><%= setting_select :start_of_week, [[day_name(1),'1'], [day_name(7),'7']], :blank => :label_language_based %></p>
+<p><%= setting_select :start_of_week, [[day_name(1),'1'], [day_name(6),'6'], [day_name(7),'7']], :blank => :label_language_based %></p>
<p><%= setting_select :date_format, Setting::DATE_FORMATS.collect {|f| [Date.today.strftime(f), f]}, :blank => :label_language_based %></p>
-# redMine - project management software
-# Copyright (C) 2006-2007 Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
c = Redmine::Helpers::Calendar.new(Date.today, :en, :week)
assert_equal [7, 6], [c.startdt.cwday, c.enddt.cwday]
end
+
+ def test_monthly_start_day
+ [1, 6, 7].each do |day|
+ with_settings :start_of_week => day do
+ c = Redmine::Helpers::Calendar.new(Date.today, :en, :month)
+ assert_equal day , c.startdt.cwday
+ assert_equal (day + 5) % 7, c.enddt.cwday
+ end
+ end
+ end
+
+ def test_weekly_start_day
+ [1, 6, 7].each do |day|
+ with_settings :start_of_week => day do
+ c = Redmine::Helpers::Calendar.new(Date.today, :en, :week)
+ assert_equal day, c.startdt.cwday
+ assert_equal (day + 5) % 7 + 1, c.enddt.cwday
+ end
+ end
+ end
end