mirrors/retrospring
1
0
Fork 1
mirror of https://github.com/Retrospring/retrospring.git synced 2025-03-31 05:02:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #41 from Retrospring/locale-hotfix

Browse source 
Rename locale cookie
This commit is contained in:
Andreas N. 2015-06-12 20:32:23 +02:00
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 params[:hl].nil?
if current_user.present? if current_user.present?
I18n.locale = current_user.locale I18n.locale = current_user.locale
elsif not cookies[:hl].nil? elsif not cookies[:lang].nil?
I18n.locale = cookies[:hl] I18n.locale = cookies[:lang]
else else
I18n.locale = 'en' I18n.locale = 'en'
end end
@ -27,7 +27,7 @@ class ApplicationController < ActionController::Base
end end
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 end
# check if user got hit by the banhammer of doom # check if user got hit by the banhammer of doom