Small fixes

This commit is contained in:
pietervdvn 2021-03-04 13:35:03 +01:00
parent f0742ab812
commit c2d520c2e9
5 changed files with 24 additions and 15 deletions

View file

@ -4,7 +4,7 @@ export default class AllTranslationAssets {
public static t = { image: { addPicture: new Translation( {"en":"Add picture","es":"Añadir foto","ca":"Afegir foto","nl":"Voeg foto toe","fr":"Ajoutez une photo","gl":"Engadir imaxe","de":"Bild hinzufügen"} ), public static t = { image: { addPicture: new Translation( {"en":"Add picture","es":"Añadir foto","ca":"Afegir foto","nl":"Voeg foto toe","fr":"Ajoutez une photo","gl":"Engadir imaxe","de":"Bild hinzufügen"} ),
uploadingPicture: new Translation( {"en":"Uploading your picture...","nl":"Bezig met een foto te uploaden...","es":"Subiendo tu imagen ...","ca":"Pujant la teva imatge ...","fr":"Mise en ligne de votre photo...","gl":"Subindo a túa imaxe...","de":"Ihr Bild hochladen..."} ), uploadingPicture: new Translation( {"en":"Uploading your picture...","nl":"Bezig met een foto te uploaden...","es":"Subiendo tu imagen ...","ca":"Pujant la teva imatge ...","fr":"Mise en ligne de votre photo...","gl":"Subindo a túa imaxe...","de":"Ihr Bild hochladen..."} ),
uploadingMultiple: new Translation( {"en":"Uploading {count} of your picture...","nl":"Bezig met {count} foto's te uploaden...","ca":"Pujant {count} de la teva imatge...","es":"Subiendo {count} de tus fotos...","fr":"Mise en ligne de {count} photos...","gl":"Subindo {count} das túas imaxes...","de":"{count} Ihrer Bilder hochgeladen..."} ), uploadingMultiple: new Translation( {"en":"Uploading {count} pictures...","nl":"Bezig met {count} foto's te uploaden...","ca":"Pujant {count} de la teva imatge...","es":"Subiendo {count} de tus fotos...","fr":"Mise en ligne de {count} photos...","gl":"Subindo {count} das túas imaxes...","de":"{count} Ihrer Bilder hochgeladen..."} ),
pleaseLogin: new Translation( {"en":"Please login to add a picure","nl":"Gelieve je aan te melden om een foto toe te voegen","es":"Entra para subir una foto","ca":"Entra per pujar una foto","fr":"Connectez-vous pour mettre une photo en ligne","gl":"Inicia a sesión para subir unha imaxe","de":"Bitte einloggen, um ein Bild hinzuzufügen"} ), pleaseLogin: new Translation( {"en":"Please login to add a picure","nl":"Gelieve je aan te melden om een foto toe te voegen","es":"Entra para subir una foto","ca":"Entra per pujar una foto","fr":"Connectez-vous pour mettre une photo en ligne","gl":"Inicia a sesión para subir unha imaxe","de":"Bitte einloggen, um ein Bild hinzuzufügen"} ),
willBePublished: new Translation( {"en":"Your picture will be published: ","es":"Tu foto será publicada: ","ca":"La teva foto serà publicada: ","nl":"Jouw foto wordt gepubliceerd: ","fr":"Votre photo va être publiée: ","gl":"A túa imaxe será publicada: ","de":"Ihr Bild wird veröffentlicht: "} ), willBePublished: new Translation( {"en":"Your picture will be published: ","es":"Tu foto será publicada: ","ca":"La teva foto serà publicada: ","nl":"Jouw foto wordt gepubliceerd: ","fr":"Votre photo va être publiée: ","gl":"A túa imaxe será publicada: ","de":"Ihr Bild wird veröffentlicht: "} ),
cco: new Translation( {"en":"in the public domain","ca":"en domini públic","es":"en dominio público","nl":"in het publiek domein","fr":"sur le domaine publique","gl":"no dominio público","de":"in die Public Domain"} ), cco: new Translation( {"en":"in the public domain","ca":"en domini públic","es":"en dominio público","nl":"in het publiek domein","fr":"sur le domaine publique","gl":"no dominio público","de":"in die Public Domain"} ),

View file

@ -22,10 +22,7 @@ export default class ThemeIntroductionPanel extends UIElement {
this.languagePicker = LanguagePicker.CreateLanguagePicker(State.state.layoutToUse.data.language, Translations.t.general.pickLanguage); this.languagePicker = LanguagePicker.CreateLanguagePicker(State.state.layoutToUse.data.language, Translations.t.general.pickLanguage);
const layout = State.state.layoutToUse.data; const layout = State.state.layoutToUse.data;
this.description = new Combine([ this.description = layout.description
"<h3>", layout.title, "</h3>",
layout.description
])
this.plzLogIn = this.plzLogIn =
Translations.t.general.loginWithOpenStreetMap Translations.t.general.loginWithOpenStreetMap
.onClick(() => { .onClick(() => {

View file

@ -1,13 +1,13 @@
{ {
"id": "playgrounds", "id": "playgrounds",
"title": { "title": {
"nl": "Speelzones" "nl": "Speelplekken"
}, },
"shortDescription": { "shortDescription": {
"nl": "Speelzones en speeltuinen" "nl": "Speelplekken en sportplekken"
}, },
"description": { "description": {
"nl": "Deze kaart toont speelzones in het groen" "nl": "Op deze kaart vind je speelplekken zoals speeltuinen, speelbossen en sportterreinen"
}, },
"language": [ "language": [
"nl" "nl"
@ -20,7 +20,6 @@
"startZoom": 10, "startZoom": 10,
"widenFactor": 0.05, "widenFactor": 0.05,
"socialImage": "", "socialImage": "",
"hideFromOverview": true,
"layers": [ "layers": [
{ {
"id": "playgrounds", "id": "playgrounds",
@ -33,6 +32,9 @@
"leisure=playground" "leisure=playground"
] ]
}, },
"description": {
"nl": "Speeltuinen en speelbossen"
},
"title": { "title": {
"render": { "render": {
"nl": "Speeltuin" "nl": "Speeltuin"
@ -41,18 +43,28 @@
{ {
"if": { "if": {
"and": [ "and": [
"playground=forest",
"name~*" "name~*"
] ]
}, },
"then": {
"nl": "Speelbos <i>{name}</i>"
}
},
{
"if": "playground=forest",
"then": {
"nl": "Speelbos"
}
},
{
"if": "name~*",
"then": { "then": {
"nl": "Speeltuin <i>{name}</i>" "nl": "Speeltuin <i>{name}</i>"
} }
} }
] ]
}, },
"description": {
"nl": "Alle speeltuinen"
},
"tagRenderings": [ "tagRenderings": [
"images", "images",
{ {

View file

@ -23,7 +23,7 @@
<link rel="stylesheet" href="vendor/MarkerCluster.Default.css"/> <link rel="stylesheet" href="vendor/MarkerCluster.Default.css"/>
<!-- $$$CUSTOM-CSS --> <!-- $$$CUSTOM-CSS -->
<!-- $$$MANIFEST --> <!-- $$$MANIFEST -->
<link rel="manifest" href="./index.webmanifest"> <link rel="manifest" href="./index.manifest">
<link rel="icon" href="assets/svg/add.svg" sizes="any" type="image/svg+xml"> <link rel="icon" href="assets/svg/add.svg" sizes="any" type="image/svg+xml">

View file

@ -218,7 +218,7 @@ async function createLandingPage(layout: LayoutConfig) {
} }
let output = template let output = template
.replace("./index.webmanifest", `${enc(layout.id)}.webmanifest`) .replace("./index.manifest", `${enc(layout.id)}.webmanifest`)
.replace("<!-- $$$OG-META -->", og) .replace("<!-- $$$OG-META -->", og)
.replace(/<title>.+?<\/title>/, `<title>${ogTitle}</title>`) .replace(/<title>.+?<\/title>/, `<title>${ogTitle}</title>`)
.replace("Loading MapComplete, hang on...", `Loading MapComplete theme <i>${ogTitle}</i>...`) .replace("Loading MapComplete, hang on...", `Loading MapComplete theme <i>${ogTitle}</i>...`)
@ -294,7 +294,7 @@ writeFile(generatedDir + "/wikiIndex", wikiPage, (err) => {
description:"MapComplete as a map viewer and editor which show thematic POI based on OpenStreetMap" description:"MapComplete as a map viewer and editor which show thematic POI based on OpenStreetMap"
}),"").then(manifObj => { }),"").then(manifObj => {
const manif = JSON.stringify(manifObj, undefined, 2); const manif = JSON.stringify(manifObj, undefined, 2);
writeFileSync("index.webmanifest",manif) writeFileSync("index.manifest",manif)
}) })
console.log("Counting all translations") console.log("Counting all translations")