From e391be40866f720ddc47398bb51e63e551935de3 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 24 Jan 2014 10:28:12 +0000
Subject: 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
---
 app/views/users/_form.html.erb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/views/users')

diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index e90095827..413e3550b 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -9,7 +9,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 %>
-- 
cgit v1.2.3