lordwelch/downthemall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Harden locale loader

Browse Source
This commit is contained in:
Nils Maier 2020-08-29 23:49:02 +02:00
parent 3e31cb326b
commit c540c1fc29
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/i18n.ts
View File

@ -40,11 +40,11 @@ class Entry {
this.message = entry.message.replace(/\$[A-Z0-9]+\$/g, (r: string) => { this.message = entry.message.replace(/\$[A-Z0-9]+\$/g, (r: string) => {
hit = true; hit = true;
const id = r.substr(1, r.length - 2).toLocaleLowerCase(); const id = r.substr(1, r.length - 2).toLocaleLowerCase();
const pholder = entry.placeholders[id]; const placeholder = entry.placeholders[id];
if (!pholder || !pholder.content) { if (!placeholder || !placeholder.content) {
throw new Error(`Invalid placeholder: ${id}`); throw new Error(`Invalid placeholder: ${id}`);
} }
return `${pholder.content}$`; return `${placeholder.content}$`;
}); });
if (!hit) { if (!hit) {
throw new Error("Not entry-able"); throw new Error("Not entry-able");
@ -123,13 +123,14 @@ async function fetchLanguage(code: string) {
} }
async function loadCached() { async function loadCached(): Promise<any> {
const cached = await lf.getItem<string>(CACHE_KEY); const cached = await lf.getItem<string>(CACHE_KEY);
if (!cached) { if (!cached) {
return null; return null;
} }
const parsed = JSON.parse(cached); const parsed = JSON.parse(cached);
if (Array.isArray(parsed)) { if (!Array.isArray(parsed) || !parsed[0].CRASH || !parsed[0].CRASH.message) {
console.warn("rejecting cached locales", parsed);
return null; return null;
} }
return parsed; return parsed;
@ -195,7 +196,7 @@ async function load(): Promise<Localization> {
await lf.setItem(CACHE_KEY, JSON.stringify(valid)); await lf.setItem(CACHE_KEY, JSON.stringify(valid));
} }
if (!valid.length) { if (!valid.length) {
throw new Error("Could not lood ANY of these locales"); throw new Error("Could not load ANY of these locales");
} }
const custom = await lf.getItem<string>(CUSTOM_KEY); const custom = await lf.getItem<string>(CUSTOM_KEY);
@ -241,7 +242,7 @@ locale.then(l => {
/** /**
* Localize a message * Localize a message
* @param {string} id Identifier of the string to localize * @param {string} id Identifier of the string to localize
* @param {string[]} [subst] Message substituations * @param {string[]} [subst] Message substitutions
* @returns {string} Localized message * @returns {string} Localized message
*/ */
export function _(id: string, ...subst: any[]) { export function _(id: string, ...subst: any[]) {