Merge develop

This commit is contained in:
Pieter Vander Vennet 2023-10-30 16:32:43 +01:00
commit 29ff09024f
287 changed files with 14955 additions and 4036 deletions

View file

@ -671,14 +671,13 @@ class SvgToPdfPage {
}
public async PrepareLanguage(language: string) {
let host = window.location.host
if (host.startsWith("127.0.0.1")) {
host = "mapcomplete.org"
}
// Always fetch the remote data - it's cached anyway
this.layerTranslations[language] = await Utils.downloadJsonCached(
window.location.protocol +
"//" +
window.location.host +
"/assets/langs/layers/" +
language +
".json",
window.location.protocol + "//" + host + "/assets/langs/layers/" + language + ".json",
24 * 60 * 60 * 1000
)
}