lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

GRN2-112: Default language fallback fails with a 500 error (#469)

Browse Source 
* GRN2-112: Default language fallback fails with a 500 error

* Updates for passing rspec tests

* Added cache for gitlab ci

* Updated cache for gitlab

* Restored Dockerfile

* Fixed glitch in filter for build and deployment
This commit is contained in:
Jesus Federico
2019-04-17 15:33:38 -04:00
committed by GitHub
parent c8a799bce8
commit 9b2424cde0
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/application_controller.rb
View File

@ -44,11 +44,12 @@ class ApplicationController < ActionController::Base
end
def update_locale(user)
I18n.locale = if user && user.language != 'default'
user.language.tr('-', '_')
locale = if user && user.language != 'default'
user.language
else
http_accept_language.language_region_compatible_from(I18n.available_locales)
end
I18n.locale = locale.tr('-', '_') unless locale.nil?
end
def meeting_name_limit