From c2c0c103a2dd621f97d94e0326e623c828294ec4 Mon Sep 17 00:00:00 2001
From: Francisco de Juan <francisco.juan@gmail.com>
Date: Mon, 14 Jul 2014 06:36:53 +0200
Subject: [PATCH] force english as uniq locale
---
app/controllers/application_controller.rb | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f6e4346dc..5cc2fa38a 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -127,18 +127,7 @@ class ApplicationController < ActionController::Base
end
def set_localization
- lang = nil
- if User.current.logged?
- lang = find_language(User.current.language)
- end
- if lang.nil? && request.env['HTTP_ACCEPT_LANGUAGE']
- accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first
- if !accept_lang.blank?
- accept_lang = accept_lang.downcase
- lang = find_language(accept_lang) || find_language(accept_lang.split('-').first)
- end
- end
- lang ||= Setting.default_language
+ lang = Setting.default_language
set_language_if_valid(lang)
end
--
GitLab