github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 04:31:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #4006 from scossar/set-locale-from-header

Browse Source 
Feature: (WIP) Set locale from Accept-Language header
This commit is contained in:
Régis Hanol
2016-03-04 09:12:30 +01:00
parent 7ddb7ff429 0a396583ed
commit 1135d2094a
8 changed files with 146 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/users_controller.rb
View File

@ -715,7 +715,12 @@ class UsersController < ApplicationController
def user_params
params.permit(:name, :email, :password, :username, :active)
.merge(ip_address: request.remote_ip, registration_ip_address: request.remote_ip)
.merge(ip_address: request.remote_ip, registration_ip_address: request.remote_ip,
locale: user_locale)
end
def user_locale
I18n.locale
end
def fail_with(key)