FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41 from Retrospring/locale-hotfix 

Rename locale cookie
This commit is contained in:
Andreas N. 2015-06-12 20:32:23 +02:00
parent 7bae916f38 43825a0951
commit 6ad9dc4a26
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/application_controller.rb
View File

@ -14,8 +14,8 @@ class ApplicationController < ActionController::Base
if params[:hl].nil?
if current_user.present?
I18n.locale = current_user.locale
elsif not cookies[:hl].nil?
I18n.locale = cookies[:hl]
elsif not cookies[:lang].nil?
I18n.locale = cookies[:lang]
else
I18n.locale = 'en'
end
@ -27,7 +27,7 @@ class ApplicationController < ActionController::Base
end
end
cookies[:hl] = I18n.locale #unless cookies[:allow_cookies].nil? # some EU cookie bullsh-
cookies[:lang] = I18n.locale #unless cookies[:allow_cookies].nil? # some EU cookie bullsh-
end
# check if user got hit by the banhammer of doom