From 36081563531fa4e7790acc996095cd08cf4bdc31 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Thu, 27 Oct 2022 16:09:06 +0200 Subject: [PATCH 1/2] WIP: Setup i18n --- client/src/locales/de.json | 10 +++++++++- client/src/main.ts | 8 ++++---- client/src/pages/CockpitPage.vue | 6 ++++-- client/src/pages/learningPath/LearningPathPage.vue | 2 +- requests.http | 2 ++ server/config/settings/base.py | 7 ++++--- 6 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 requests.http diff --git a/client/src/locales/de.json b/client/src/locales/de.json index fe250649..2622f4f7 100644 --- a/client/src/locales/de.json +++ b/client/src/locales/de.json @@ -1,3 +1,11 @@ { - "test": "Hallo VBV" + "general": { + "c2aNextStep": "Weiter geht's" + }, + "dashboard": { + "welcome": "Willkommen, {name}" + }, + "learningPathPage": { + "showListView": "Listenansicht anzeigen" + } } diff --git a/client/src/main.ts b/client/src/main.ts index 1d0de370..062cf3f1 100644 --- a/client/src/main.ts +++ b/client/src/main.ts @@ -2,8 +2,8 @@ import * as log from "loglevel"; import { createPinia } from "pinia"; import { createApp, markRaw } from "vue"; -// import {setupI18n} from './i18n' import App from "./App.vue"; +import { loadLocaleMessages, setupI18n } from "./i18n"; import router from "./router"; import type { Router } from "vue-router"; @@ -15,11 +15,11 @@ if (window.location.href.indexOf("localhost") >= 0) { log.setLevel("warn"); } -// const i18n = setupI18n() +const i18n = setupI18n(); const app = createApp(App); // todo: define lang setup -// await loadLocaleMessages(i18n, 'de') +await loadLocaleMessages(i18n, "de"); app.use(router); @@ -33,6 +33,6 @@ pinia.use(({ store }) => { store.router = markRaw(router); }); app.use(pinia); -// app.use(i18n) +app.use(i18n); app.mount("#app"); diff --git a/client/src/pages/CockpitPage.vue b/client/src/pages/CockpitPage.vue index f26350b7..84f5f146 100644 --- a/client/src/pages/CockpitPage.vue +++ b/client/src/pages/CockpitPage.vue @@ -11,7 +11,9 @@ const userStore = useUserStore();
-

Willkommen, {{ userStore.first_name }}

+

+ {{ $t("dashboard.welcome", { name: userStore.first_name }) }} +

Kurse

@@ -19,7 +21,7 @@ const userStore = useUserStore();

Versicherungsvermittler/in

- Weiter geht's + {{ $t("general.c2aNextStep") }}
diff --git a/client/src/pages/learningPath/LearningPathPage.vue b/client/src/pages/learningPath/LearningPathPage.vue index b1f2f490..30b6e245 100644 --- a/client/src/pages/learningPath/LearningPathPage.vue +++ b/client/src/pages/learningPath/LearningPathPage.vue @@ -64,7 +64,7 @@ const createContinueUrl = (learningPath: LearningPath): [string, boolean] => { @click="learningPathStore.page = 'OVERVIEW'" > - Listenansicht anzeigen + {{ $t("learningPathPage.showListView") }}
Date: Tue, 8 Nov 2022 12:06:48 +0100 Subject: [PATCH 2/2] Add translations strings --- client/src/components/AppFooter.vue | 8 +-- .../competences/PerformanceCriteriaRow.vue | 6 +- .../learningPath/LearningContent.vue | 4 +- .../learningPath/LearningContentContainer.vue | 2 +- .../learningPath/LearningSequence.vue | 7 ++- .../learningPath/SelfEvaluation.vue | 30 ++++++---- client/src/i18n.ts | 2 +- client/src/locales/de.json | 60 ++++++++++++++++++- client/src/main.ts | 29 ++++----- client/src/pages/CockpitPage.vue | 2 +- .../pages/competence/CompetenceIndexPage.vue | 22 +++---- .../pages/competence/CompetenceListPage.vue | 2 +- .../competence/PerformanceCriteriaPage.vue | 9 ++- .../SinglePerformanceCriteriaPage.vue | 8 +-- client/src/pages/learningPath/CirclePage.vue | 8 ++- .../pages/learningPath/LearningPathPage.vue | 10 ++-- .../mediaLibrary/MLCategoryDetailPage.vue | 6 +- .../mediaLibrary/MLCategoryIndexPage.vue | 2 +- client/src/pages/mediaLibrary/MLIndexPage.vue | 17 +++--- client/vite.config.ts | 5 ++ server/config/settings/base.py | 6 +- 21 files changed, 164 insertions(+), 81 deletions(-) diff --git a/client/src/components/AppFooter.vue b/client/src/components/AppFooter.vue index 4783fa15..73f1e0a3 100644 --- a/client/src/components/AppFooter.vue +++ b/client/src/components/AppFooter.vue @@ -7,13 +7,13 @@ log.debug("AppFooter created"); diff --git a/client/src/components/competences/PerformanceCriteriaRow.vue b/client/src/components/competences/PerformanceCriteriaRow.vue index ea10fa35..5e7dc8f4 100644 --- a/client/src/components/competences/PerformanceCriteriaRow.vue +++ b/client/src/components/competences/PerformanceCriteriaRow.vue @@ -32,7 +32,7 @@ const profilePageSlug = route.params["competenceProfilePageSlug"]; {{ criteria.competence_id }} {{ criteria.title }}

- Lerneinheit: + {{ $t("general.learningUnit") }}: {{ criteria.learning_unit.title }} @@ -50,7 +50,7 @@ const profilePageSlug = route.params["competenceProfilePageSlug"]; class="link" :to="`/competence/${profilePageSlug}/criteria/${criteria.slug}`" > - Sich nochmals einschätzen + {{ $t("competences.assessAgain") }}

diff --git a/client/src/components/learningPath/LearningContent.vue b/client/src/components/learningPath/LearningContent.vue index 85cb61e2..4353de5b 100644 --- a/client/src/components/learningPath/LearningContent.vue +++ b/client/src/components/learningPath/LearningContent.vue @@ -29,8 +29,8 @@ const block = computed(() => {
diff --git a/client/src/components/learningPath/LearningContentContainer.vue b/client/src/components/learningPath/LearningContentContainer.vue index 546681c2..50a12f99 100644 --- a/client/src/components/learningPath/LearningContentContainer.vue +++ b/client/src/components/learningPath/LearningContentContainer.vue @@ -37,7 +37,7 @@ const emit = defineEmits(["back", "next", "exit"]); data-cy="cancel-and-back" @click="$emit('back')" > - Zurück + {{ $t("general.backCapitalized") }}
diff --git a/client/src/components/learningPath/SelfEvaluation.vue b/client/src/components/learningPath/SelfEvaluation.vue index b2301571..087298cb 100644 --- a/client/src/components/learningPath/SelfEvaluation.vue +++ b/client/src/components/learningPath/SelfEvaluation.vue @@ -44,9 +44,9 @@ function handleBack() {