| @@ -95,7 +95,7 class AccountController < ApplicationController | |||
|
|
95 | 95 | redirect_to(home_url) && return unless Setting.self_registration? || session[:auth_source_registration] |
|
|
96 | 96 | if request.get? |
|
|
97 | 97 | session[:auth_source_registration] = nil |
|
|
98 |
@user = User.new(:language => |
|
|
|
98 | @user = User.new(:language => current_language.to_s) | |
|
|
99 | 99 | else |
|
|
100 | 100 | user_params = params[:user] || {} |
|
|
101 | 101 | @user = User.new |
| @@ -99,6 +99,19 class AccountControllerTest < ActionController::TestCase | |||
|
|
99 | 99 | end |
|
|
100 | 100 | end |
|
|
101 | 101 | |
|
|
102 | def test_get_register_should_detect_user_language | |
|
|
103 | with_settings :self_registration => '3' do | |
|
|
104 | @request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3' | |
|
|
105 | get :register | |
|
|
106 | assert_response :success | |
|
|
107 | assert_not_nil assigns(:user) | |
|
|
108 | assert_equal 'fr', assigns(:user).language | |
|
|
109 | assert_select 'select[name=?]', 'user[language]' do | |
|
|
110 | assert_select 'option[value=fr][selected=selected]' | |
|
|
111 | end | |
|
|
112 | end | |
|
|
113 | end | |
|
|
114 | ||
|
|
102 | 115 | def test_get_register_with_registration_off_should_redirect |
|
|
103 | 116 | with_settings :self_registration => '0' do |
|
|
104 | 117 | get :register |
General Comments 0
You need to be logged in to leave comments.
Login now