From 8797bfd5f752ba8e42950ad8aabc32e29b31941b Mon Sep 17 00:00:00 2001 From: Marie Birner Date: Mon, 10 Apr 2023 22:56:47 +0200 Subject: [PATCH 1/9] [TASK] replace Freitag with Markttag for phipsi --- frontend/main.ts | 10 ++++++++++ templates/index.html.tera | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/frontend/main.ts b/frontend/main.ts index 1e1d7cb..8275a1d 100644 --- a/frontend/main.ts +++ b/frontend/main.ts @@ -5,6 +5,8 @@ document.addEventListener('DOMContentLoaded', function() { initSearch(); initSidebar(); initToggle(); + + replaceStrings(); }); function initToggle() { @@ -206,3 +208,11 @@ function initTripSidebar(triggerElement: HTMLElement) { } } } + +function replaceStrings() { + const weekdays = document.querySelectorAll('.weekday-js'); + Array.prototype.forEach.call(weekdays, (weekday: HTMLElement) => { + //weekday.innerHTML = weekday.innerHTML.replace('Donnerstag', 'Dönerstag'); + weekday.innerHTML = weekday.innerHTML.replace('Freitag', 'Markttag'); + }); +} diff --git a/templates/index.html.tera b/templates/index.html.tera index 5069411..c1d26d6 100644 --- a/templates/index.html.tera +++ b/templates/index.html.tera @@ -40,7 +40,7 @@

{{ day.day| date(format="%d.%m.%Y") }} - {{ day.day | date(format="%A", locale="de_AT") }} + {{ day.day | date(format="%A", locale="de_AT") }}

{# --- START Events --- #} From d07581aa3dc1a07d3caa7dac98de1f33362b9cf5 Mon Sep 17 00:00:00 2001 From: Marie Birner Date: Mon, 10 Apr 2023 22:56:47 +0200 Subject: [PATCH 2/9] [TASK] replace Freitag with Markttag for phipsi --- frontend/main.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/frontend/main.ts b/frontend/main.ts index 9d9bd2d..cc8d8dd 100644 --- a/frontend/main.ts +++ b/frontend/main.ts @@ -5,6 +5,8 @@ document.addEventListener('DOMContentLoaded', function() { initSearch(); initSidebar(); initToggle(); + + replaceStrings(); }); function initToggle() { @@ -217,3 +219,11 @@ function initTripSidebar(triggerElement: HTMLElement) { } } } + +function replaceStrings() { + const weekdays = document.querySelectorAll('.weekday-js'); + Array.prototype.forEach.call(weekdays, (weekday: HTMLElement) => { + //weekday.innerHTML = weekday.innerHTML.replace('Donnerstag', 'Dönerstag'); + weekday.innerHTML = weekday.innerHTML.replace('Freitag', 'Markttag'); + }); +} From 689ff36534f64d69eedbeae45e75d43b7f8bc7d1 Mon Sep 17 00:00:00 2001 From: philipp Date: Tue, 5 Sep 2023 13:21:18 +0200 Subject: [PATCH 3/9] don't be too funny --- frontend/main.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/main.ts b/frontend/main.ts index cc8d8dd..95adeee 100644 --- a/frontend/main.ts +++ b/frontend/main.ts @@ -223,7 +223,6 @@ function initTripSidebar(triggerElement: HTMLElement) { function replaceStrings() { const weekdays = document.querySelectorAll('.weekday-js'); Array.prototype.forEach.call(weekdays, (weekday: HTMLElement) => { - //weekday.innerHTML = weekday.innerHTML.replace('Donnerstag', 'Dönerstag'); weekday.innerHTML = weekday.innerHTML.replace('Freitag', 'Markttag'); }); } From df261128205530f173fc135b1b3deacaa35602e1 Mon Sep 17 00:00:00 2001 From: Marie Birner Date: Mon, 10 Apr 2023 22:56:47 +0200 Subject: [PATCH 4/9] [TASK] replace Freitag with Markttag for phipsi --- frontend/main.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/frontend/main.ts b/frontend/main.ts index 9d9bd2d..cc8d8dd 100644 --- a/frontend/main.ts +++ b/frontend/main.ts @@ -5,6 +5,8 @@ document.addEventListener('DOMContentLoaded', function() { initSearch(); initSidebar(); initToggle(); + + replaceStrings(); }); function initToggle() { @@ -217,3 +219,11 @@ function initTripSidebar(triggerElement: HTMLElement) { } } } + +function replaceStrings() { + const weekdays = document.querySelectorAll('.weekday-js'); + Array.prototype.forEach.call(weekdays, (weekday: HTMLElement) => { + //weekday.innerHTML = weekday.innerHTML.replace('Donnerstag', 'Dönerstag'); + weekday.innerHTML = weekday.innerHTML.replace('Freitag', 'Markttag'); + }); +} From ac728dc203477469fb44377957e1d1fac8190cb6 Mon Sep 17 00:00:00 2001 From: philipp Date: Tue, 5 Sep 2023 13:21:18 +0200 Subject: [PATCH 5/9] don't be too funny --- frontend/main.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/main.ts b/frontend/main.ts index cc8d8dd..95adeee 100644 --- a/frontend/main.ts +++ b/frontend/main.ts @@ -223,7 +223,6 @@ function initTripSidebar(triggerElement: HTMLElement) { function replaceStrings() { const weekdays = document.querySelectorAll('.weekday-js'); Array.prototype.forEach.call(weekdays, (weekday: HTMLElement) => { - //weekday.innerHTML = weekday.innerHTML.replace('Donnerstag', 'Dönerstag'); weekday.innerHTML = weekday.innerHTML.replace('Freitag', 'Markttag'); }); } From c06173d04b9fb12dbebdb6131247bb90bcf02f33 Mon Sep 17 00:00:00 2001 From: Marie Birner Date: Mon, 10 Apr 2023 22:56:47 +0200 Subject: [PATCH 6/9] [TASK] replace Freitag with Markttag for phipsi --- frontend/main.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/frontend/main.ts b/frontend/main.ts index 9d9bd2d..cc8d8dd 100644 --- a/frontend/main.ts +++ b/frontend/main.ts @@ -5,6 +5,8 @@ document.addEventListener('DOMContentLoaded', function() { initSearch(); initSidebar(); initToggle(); + + replaceStrings(); }); function initToggle() { @@ -217,3 +219,11 @@ function initTripSidebar(triggerElement: HTMLElement) { } } } + +function replaceStrings() { + const weekdays = document.querySelectorAll('.weekday-js'); + Array.prototype.forEach.call(weekdays, (weekday: HTMLElement) => { + //weekday.innerHTML = weekday.innerHTML.replace('Donnerstag', 'Dönerstag'); + weekday.innerHTML = weekday.innerHTML.replace('Freitag', 'Markttag'); + }); +} From 4ef88ba6c5e7714b37768d34499f389250e991cd Mon Sep 17 00:00:00 2001 From: philipp Date: Tue, 5 Sep 2023 13:21:18 +0200 Subject: [PATCH 7/9] don't be too funny --- frontend/main.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/main.ts b/frontend/main.ts index cc8d8dd..95adeee 100644 --- a/frontend/main.ts +++ b/frontend/main.ts @@ -223,7 +223,6 @@ function initTripSidebar(triggerElement: HTMLElement) { function replaceStrings() { const weekdays = document.querySelectorAll('.weekday-js'); Array.prototype.forEach.call(weekdays, (weekday: HTMLElement) => { - //weekday.innerHTML = weekday.innerHTML.replace('Donnerstag', 'Dönerstag'); weekday.innerHTML = weekday.innerHTML.replace('Freitag', 'Markttag'); }); } From 36d86b079b77d7d98333fa53255619bb13ae1318 Mon Sep 17 00:00:00 2001 From: Marie Birner Date: Mon, 10 Apr 2023 22:56:47 +0200 Subject: [PATCH 8/9] [TASK] replace Freitag with Markttag for phipsi --- frontend/main.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/main.ts b/frontend/main.ts index 95adeee..35eb9de 100644 --- a/frontend/main.ts +++ b/frontend/main.ts @@ -223,6 +223,10 @@ function initTripSidebar(triggerElement: HTMLElement) { function replaceStrings() { const weekdays = document.querySelectorAll('.weekday-js'); Array.prototype.forEach.call(weekdays, (weekday: HTMLElement) => { +<<<<<<< HEAD +======= + //weekday.innerHTML = weekday.innerHTML.replace('Donnerstag', 'Dönerstag'); +>>>>>>> 8797bfd ([TASK] replace Freitag with Markttag for phipsi) weekday.innerHTML = weekday.innerHTML.replace('Freitag', 'Markttag'); }); } From 16ca1a34822cd6867833b5a0e710e68a7f2be6f3 Mon Sep 17 00:00:00 2001 From: philipp Date: Tue, 5 Sep 2023 13:21:18 +0200 Subject: [PATCH 9/9] don't be too funny --- frontend/main.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/frontend/main.ts b/frontend/main.ts index 35eb9de..95adeee 100644 --- a/frontend/main.ts +++ b/frontend/main.ts @@ -223,10 +223,6 @@ function initTripSidebar(triggerElement: HTMLElement) { function replaceStrings() { const weekdays = document.querySelectorAll('.weekday-js'); Array.prototype.forEach.call(weekdays, (weekday: HTMLElement) => { -<<<<<<< HEAD -======= - //weekday.innerHTML = weekday.innerHTML.replace('Donnerstag', 'Dönerstag'); ->>>>>>> 8797bfd ([TASK] replace Freitag with Markttag for phipsi) weekday.innerHTML = weekday.innerHTML.replace('Freitag', 'Markttag'); }); }