elgaard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Themes: add various services to hackerspaces and makerspaces, add icons, some fixes to make this work with expandRewrite

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-01-02 20:19:43 +01:00
parent d144ae9533
commit 8ceda1cc5f
24 changed files with 731 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Models/ThemeConfig/Conversion/ExpandRewrite.ts
View file

@ -55,12 +55,19 @@ export class ExpandRewrite<T> extends Conversion<T | RewritableConfigJson<T>, T[
for (const key in obj) {
let subtarget = target
if (isTr && target[key] !== undefined) {
if (isTr) {
// The target is a translation AND the current object is a translation
// This means we should recursively replace with the translated value
subtarget = target[key]
if (target[key]) {
// A translation is available!
subtarget = target[key]
} else if (target["en"]) {
subtarget = target["en"]
} else {
// Take the first
subtarget = target[Object.keys(target)[0]]
}
}
obj[key] = replaceRecursive(obj[key], subtarget)
}
return obj