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

Merge pull request #4076 from scossar/locale-from-header-setting

Browse Source 
FEATURE: add site setting for setting locale from header
This commit is contained in:
Sam
2016-03-17 07:53:20 +11:00
parent 162fcb75da 1914495e88
commit 84d234a98a
5 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -169,7 +169,7 @@ class ApplicationController < ActionController::Base
def set_locale
if !current_user
if SiteSetting.allow_user_locale
if SiteSetting.set_locale_from_accept_language_header
I18n.locale = locale_from_header
else
I18n.locale = SiteSetting.default_locale