summaryrefslogtreecommitdiffstats
path: root/app/views/settings
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2014-01-24 10:28:12 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2014-01-24 10:28:12 +0000
commite391be40866f720ddc47398bb51e63e551935de3 (patch)
treed0bf0d5efd8e020e0bf9b03a2e07f3bbc0a2eb25 /app/views/settings
parent6e6c6fac5caf92103a54e0c8f76a06f5f1b3b4f4 (diff)
downloadredmine-e391be40866f720ddc47398bb51e63e551935de3.tar.gz
redmine-e391be40866f720ddc47398bb51e63e551935de3.zip
Adds settings for disabling browser language detection and language preference (#2691).
git-svn-id: http://svn.redmine.org/redmine/trunk@12691 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/settings')
-rw-r--r--app/views/settings/_display.html.erb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/settings/_display.html.erb b/app/views/settings/_display.html.erb
index 1ae5a351a..ab1ce9b9b 100644
--- a/app/views/settings/_display.html.erb
+++ b/app/views/settings/_display.html.erb
@@ -5,6 +5,10 @@
<p><%= setting_select :default_language, lang_options_for_select(false) %></p>
+<p><%= setting_check_box :force_default_language_for_anonymous %></p>
+
+<p><%= setting_check_box :force_default_language_for_loggedin %></p>
+
<p><%= setting_select :start_of_week, [[day_name(1),'1'], [day_name(6),'6'], [day_name(7),'7']], :blank => :label_language_based %></p>
<% locale = User.current.language.blank? ? ::I18n.locale : User.current.language %>
<p><%= setting_select :date_format, Setting::DATE_FORMATS.collect {|f| [::I18n.l(Date.today, :locale => locale, :format => f), f]}, :blank => :label_language_based %></p>