diff --git a/app/services/user_locale_setter.rb b/app/services/user_locale_setter.rb index 6c97e268e2..1f36f4ea66 100644 --- a/app/services/user_locale_setter.rb +++ b/app/services/user_locale_setter.rb @@ -44,6 +44,8 @@ class UserLocaleSetter end def save_locale_from_cookies + # If the user account has a selected locale: we ignore the locale set in cookies, + # which is persisted per-device but not per-user. return unless current_user_locale.nil? && cookies[:locale] && available_locale?(cookies[:locale])