raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Guard against nils in conditions

Browse Source
This commit is contained in:
Matt-Yorkley
2020-07-03 14:22:32 +02:00
parent 078726dcca
commit ab63d2234c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/services/user_locale_setter.rb
View File

@@ -61,9 +61,9 @@ class UserLocaleSetter
end
def valid_current_locale
if available_locale?(current_user_locale)
if current_user_locale && available_locale?(current_user_locale)
current_user_locale
elsif available_locale?(cookies[:locale])
elsif cookies[:locale] && available_locale?(cookies[:locale])
cookies[:locale]
else
I18n.default_locale