Bastian-Greshake-Tzovaras/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Different translation rendering, which should be more stable in the face of updates

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-09-26 20:58:10 +02:00
parent b7f60e9712
commit c019650ee9
14 changed files with 1055 additions and 1034 deletions
Download patch file Download diff file Expand all files Collapse all files

27
scripts/generateTranslations.ts
View file

@ -61,14 +61,14 @@ class TranslationPart {
continue
}
if (v["id"] !== undefined) {
if (v["id"] !== undefined && context.endsWith("tagRenderings")) {
// We use the embedded id as key instead of the index as this is more stable
// Note: indonesian is shortened as 'id' as well!
if (v["en"] !== undefined || v["nl"] !== undefined) {
// This is probably a translation already!
// pass
} else {
key = v["id"]
if (typeof key !== "string") {
throw "Panic: found a non-string ID at" + context
@ -247,16 +247,34 @@ function generateTranslationsObjectFrom(objects: { path: string, parsed: { id: s
}
}
/**
* Merge two objects together
* @param source: where the tranlations come from
* @param target: the object in which the translations should be merged
* @param language: the language code
* @param context: context for error handling
* @constructor
*/
function MergeTranslation(source: any, target: any, language: string, context: string = "") {
let keyRemapping: Map<string, string> = undefined
if (context.endsWith(".tagRenderings")) {
keyRemapping = new Map<string, string>()
for (const key in target) {
keyRemapping.set(target[key].id, key)
}
}
for (const key in source) {
if (!source.hasOwnProperty(key)) {
continue
}
const sourceV = source[key];
const targetV = target[key]
const targetV = target[keyRemapping?.get(key) ?? key]
if (typeof sourceV === "string") {
// Add the translation
if (targetV === undefined) {
if (typeof target === "string") {
throw "Trying to merge a translation into a fixed string at " + context + " for key " + key;
@ -335,6 +353,9 @@ function mergeLayerTranslations() {
}
}
/**
* Load the translations into the theme files
*/
function mergeThemeTranslations() {
const themeFiles = ScriptUtils.getThemeFiles();
for (const themeFile of themeFiles) {