Merge branch 'develop'

This commit is contained in:
Pieter Vander Vennet 2022-04-21 12:49:24 +02:00
commit dbe53afb49
11 changed files with 69 additions and 62 deletions

View file

@ -161,8 +161,8 @@ async function createManifest(layout: LayoutConfig, alreadyWritten: string[]): P
console.log(icon)
throw "Icon is not an svg for " + layout.id
}
const ogTitle = Translations.WT(layout.title).txt;
const ogDescr = Translations.WT(layout.description ?? "").txt;
const ogTitle = Translations.T(layout.title).txt;
const ogDescr = Translations.T(layout.description ?? "").txt;
const manifest = {
name: name,
@ -186,8 +186,8 @@ async function createLandingPage(layout: LayoutConfig, manifest, whiteIcons, alr
Locale.language.setData(layout.language[0]);
const targetLanguage = layout.language[0]
const ogTitle = Translations.WT(layout.title).textFor(targetLanguage).replace(/"/g, '\\"');
const ogDescr = Translations.WT(layout.shortDescription ?? "Easily add and edit geodata with OpenStreetMap").textFor(targetLanguage).replace(/"/g, '\\"');
const ogTitle = Translations.T(layout.title).textFor(targetLanguage).replace(/"/g, '\\"');
const ogDescr = Translations.T(layout.shortDescription ?? "Easily add and edit geodata with OpenStreetMap").textFor(targetLanguage).replace(/"/g, '\\"');
let ogImage = layout.socialImage;
let twitterImage = ogImage
if (ogImage === LayoutConfig.defaultSocialImage && layout.official) {

View file

@ -18,7 +18,7 @@ function generateWikiEntry(layout: { hideFromOverview: boolean, id: string, shor
|name= [https://mapcomplete.osm.be/${layout.id} ${layout.id}]
|region= Worldwide
|lang= ${languages}
|descr= A MapComplete theme: ${Translations.WT(layout.shortDescription)
|descr= A MapComplete theme: ${Translations.T(layout.shortDescription)
.textFor("en")
.replace("<a href='", "[[")
.replace(/'>.*<\/a>/, "]]")