From bdf95059dd9d2fb25f44478150436553173aed65 Mon Sep 17 00:00:00 2001
From: masterElmar <18119527+masterElmar@users.noreply.github.com>
Date: Mon, 20 Nov 2023 18:33:07 +0100
Subject: [PATCH 1/4] feat:#69 added translation for edit pages
---
.../editCalendar/EditAdditionalModules.vue | 26 ++++++++++++++-----
.../components/editCalendar/EditModules.vue | 22 +++++++++-------
frontend/src/i18n/translations/de.json | 2 +-
frontend/src/i18n/translations/en.json | 2 +-
frontend/src/view/AdditionalModules.vue | 10 +++----
5 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/frontend/src/components/editCalendar/EditAdditionalModules.vue b/frontend/src/components/editCalendar/EditAdditionalModules.vue
index fb968fc..5eff5e9 100644
--- a/frontend/src/components/editCalendar/EditAdditionalModules.vue
+++ b/frontend/src/components/editCalendar/EditAdditionalModules.vue
@@ -1,13 +1,16 @@
- Select additional Modules that are not listed in the regular semester
- for your Course
+ {{ $t("additionalModules.subTitle") }}
@@ -90,10 +100,12 @@ function selectChange() {
:virtual-scroller-options="{ itemSize: 70 }"
class="custom-multiselect"
filter
- placeholder="Select additional modules"
+ :placeholder="$t('additionalModules.dropDown')"
:auto-filter-focus="true"
+ :show-toggle-all="false"
@change="selectChange()"
@selectall-change="onSelectAllChange($event)"
+ :selectedItemsLabel="itemsLabelWithNumber(selectedModules)"
>
@@ -127,7 +139,7 @@ function selectChange() {
-
+
diff --git a/frontend/src/components/editCalendar/EditModules.vue b/frontend/src/components/editCalendar/EditModules.vue
index 44cfa5e..16bfa44 100644
--- a/frontend/src/components/editCalendar/EditModules.vue
+++ b/frontend/src/components/editCalendar/EditModules.vue
@@ -1,13 +1,15 @@
+
-
{{$t('faqView.headline')}}
+ {{ $t("faqView.headline") }}
- {{$t('faqView.firstQuestion')}}
+ {{ $t("faqView.firstQuestion") }}
- {{$t('faqView.firstAnswer')}}
+ {{ $t("faqView.firstAnswer") }}
-
{{$t('faqView.secondQuestion')}}
+
{{ $t("faqView.secondQuestion") }}
- {{$t('faqView.secondAnswer')}}
+ {{ $t("faqView.secondAnswer") }}
-
{{$t('faqView.thirdQuestion')}}
+
{{ $t("faqView.thirdQuestion") }}
- - {{$t('faqView.thirdAnswer.google.first')}}
+ - {{ $t("faqView.thirdAnswer.google.first") }}
-
- {{$t('faqView.thirdAnswer.google.second')}}
+ {{ $t("faqView.thirdAnswer.google.second") }}
-
- {{$t('faqView.thirdAnswer.google.third')}}
+ {{ $t("faqView.thirdAnswer.google.third") }}
-
- {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.title')}}
+
+
+ {{
+ $t("faqView.thirdAnswer.microsoft_outlook.outlook_2010.title")
+ }}
+
- - {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.first')}}
- - {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.second')}}
- - {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.third')}}
- - {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.fourth')}}
- - {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.fifth')}}
+ -
+ {{
+ $t(
+ "faqView.thirdAnswer.microsoft_outlook.outlook_2010.first",
+ )
+ }}
+
+ -
+ {{
+ $t(
+ "faqView.thirdAnswer.microsoft_outlook.outlook_2010.second",
+ )
+ }}
+
+ -
+ {{
+ $t(
+ "faqView.thirdAnswer.microsoft_outlook.outlook_2010.third",
+ )
+ }}
+
+ -
+ {{
+ $t(
+ "faqView.thirdAnswer.microsoft_outlook.outlook_2010.fourth",
+ )
+ }}
+
+ -
+ {{
+ $t(
+ "faqView.thirdAnswer.microsoft_outlook.outlook_2010.fifth",
+ )
+ }}
+
- {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.title')}}
+
+ {{
+ $t("faqView.thirdAnswer.microsoft_outlook.outlook_2007.title")
+ }}
+
- - {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.first')}}
- - {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.second')}}
- - {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.third')}}
- - {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.fourth')}}
- - {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.fifth')}}
- - {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.sixth')}}
+ -
+ {{
+ $t(
+ "faqView.thirdAnswer.microsoft_outlook.outlook_2007.first",
+ )
+ }}
+
+ -
+ {{
+ $t(
+ "faqView.thirdAnswer.microsoft_outlook.outlook_2007.second",
+ )
+ }}
+
+ -
+ {{
+ $t(
+ "faqView.thirdAnswer.microsoft_outlook.outlook_2007.third",
+ )
+ }}
+
+ -
+ {{
+ $t(
+ "faqView.thirdAnswer.microsoft_outlook.outlook_2007.fourth",
+ )
+ }}
+
+ -
+ {{
+ $t(
+ "faqView.thirdAnswer.microsoft_outlook.outlook_2007.fifth",
+ )
+ }}
+
+ -
+ {{
+ $t(
+ "faqView.thirdAnswer.microsoft_outlook.outlook_2007.sixth",
+ )
+ }}
+
- - {{$t('faqView.thirdAnswer.apple_osx.first')}}
- - {{$t('faqView.thirdAnswer.apple_osx.second')}}
- - {{$t('faqView.thirdAnswer.apple_osx.third')}}
- - {{$t('faqView.thirdAnswer.apple_osx.fourth')}}
+ - {{ $t("faqView.thirdAnswer.apple_osx.first") }}
+ - {{ $t("faqView.thirdAnswer.apple_osx.second") }}
+ - {{ $t("faqView.thirdAnswer.apple_osx.third") }}
+ - {{ $t("faqView.thirdAnswer.apple_osx.fourth") }}
- - {{ $t('faqView.thirdAnswer.thunderbird.one') }}
- - {{ $t('faqView.thirdAnswer.thunderbird.two') }}
- - {{ $t('faqView.thirdAnswer.thunderbird.three') }}
- - {{ $t('faqView.thirdAnswer.thunderbird.four') }}
- - {{ $t('faqView.thirdAnswer.thunderbird.five') }}
- - {{ $t('faqView.thirdAnswer.thunderbird.six') }}
- - {{ $t('faqView.thirdAnswer.thunderbird.seven') }}
+ - {{ $t("faqView.thirdAnswer.thunderbird.one") }}
+ - {{ $t("faqView.thirdAnswer.thunderbird.two") }}
+ - {{ $t("faqView.thirdAnswer.thunderbird.three") }}
+ - {{ $t("faqView.thirdAnswer.thunderbird.four") }}
+ - {{ $t("faqView.thirdAnswer.thunderbird.five") }}
+ - {{ $t("faqView.thirdAnswer.thunderbird.six") }}
+ - {{ $t("faqView.thirdAnswer.thunderbird.seven") }}
- {{$t('faqView.thirdAnswer.iphone.description')}}
+ {{ $t("faqView.thirdAnswer.iphone.description") }}
- - {{$t('faqView.thirdAnswer.iphone.one')}}
- - {{$t('faqView.thirdAnswer.iphone.two')}}
- - {{$t('faqView.thirdAnswer.iphone.three')}}
- - {{$t('faqView.thirdAnswer.iphone.four')}}
- - {{$t('faqView.thirdAnswer.iphone.five')}}
- - {{$t('faqView.thirdAnswer.iphone.six')}}
- - {{$t('faqView.thirdAnswer.iphone.seven')}}
- - {{$t('faqView.thirdAnswer.iphone.eight')}}
- - {{$t('faqView.thirdAnswer.iphone.nine')}}
+ - {{ $t("faqView.thirdAnswer.iphone.one") }}
+ - {{ $t("faqView.thirdAnswer.iphone.two") }}
+ - {{ $t("faqView.thirdAnswer.iphone.three") }}
+ - {{ $t("faqView.thirdAnswer.iphone.four") }}
+ - {{ $t("faqView.thirdAnswer.iphone.five") }}
+ - {{ $t("faqView.thirdAnswer.iphone.six") }}
+ - {{ $t("faqView.thirdAnswer.iphone.seven") }}
+ - {{ $t("faqView.thirdAnswer.iphone.eight") }}
+ - {{ $t("faqView.thirdAnswer.iphone.nine") }}
- {{$t('faqView.thirdAnswer.android.description')}}
+ {{ $t("faqView.thirdAnswer.android.description") }}
- {{$t('faqView.thirdAnswer.windows_phone.description')}}
+ {{ $t("faqView.thirdAnswer.windows_phone.description") }}
- - {{$t('faqView.thirdAnswer.windows_phone.one')}}
- - {{$t('faqView.thirdAnswer.windows_phone.two')}}
- - {{$t('faqView.thirdAnswer.windows_phone.three')}}
- - {{$t('faqView.thirdAnswer.windows_phone.four')}}
- - {{$t('faqView.thirdAnswer.windows_phone.five')}}
- - {{$t('faqView.thirdAnswer.windows_phone.six')}}
- - {{$t('faqView.thirdAnswer.windows_phone.seven')}}
- - {{$t('faqView.thirdAnswer.windows_phone.eight')}}
+ - {{ $t("faqView.thirdAnswer.windows_phone.one") }}
+ - {{ $t("faqView.thirdAnswer.windows_phone.two") }}
+ - {{ $t("faqView.thirdAnswer.windows_phone.three") }}
+ - {{ $t("faqView.thirdAnswer.windows_phone.four") }}
+ - {{ $t("faqView.thirdAnswer.windows_phone.five") }}
+ - {{ $t("faqView.thirdAnswer.windows_phone.six") }}
+ - {{ $t("faqView.thirdAnswer.windows_phone.seven") }}
+ - {{ $t("faqView.thirdAnswer.windows_phone.eight") }}
-
{{$t('faqView.fourthQuestion')}}
-
{{$t('faqView.fourthAnswer')}}
+
{{ $t("faqView.fourthQuestion") }}
+
{{ $t("faqView.fourthAnswer") }}
-
{{$t('faqView.fifthQuestion')}}
-
{{$t('faqView.fifthAnswer')}}
+
{{ $t("faqView.fifthQuestion") }}
+
{{ $t("faqView.fifthAnswer") }}
-
{{$t('faqView.sixthQuestion')}}
-
{{$t('faqView.sixthAnswer')}}
+
{{ $t("faqView.sixthQuestion") }}
+
{{ $t("faqView.sixthAnswer") }}
-
{{$t('faqView.seventhQuestion')}}
-
{{$t('faqView.seventhAnswer')}}
+
{{ $t("faqView.seventhQuestion") }}
+
{{ $t("faqView.seventhAnswer") }}
-
{{$t('faqView.eighthQuestion')}}
-
{{$t('faqView.eighthAnswer')}}
+
{{ $t("faqView.eighthQuestion") }}
+
{{ $t("faqView.eighthAnswer") }}
- {{$t('faqView.notFound')}}
- {{$t('faqView.contact')}}
+ {{ $t("faqView.notFound") }}
+ {{ $t("faqView.contact") }}
diff --git a/frontend/src/components/ModuleInformation.vue b/frontend/src/components/ModuleInformation.vue
index 893a917..902e6ec 100644
--- a/frontend/src/components/ModuleInformation.vue
+++ b/frontend/src/components/ModuleInformation.vue
@@ -1,7 +1,7 @@
@@ -103,9 +111,9 @@ function itemsLabelWithNumber(selectedModules: Module[]): string {
:placeholder="$t('additionalModules.dropDown')"
:auto-filter-focus="true"
:show-toggle-all="false"
+ :selected-items-label="itemsLabelWithNumber(selectedModules)"
@change="selectChange()"
@selectall-change="onSelectAllChange($event)"
- :selectedItemsLabel="itemsLabelWithNumber(selectedModules)"
>
@@ -116,6 +124,7 @@ function itemsLabelWithNumber(selectedModules: Module[]): string {
-
+
@@ -152,4 +163,10 @@ function itemsLabelWithNumber(selectedModules: Module[]): string {
:deep(.custom-multiselect li) {
height: unset;
}
+
+.small-button.p-button {
+ width: 2rem;
+ height: 2rem;
+ padding: 0;
+}
diff --git a/frontend/src/components/editCalendar/EditModules.vue b/frontend/src/components/editCalendar/EditModules.vue
index 16bfa44..bb5c3f6 100644
--- a/frontend/src/components/editCalendar/EditModules.vue
+++ b/frontend/src/components/editCalendar/EditModules.vue
@@ -1,13 +1,13 @@
@@ -104,9 +112,9 @@ function itemsLabelWithNumber(selectedModules: Module[]): string {
:placeholder="$t('additionalModules.dropDown')"
:auto-filter-focus="true"
:show-toggle-all="false"
+ :selected-items-label="itemsLabelWithNumber(selectedModules)"
@change="selectChange()"
@selectall-change="onSelectAllChange($event)"
- :selectedItemsLabel="itemsLabelWithNumber(selectedModules)"
>
@@ -117,6 +125,7 @@ function itemsLabelWithNumber(selectedModules: Module[]): string {
-
+
@@ -153,4 +164,10 @@ function itemsLabelWithNumber(selectedModules: Module[]): string {
:deep(.custom-multiselect li) {
height: unset;
}
+
+.small-button.p-button {
+ width: 2rem;
+ height: 2rem;
+ padding: 0;
+}
diff --git a/frontend/src/view/EditCalendarView.vue b/frontend/src/view/EditCalendarView.vue
index e0fa2dc..50a2de5 100644
--- a/frontend/src/view/EditCalendarView.vue
+++ b/frontend/src/view/EditCalendarView.vue
@@ -77,12 +77,20 @@ function loadCalendar(): void {
-
+
-
+
diff --git a/frontend/src/view/ImprintPage.vue b/frontend/src/view/ImprintPage.vue
index 0d6c69b..cb4297b 100644
--- a/frontend/src/view/ImprintPage.vue
+++ b/frontend/src/view/ImprintPage.vue
@@ -3,7 +3,7 @@
-
{{$t("imprint")}}
+ {{ $t("imprint") }}
nach dem Telemediengesetz (TMG) der Bundesrepublik Deutschland.
diff --git a/frontend/src/view/PrivacyPolicy.vue b/frontend/src/view/PrivacyPolicy.vue
index 0d44f8c..3f00f32 100644
--- a/frontend/src/view/PrivacyPolicy.vue
+++ b/frontend/src/view/PrivacyPolicy.vue
@@ -3,7 +3,7 @@
-
{{$t("privacy")}}
+ {{ $t("privacy") }}
Datenschutzerklärung
From cf07db861f764740926d59d6d4b8895b12f51644 Mon Sep 17 00:00:00 2001
From: masterElmar <18119527+masterElmar@users.noreply.github.com>
Date: Mon, 20 Nov 2023 21:11:42 +0100
Subject: [PATCH 3/4] fix:#79 added check for token and response feedback with
toast
---
frontend/src/api/loadCalendar.ts | 7 +++++--
frontend/src/i18n/translations/de.json | 3 ++-
frontend/src/i18n/translations/en.json | 3 ++-
frontend/src/view/EditCalendarView.vue | 21 +++++++++++++++------
4 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/frontend/src/api/loadCalendar.ts b/frontend/src/api/loadCalendar.ts
index 6ec03aa..0a665fe 100644
--- a/frontend/src/api/loadCalendar.ts
+++ b/frontend/src/api/loadCalendar.ts
@@ -8,7 +8,10 @@ export async function getCalender(token: string): Promise
{
return await fetch(request)
.then((response) => {
- return response.json();
+ if( response.ok){
+ return response.json().then((calendarResponse: Calendar) => calendarResponse.modules)
+ } else {
+ return [];
+ }
})
- .then((calendarResponse: Calendar) => calendarResponse.modules);
}
diff --git a/frontend/src/i18n/translations/de.json b/frontend/src/i18n/translations/de.json
index 4dd8efa..672fc61 100644
--- a/frontend/src/i18n/translations/de.json
+++ b/frontend/src/i18n/translations/de.json
@@ -49,7 +49,8 @@
"invalidToken": "Ungültiger Token",
"headline": "Bearbeite deinen HTWKalender",
"subTitle": "Füge deinen Link oder Token ein um den Kalender zu bearbeiten",
- "loadCalendar": "Kalender laden"
+ "loadCalendar": "Kalender laden",
+ "noCalendarFound": "Keinen Kalender gefunden"
},
"additionalModules": {
"subTitle": "Füge weitere Module hinzu die nicht in deinem Studiengang enthalten sind.",
diff --git a/frontend/src/i18n/translations/en.json b/frontend/src/i18n/translations/en.json
index 641d5b9..2f55add 100644
--- a/frontend/src/i18n/translations/en.json
+++ b/frontend/src/i18n/translations/en.json
@@ -49,7 +49,8 @@
"invalidToken": "invalid token",
"headline": "edit your HTWKalender",
"subTitle": "please enter your link or calendar token",
- "loadCalendar": "load calendar"
+ "loadCalendar": "load calendar",
+ "noCalendarFound": "no calendar found"
},
"additionalModules": {
"subTitle": "Select additional Modules that are not listed in the regular semester for your Course",
diff --git a/frontend/src/view/EditCalendarView.vue b/frontend/src/view/EditCalendarView.vue
index e0fa2dc..a0b9b9e 100644
--- a/frontend/src/view/EditCalendarView.vue
+++ b/frontend/src/view/EditCalendarView.vue
@@ -46,14 +46,23 @@ function loadCalendar(): void {
moduleStore().removeAllModules();
tokenStore().setToken(token.value);
- getCalender(token.value).then((data) => {
- data.forEach((module) => {
- moduleStore().addModule(module);
- });
- modules.value = data;
+ getCalender(token.value).then((data: Module[]) => {
+ if (data.length > 0) {
+ data.forEach((module) => {
+ moduleStore().addModule(module);
+ });
+ modules.value = data;
+ router.push("/edit-additional-modules");
+ } else {
+ toast.add({
+ severity: "error",
+ summary: t("editCalendarView.error"),
+ detail: t("editCalendarView.noCalendarFound"),
+ life: 3000,
+ });
+ }
});
- router.push("/edit-additional-modules");
}
From 3814a4712de8d3c52aec2dbd337adb4db63fd3db Mon Sep 17 00:00:00 2001
From: masterElmar <18119527+masterElmar@users.noreply.github.com>
Date: Mon, 20 Nov 2023 21:13:27 +0100
Subject: [PATCH 4/4] fix:#79 lint and format
---
frontend/src/api/loadCalendar.ts | 17 +-
frontend/src/components/FaqPage.vue | 211 ++++++++++++------
frontend/src/components/ModuleInformation.vue | 37 ++-
frontend/src/i18n/translations/de.json | 14 +-
frontend/src/view/AdditionalModules.vue | 28 ++-
frontend/src/view/EditCalendarView.vue | 13 +-
frontend/src/view/ImprintPage.vue | 2 +-
frontend/src/view/PrivacyPolicy.vue | 2 +-
8 files changed, 215 insertions(+), 109 deletions(-)
diff --git a/frontend/src/api/loadCalendar.ts b/frontend/src/api/loadCalendar.ts
index 0a665fe..d833c4d 100644
--- a/frontend/src/api/loadCalendar.ts
+++ b/frontend/src/api/loadCalendar.ts
@@ -6,12 +6,13 @@ export async function getCalender(token: string): Promise {
method: "GET",
});
- return await fetch(request)
- .then((response) => {
- if( response.ok){
- return response.json().then((calendarResponse: Calendar) => calendarResponse.modules)
- } else {
- return [];
- }
- })
+ return await fetch(request).then((response) => {
+ if (response.ok) {
+ return response
+ .json()
+ .then((calendarResponse: Calendar) => calendarResponse.modules);
+ } else {
+ return [];
+ }
+ });
}
diff --git a/frontend/src/components/FaqPage.vue b/frontend/src/components/FaqPage.vue
index cdb8efa..9296436 100644
--- a/frontend/src/components/FaqPage.vue
+++ b/frontend/src/components/FaqPage.vue
@@ -1,141 +1,216 @@
-
+
-
{{$t('faqView.headline')}}
+ {{ $t("faqView.headline") }}
- {{$t('faqView.firstQuestion')}}
+ {{ $t("faqView.firstQuestion") }}
- {{$t('faqView.firstAnswer')}}
+ {{ $t("faqView.firstAnswer") }}
-
{{$t('faqView.secondQuestion')}}
+
{{ $t("faqView.secondQuestion") }}
- {{$t('faqView.secondAnswer')}}
+ {{ $t("faqView.secondAnswer") }}
-
{{$t('faqView.thirdQuestion')}}
+
{{ $t("faqView.thirdQuestion") }}
- - {{$t('faqView.thirdAnswer.google.first')}}
+ - {{ $t("faqView.thirdAnswer.google.first") }}
-
- {{$t('faqView.thirdAnswer.google.second')}}
+ {{ $t("faqView.thirdAnswer.google.second") }}
-
- {{$t('faqView.thirdAnswer.google.third')}}
+ {{ $t("faqView.thirdAnswer.google.third") }}
-
- {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.title')}}
+
+
+ {{
+ $t("faqView.thirdAnswer.microsoft_outlook.outlook_2010.title")
+ }}
+
- - {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.first')}}
- - {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.second')}}
- - {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.third')}}
- - {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.fourth')}}
- - {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.fifth')}}
+ -
+ {{
+ $t(
+ "faqView.thirdAnswer.microsoft_outlook.outlook_2010.first",
+ )
+ }}
+
+ -
+ {{
+ $t(
+ "faqView.thirdAnswer.microsoft_outlook.outlook_2010.second",
+ )
+ }}
+
+ -
+ {{
+ $t(
+ "faqView.thirdAnswer.microsoft_outlook.outlook_2010.third",
+ )
+ }}
+
+ -
+ {{
+ $t(
+ "faqView.thirdAnswer.microsoft_outlook.outlook_2010.fourth",
+ )
+ }}
+
+ -
+ {{
+ $t(
+ "faqView.thirdAnswer.microsoft_outlook.outlook_2010.fifth",
+ )
+ }}
+
- {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.title')}}
+
+ {{
+ $t("faqView.thirdAnswer.microsoft_outlook.outlook_2007.title")
+ }}
+
- - {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.first')}}
- - {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.second')}}
- - {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.third')}}
- - {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.fourth')}}
- - {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.fifth')}}
- - {{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.sixth')}}
+ -
+ {{
+ $t(
+ "faqView.thirdAnswer.microsoft_outlook.outlook_2007.first",
+ )
+ }}
+
+ -
+ {{
+ $t(
+ "faqView.thirdAnswer.microsoft_outlook.outlook_2007.second",
+ )
+ }}
+
+ -
+ {{
+ $t(
+ "faqView.thirdAnswer.microsoft_outlook.outlook_2007.third",
+ )
+ }}
+
+ -
+ {{
+ $t(
+ "faqView.thirdAnswer.microsoft_outlook.outlook_2007.fourth",
+ )
+ }}
+
+ -
+ {{
+ $t(
+ "faqView.thirdAnswer.microsoft_outlook.outlook_2007.fifth",
+ )
+ }}
+
+ -
+ {{
+ $t(
+ "faqView.thirdAnswer.microsoft_outlook.outlook_2007.sixth",
+ )
+ }}
+
- - {{$t('faqView.thirdAnswer.apple_osx.first')}}
- - {{$t('faqView.thirdAnswer.apple_osx.second')}}
- - {{$t('faqView.thirdAnswer.apple_osx.third')}}
- - {{$t('faqView.thirdAnswer.apple_osx.fourth')}}
+ - {{ $t("faqView.thirdAnswer.apple_osx.first") }}
+ - {{ $t("faqView.thirdAnswer.apple_osx.second") }}
+ - {{ $t("faqView.thirdAnswer.apple_osx.third") }}
+ - {{ $t("faqView.thirdAnswer.apple_osx.fourth") }}
- - {{ $t('faqView.thirdAnswer.thunderbird.one') }}
- - {{ $t('faqView.thirdAnswer.thunderbird.two') }}
- - {{ $t('faqView.thirdAnswer.thunderbird.three') }}
- - {{ $t('faqView.thirdAnswer.thunderbird.four') }}
- - {{ $t('faqView.thirdAnswer.thunderbird.five') }}
- - {{ $t('faqView.thirdAnswer.thunderbird.six') }}
- - {{ $t('faqView.thirdAnswer.thunderbird.seven') }}
+ - {{ $t("faqView.thirdAnswer.thunderbird.one") }}
+ - {{ $t("faqView.thirdAnswer.thunderbird.two") }}
+ - {{ $t("faqView.thirdAnswer.thunderbird.three") }}
+ - {{ $t("faqView.thirdAnswer.thunderbird.four") }}
+ - {{ $t("faqView.thirdAnswer.thunderbird.five") }}
+ - {{ $t("faqView.thirdAnswer.thunderbird.six") }}
+ - {{ $t("faqView.thirdAnswer.thunderbird.seven") }}
- {{$t('faqView.thirdAnswer.iphone.description')}}
+ {{ $t("faqView.thirdAnswer.iphone.description") }}
- - {{$t('faqView.thirdAnswer.iphone.one')}}
- - {{$t('faqView.thirdAnswer.iphone.two')}}
- - {{$t('faqView.thirdAnswer.iphone.three')}}
- - {{$t('faqView.thirdAnswer.iphone.four')}}
- - {{$t('faqView.thirdAnswer.iphone.five')}}
- - {{$t('faqView.thirdAnswer.iphone.six')}}
- - {{$t('faqView.thirdAnswer.iphone.seven')}}
- - {{$t('faqView.thirdAnswer.iphone.eight')}}
- - {{$t('faqView.thirdAnswer.iphone.nine')}}
+ - {{ $t("faqView.thirdAnswer.iphone.one") }}
+ - {{ $t("faqView.thirdAnswer.iphone.two") }}
+ - {{ $t("faqView.thirdAnswer.iphone.three") }}
+ - {{ $t("faqView.thirdAnswer.iphone.four") }}
+ - {{ $t("faqView.thirdAnswer.iphone.five") }}
+ - {{ $t("faqView.thirdAnswer.iphone.six") }}
+ - {{ $t("faqView.thirdAnswer.iphone.seven") }}
+ - {{ $t("faqView.thirdAnswer.iphone.eight") }}
+ - {{ $t("faqView.thirdAnswer.iphone.nine") }}
- {{$t('faqView.thirdAnswer.android.description')}}
+ {{ $t("faqView.thirdAnswer.android.description") }}
- {{$t('faqView.thirdAnswer.windows_phone.description')}}
+ {{ $t("faqView.thirdAnswer.windows_phone.description") }}
- - {{$t('faqView.thirdAnswer.windows_phone.one')}}
- - {{$t('faqView.thirdAnswer.windows_phone.two')}}
- - {{$t('faqView.thirdAnswer.windows_phone.three')}}
- - {{$t('faqView.thirdAnswer.windows_phone.four')}}
- - {{$t('faqView.thirdAnswer.windows_phone.five')}}
- - {{$t('faqView.thirdAnswer.windows_phone.six')}}
- - {{$t('faqView.thirdAnswer.windows_phone.seven')}}
- - {{$t('faqView.thirdAnswer.windows_phone.eight')}}
+ - {{ $t("faqView.thirdAnswer.windows_phone.one") }}
+ - {{ $t("faqView.thirdAnswer.windows_phone.two") }}
+ - {{ $t("faqView.thirdAnswer.windows_phone.three") }}
+ - {{ $t("faqView.thirdAnswer.windows_phone.four") }}
+ - {{ $t("faqView.thirdAnswer.windows_phone.five") }}
+ - {{ $t("faqView.thirdAnswer.windows_phone.six") }}
+ - {{ $t("faqView.thirdAnswer.windows_phone.seven") }}
+ - {{ $t("faqView.thirdAnswer.windows_phone.eight") }}
-
{{$t('faqView.fourthQuestion')}}
-
{{$t('faqView.fourthAnswer')}}
+
{{ $t("faqView.fourthQuestion") }}
+
{{ $t("faqView.fourthAnswer") }}
-
{{$t('faqView.fifthQuestion')}}
-
{{$t('faqView.fifthAnswer')}}
+
{{ $t("faqView.fifthQuestion") }}
+
{{ $t("faqView.fifthAnswer") }}
-
{{$t('faqView.sixthQuestion')}}
-
{{$t('faqView.sixthAnswer')}}
+
{{ $t("faqView.sixthQuestion") }}
+
{{ $t("faqView.sixthAnswer") }}
-
{{$t('faqView.seventhQuestion')}}
-
{{$t('faqView.seventhAnswer')}}
+
{{ $t("faqView.seventhQuestion") }}
+
{{ $t("faqView.seventhAnswer") }}
-
{{$t('faqView.eighthQuestion')}}
-
{{$t('faqView.eighthAnswer')}}
+
{{ $t("faqView.eighthQuestion") }}
+
{{ $t("faqView.eighthAnswer") }}
- {{$t('faqView.notFound')}}
- {{$t('faqView.contact')}}
+ {{ $t("faqView.notFound") }}
+ {{ $t("faqView.contact") }}
diff --git a/frontend/src/components/ModuleInformation.vue b/frontend/src/components/ModuleInformation.vue
index 893a917..902e6ec 100644
--- a/frontend/src/components/ModuleInformation.vue
+++ b/frontend/src/components/ModuleInformation.vue
@@ -1,7 +1,7 @@
@@ -104,9 +112,9 @@ function itemsLabelWithNumber(selectedModules: Module[]): string {
:placeholder="$t('additionalModules.dropDown')"
:auto-filter-focus="true"
:show-toggle-all="false"
+ :selected-items-label="itemsLabelWithNumber(selectedModules)"
@change="selectChange()"
@selectall-change="onSelectAllChange($event)"
- :selectedItemsLabel="itemsLabelWithNumber(selectedModules)"
>
diff --git a/frontend/src/view/EditCalendarView.vue b/frontend/src/view/EditCalendarView.vue
index a0b9b9e..ae80c71 100644
--- a/frontend/src/view/EditCalendarView.vue
+++ b/frontend/src/view/EditCalendarView.vue
@@ -62,7 +62,6 @@ function loadCalendar(): void {
});
}
});
-
}
@@ -86,12 +85,20 @@ function loadCalendar(): void {
-
+
-
+
diff --git a/frontend/src/view/ImprintPage.vue b/frontend/src/view/ImprintPage.vue
index 0d6c69b..cb4297b 100644
--- a/frontend/src/view/ImprintPage.vue
+++ b/frontend/src/view/ImprintPage.vue
@@ -3,7 +3,7 @@
-
{{$t("imprint")}}
+ {{ $t("imprint") }}
nach dem Telemediengesetz (TMG) der Bundesrepublik Deutschland.
diff --git a/frontend/src/view/PrivacyPolicy.vue b/frontend/src/view/PrivacyPolicy.vue
index 0d44f8c..3f00f32 100644
--- a/frontend/src/view/PrivacyPolicy.vue
+++ b/frontend/src/view/PrivacyPolicy.vue
@@ -3,7 +3,7 @@
-
{{$t("privacy")}}
+ {{ $t("privacy") }}
Datenschutzerklärung