FIX Set current locale based on actual defined dictionaries #1523
Conversation
| @@ -28,6 +30,7 @@ class i18n { | |||
| */ | |||
| setLocale(locale) { | |||
| this.currentLocale = locale; | |||
| this.autoDetectLocale = false; | |||
There was a problem hiding this comment.
If someone explicitly sets a locale, we don't want to override their decision whenever a new dictionary is added.
| // Re-set current locale in case the new dictionary provides a better match than the old locale. | ||
| if (this.autoDetectLocale) { | ||
| this.currentLocale = this.detectLocale(); | ||
| } |
There was a problem hiding this comment.
Dictionaries are added by separate .js files. This is the most reliable way to ensure that the current locale is detected according to all dictionaries that will be loaded in, allowing for slow network speeds. i.e. at the time each dictionary is loaded in, the most-correct current locale will be set.
We have no way of knowing ahead of time if more dictionaries will be loaded, so we can't reasonably defer until all of them are loaded.
| @@ -174,10 +182,9 @@ class i18n { | |||
| * Detect document language settings by looking at <meta> tags. | |||
| * If no match is found, returns this.defaultLocale. | |||
| * | |||
| * @todo get by <html lang=''> - needs modification of SSViewer | |||
There was a problem hiding this comment.
It's already doing this as the first step
| for (let compareLocale in i18n.lang) { | ||
| for (let compareLocale in this.lang) { |
There was a problem hiding this comment.
The dictionaries are added to this instance of i18n, not as a static property on the class.
Previously, the current locale would always be
nullif a 2-character locale was defined in php withi18n::set_locale()(e.g.i18n::set_locale('nl');), because no dictionaries would have been loaded at the timedetectLocale()was called.Issue