mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
FIX: Show the fallback locale warning when both settings are enabled. (#11787)
We only want to warn admins when both settings are enabled. When "set locale from accept language header" setting is enabled, the user locale will be set based on the header when they register an account on the site, which could be confusing.
This commit is contained in:
parent
b6afcf98b9
commit
fb9e422bd6
@ -45,8 +45,8 @@ export default Controller.extend({
|
||||
@discourseComputed("locale")
|
||||
showFallbackLocaleWarning() {
|
||||
return (
|
||||
(this.siteSettings.allow_user_locale ||
|
||||
this.siteSettings.set_locale_from_accept_language_header) &&
|
||||
this.siteSettings.allow_user_locale &&
|
||||
this.siteSettings.set_locale_from_accept_language_header &&
|
||||
this.fallbackLocaleFullName
|
||||
);
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user