CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-22 08:17:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve some variable names in core/localizer

Browse Source
This commit is contained in:
Quincy Morgan
2021-02-23 11:50:42 -05:00
parent 13ddeecfa7
commit 9423f61adf
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/localizer.js
+12 -14
View File
@@ -94,9 +94,9 @@ export function coreLocalizer() {
};
let fileMap = fileFetcher.fileMap();
for (let id in localeDirs) {
let key = `locales_index_${id}`;
fileMap[key] = localeDirs[id] + '/index.min.json';
for (let scopeId in localeDirs) {
let key = `locales_index_${scopeId}`;
fileMap[key] = localeDirs[scopeId] + '/index.min.json';
filesToFetch.push(key);
}
@@ -126,9 +126,9 @@ export function coreLocalizer() {
});
// We only need to load locales up until we find one with full coverage
_localeCodes.slice(0, fullCoverageIndex + 1).forEach(function(code) {
let id = Object.keys(localeDirs)[i];
let dir = Object.values(localeDirs)[i];
if (index[code]) loadStringsPromises.push(localizer.loadLocale(code, id, dir));
let scopeId = Object.keys(localeDirs)[i];
let directory = Object.values(localeDirs)[i];
if (index[code]) loadStringsPromises.push(localizer.loadLocale(code, scopeId, directory));
});
});
@@ -187,25 +187,23 @@ export function coreLocalizer() {
/* Locales */
// Returns a Promise to load the strings for the requested locale
localizer.loadLocale = (requested, id, dir) => {
let locale = requested;
localizer.loadLocale = (locale, scopeId, directory) => {
// US English is the default
if (locale.toLowerCase() === 'en-us') locale = 'en';
if (_localeStrings[id] && _localeStrings[id][locale]) { // already loaded
if (_localeStrings[scopeId] && _localeStrings[scopeId][locale]) { // already loaded
return Promise.resolve(locale);
}
let fileMap = fileFetcher.fileMap();
const key = `locale_${id}_${locale}`;
fileMap[key] = `${dir}/${locale}.min.json`;
const key = `locale_${scopeId}_${locale}`;
fileMap[key] = `${directory}/${locale}.min.json`;
return fileFetcher.get(key)
.then(d => {
if (!_localeStrings[id]) _localeStrings[id] = {};
_localeStrings[id][locale] = d[locale];
if (!_localeStrings[scopeId]) _localeStrings[scopeId] = {};
_localeStrings[scopeId][locale] = d[locale];
return locale;
});
};