summaryrefslogtreecommitdiffstats
path: root/app/views/my/account.html.erb
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/my/account.html.erb
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/my/account.html.erb')
-rw-r--r--app/views/my/account.html.erb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 8ec3a8dc9..0ce223b0a 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -16,7 +16,9 @@
<p><%= f.text_field :firstname, :required => true %></p>
<p><%= f.text_field :lastname, :required => true %></p>
<p><%= f.text_field :mail, :required => true %></p>
+ <% unless @user.force_default_language? %>
<p><%= f.select :language, lang_options_for_select %></p>
+ <% end %>
<% if Setting.openid? %>
<p><%= f.text_field :identity_url %></p>
<% end %>