jro_apps/redmine Commit - r12416:e391be40866f

app/controllers/application_controller.rb +1 -1

                 if User.current.logged?
                   lang = find_language(User.current.language)
                 end
-                if lang.nil? && request.env['HTTP_ACCEPT_LANGUAGE']
+                if lang.nil? && !Setting.force_default_language_for_anonymous? && request.env['HTTP_ACCEPT_LANGUAGE']
                   accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first
                   if !accept_lang.blank?
                     accept_lang = accept_lang.downcase

app/helpers/settings_helper.rb +1 -1

               def setting_label(setting, options={})
                 label = options.delete(:label)
-                label != false ? label_tag("settings_#{setting}", l(label || "setting_#{setting}")).html_safe : ''
+                label != false ? label_tag("settings_#{setting}", l(label || "setting_#{setting}"), options[:label_options]).html_safe : ''
               end
               # Renders a notification field for a Redmine::Notifiable option

app/models/user.rb +12 0

@@ -314,6 +314,18 class User < Principal
314	@time_zone \|\|= (self.pref.time_zone.blank? ? nil : ActiveSupport::TimeZone[self.pref.time_zone])	314	@time_zone \|\|= (self.pref.time_zone.blank? ? nil : ActiveSupport::TimeZone[self.pref.time_zone])
315	end	315	end
316		316
		317	def force_default_language?
		318	Setting.force_default_language_for_loggedin?
		319	end
		320
		321	def language
		322	if force_default_language?
		323	Setting.default_language
		324	else
		325	super
		326	end
		327	end
		328
317	def wants_comments_in_reverse_order?	329	def wants_comments_in_reverse_order?
318	self.pref[:comments_sorting] == 'desc'	330	self.pref[:comments_sorting] == 'desc'
319	end	331	end

app/views/account/register.html.erb +3 0

             <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>

app/views/my/account.html.erb +2 0

               <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 %>

app/views/settings/_display.html.erb +4 0

             <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>

app/views/users/_form.html.erb +2 0

               <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 %>

config/locales/en.yml +2 0

               setting_jsonp_enabled: Enable JSONP support
               setting_default_projects_tracker_ids: Default trackers for new projects
               setting_mail_handler_excluded_filenames: Exclude attachments by name
+              setting_force_default_language_for_anonymous: Force default language for anonymous users
+              setting_force_default_language_for_loggedin: Force default language for logged-in users
               permission_add_project: Create project
               permission_add_subprojects: Create subprojects

config/locales/fr.yml +2 0

               setting_jsonp_enabled: Activer le support JSONP
               setting_default_projects_tracker_ids: Trackers par défaut pour les nouveaux projets
               setting_mail_handler_excluded_filenames: Exclure les fichiers attachés par leur nom
+              setting_force_default_language_for_anonymous: Forcer la langue par défault pour les utilisateurs anonymes
+              setting_force_default_language_for_loggedin: Forcer la langue par défault pour les utilisateurs identifiés
               permission_add_project: Créer un projet
               permission_add_subprojects: Créer des sous-projets

config/settings.yml +4 0

               default: ""
             default_language:
               default: en
+            force_default_language_for_anonymous:
+              default: 0
+            force_default_language_for_loggedin:
+              default: 0
             host_name:
               default: localhost:3000
             protocol:

public/stylesheets/application.css +1 -1

               text-align: left;
               float: none;
               display: block;
-              width: auto;
+              width: auto !important;
             }
             .tabular label.inline{

test/functional/my_controller_test.rb +14 0

@@ -82,6 +82,20 class MyControllerTest < ActionController::TestCase
82	assert_no_tag :input, :attributes => { :name => 'user[custom_field_values][4]'}	82	assert_no_tag :input, :attributes => { :name => 'user[custom_field_values][4]'}
83	end	83	end
84		84
		85	def test_my_account_should_show_language_select
		86	get :account
		87	assert_response :success
		88	assert_select 'select[name=?]', 'user[language]'
		89	end
		90
		91	def test_my_account_should_not_show_language_select_with_force_default_language_for_loggedin
		92	with_settings :force_default_language_for_loggedin => '1' do
		93	get :account
		94	assert_response :success
		95	assert_select 'select[name=?]', 'user[language]', 0
		96	end
		97	end
		98
85	def test_update_account	99	def test_update_account
86	post :account,	100	post :account,
87	:user => {	101	:user => {

test/functional/welcome_controller_test.rb +29 0

@@ -54,6 +54,35 class WelcomeControllerTest < ActionController::TestCase
54	assert_equal :fr, @controller.current_language	54	assert_equal :fr, @controller.current_language
55	end	55	end
56		56
		57	def test_browser_language_should_be_ignored_with_force_default_language_for_anonymous
		58	Setting.default_language = 'en'
		59	@request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'
		60	with_settings :force_default_language_for_anonymous => '1' do
		61	get :index
		62	assert_equal :en, @controller.current_language
		63	end
		64	end
		65
		66	def test_user_language_should_be_used
		67	Setting.default_language = 'fi'
		68	user = User.find(2).update_attribute :language, 'it'
		69	@request.session[:user_id] = 2
		70	@request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'
		71	get :index
		72	assert_equal :it, @controller.current_language
		73	end
		74
		75	def test_user_language_should_be_ignored_if_force_default_language_for_loggedin
		76	Setting.default_language = 'fi'
		77	user = User.find(2).update_attribute :language, 'it'
		78	@request.session[:user_id] = 2
		79	@request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'
		80	with_settings :force_default_language_for_loggedin => '1' do
		81	get :index
		82	assert_equal :fi, @controller.current_language
		83	end
		84	end
		85
57	def test_robots	86	def test_robots
58	get :robots	87	get :robots
59	assert_response :success	88	assert_response :success

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages