CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-15 21:48:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Re-add endpoint to set the preferred locale code programmatically

Browse Source
This commit is contained in:
Quincy Morgan
2020-07-20 15:58:47 -04:00
parent 657b052177
commit c2065dbd27
2 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/context.js
+12
View File
@@ -114,6 +114,14 @@ export function coreContext() {
};
// A string or array or locale codes to prefer over the browser's settings
context.locale = function(locale) {
if (!arguments.length) return localizer.localeCode();
localizer.preferredLocaleCodes(locale);
return context;
};
function afterLoad(cid, callback) {
return (err, result) => {
if (err) {
@@ -533,6 +541,10 @@ export function coreContext() {
presetManager.addablePresetIDs(new Set(context.initialHashParams.presets.split(',')));
}
if (context.initialHashParams.locale) {
localizer.preferredLocaleCodes(context.initialHashParams.locale);
}
// kick off some async work
localizer.ensureLoaded();
_background.ensureLoaded();
modules/core/localizer.js
+31 -23
View File
@@ -53,6 +53,21 @@ export function coreLocalizer() {
localizer.scriptNames = () => _scriptNames;
// The client app may want to manually set the locale, regardless of the
// settings provided by the browser
let _preferredLocaleCodes = [];
localizer.preferredLocaleCodes = function(codes) {
if (!arguments.length) return _preferredLocaleCodes;
if (typeof codes === 'string') {
// be generous and accept delimited strings as input
_preferredLocaleCodes = codes.split(/,|;| /gi).filter(Boolean);
} else {
_preferredLocaleCodes = codes;
}
return localizer;
};
var _loadPromise;
localizer.ensureLoaded = () => {
@@ -70,15 +85,10 @@ export function coreLocalizer() {
_dataLocales = results[1];
})
.then(() => {
const hash = utilStringQs(window.location.hash);
if (hash.locale && _dataLocales[hash.locale]) {
// the locale can be manually set in the URL hash
_localeCode = hash.locale;
} else {
// otherwise use the locale specified by the browser
_localeCode = supportedBrowserLocale();
}
let requestedLocales = (_preferredLocaleCodes || [])
// list of locales preferred by the browser in priority order
.concat(utilDetect().browserLocales);
_localeCode = bestSupportedLocale(requestedLocales);
return Promise.all([
// always load the English locale strings as fallbacks
@@ -93,34 +103,32 @@ export function coreLocalizer() {
.catch(err => console.error(err)); // eslint-disable-line
};
// Returns the best locale requested by the browser supported by iD, if any
function supportedBrowserLocale() {
// list of locales preferred by the browser in priority order
let browserLocales = utilDetect().browserLocales;
// Returns the best locale from `locales` supported by iD, if any
function bestSupportedLocale(locales) {
let supportedLocales = _dataLocales;
for (let i in browserLocales) {
let browserLocale = browserLocales[i];
if (browserLocale.includes('-')) { // full locale ('es-ES')
for (let i in locales) {
let locale = locales[i];
if (locale.includes('-')) { // full locale ('es-ES')
if (supportedLocales[browserLocale]) return browserLocale;
if (supportedLocales[locale]) return locale;
// If full locale not supported ('es-FAKE'), fallback to the base ('es')
let langPart = browserLocale.split('-')[0];
let langPart = locale.split('-')[0];
if (supportedLocales[langPart]) return langPart;
} else { // base locale ('es')
// prefer a lower-priority full locale with this base ('es' < 'es-ES')
let fullLocale = browserLocales.find((locale, index) => {
let fullLocale = locales.find((locale2, index) => {
return index > i &&
locale !== browserLocale &&
locale.split('-')[0] === browserLocale &&
supportedLocales[locale];
locale2 !== locale &&
locale2.split('-')[0] === locale &&
supportedLocales[locale2];
});
if (fullLocale) return fullLocale;
if (supportedLocales[browserLocale]) return browserLocale;
if (supportedLocales[locale]) return locale;
}
}