Merge Minor into main #113

Manually merged
niggl merged 416 commits from dev into main 2021-03-26 16:34:56 +00:00
2 changed files with 8 additions and 4 deletions
Showing only changes of commit 91dd5256e9 - Show all commits

View File

@ -6,13 +6,15 @@
let html = ""; let html = "";
async function load() { async function load() {
let md = await fetch("/imprint_" + getLocaleFromNavigator() + ".md"); let md = await fetch("/imprint_" + getLocaleFromNavigator() + ".md");
if((await md.text()).includes("<meta")){ let text = (await md.text()).toString();
if(text.includes("<meta")){
md.ok=false md.ok=false
} }
if (!md.ok) { if (!md.ok) {
md = await fetch("/imprint_en.md"); md = await fetch("/imprint_en.md");
text = await md.text();
} }
html = marked(await md.text()); html = marked(text);
} }
const promise = load(); const promise = load();
</script> </script>

View File

@ -6,13 +6,15 @@
let html = ""; let html = "";
async function load() { async function load() {
let md = await fetch("/privacy_" + getLocaleFromNavigator() + ".md"); let md = await fetch("/privacy_" + getLocaleFromNavigator() + ".md");
if((await md.text()).includes("<meta")){ let text = (await md.text()).toString();
if(text.includes("<meta")){
md.ok=false md.ok=false
} }
if (!md.ok) { if (!md.ok) {
md = await fetch("/privacy_en.md"); md = await fetch("/privacy_en.md");
text = await md.text();
} }
html = marked(await md.text()); html = marked(text);
} }
const promise = load(); const promise = load();
</script> </script>