From b5c4e2572578fcfeff172341d4c6e36ebab866c9 Mon Sep 17 00:00:00 2001 From: AdLer-Lukas <95357660+AdLer-Lukas@users.noreply.github.com> Date: Thu, 15 Feb 2024 14:20:47 +0100 Subject: [PATCH 1/2] changed icons for "next" and "back" navigation --- .../UIComponents/AdaptivityElementDialogContainer.tsx | 4 ++-- .../LearningSpaceGoalPanel/LearningSpaceGoalPanel.tsx | 2 +- .../LearningSpaceDisplay/StoryElement/StoryElement.tsx | 8 ++++---- .../AdaptivityElementDialogContainer.test.tsx.snap | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Components/Core/Presentation/Adaptivity/AdaptivityElement/UIComponents/AdaptivityElementDialogContainer.tsx b/src/Components/Core/Presentation/Adaptivity/AdaptivityElement/UIComponents/AdaptivityElementDialogContainer.tsx index eb35977e5..032907890 100644 --- a/src/Components/Core/Presentation/Adaptivity/AdaptivityElement/UIComponents/AdaptivityElementDialogContainer.tsx +++ b/src/Components/Core/Presentation/Adaptivity/AdaptivityElement/UIComponents/AdaptivityElementDialogContainer.tsx @@ -141,7 +141,7 @@ export default function AdaptivityElementDialogContainer({ className="w-8 h-8 p-1 mr-2 text-xs roboto-black xl:w-10 xl:h-10 lg:w-10 lg:h-10 md:w-10 md:h-10 sm:w-10 sm:h-10" shape="closebutton" > - {"\u21B6"} + {"\u25C0"} )} @@ -257,7 +257,7 @@ export default function AdaptivityElementDialogContainer({

- Symbollegende Adaptivitätselement + {translate("headerSy")}

{isOpen && ( - +
{goals && (
diff --git a/src/Components/Core/Presentation/React/LearningSpaceDisplay/StoryElement/StoryElement.tsx b/src/Components/Core/Presentation/React/LearningSpaceDisplay/StoryElement/StoryElement.tsx index 62d926554..a4d56a42f 100644 --- a/src/Components/Core/Presentation/React/LearningSpaceDisplay/StoryElement/StoryElement.tsx +++ b/src/Components/Core/Presentation/React/LearningSpaceDisplay/StoryElement/StoryElement.tsx @@ -223,7 +223,7 @@ export default function StoryElement({ className }: AdLerUIComponent<{}>) { shape="closebutton" onClick={controller.decreasePageId} > - {"\u21B6"} + {"\u25C0"} )}
@@ -234,7 +234,7 @@ export default function StoryElement({ className }: AdLerUIComponent<{}>) { shape="closebutton" onClick={controller.increasePageId} > - {"\u21B7"} + {"\u25B6"} )}
@@ -269,7 +269,7 @@ export default function StoryElement({ className }: AdLerUIComponent<{}>) { shape="closebutton" onClick={controller.decreasePageId} > - {"\u21B6"} + {"\u25C0"}
)}
@@ -280,7 +280,7 @@ export default function StoryElement({ className }: AdLerUIComponent<{}>) { shape="closebutton" onClick={controller.increasePageId} > - {"\u21B7"} + {"\u25B6"} )}
diff --git a/src/Components/CoreTest/Presentation/Adaptivity/AdaptivityElement/UIComponents/__snapshots__/AdaptivityElementDialogContainer.test.tsx.snap b/src/Components/CoreTest/Presentation/Adaptivity/AdaptivityElement/UIComponents/__snapshots__/AdaptivityElementDialogContainer.test.tsx.snap index f917787c4..b3b3933fe 100644 --- a/src/Components/CoreTest/Presentation/Adaptivity/AdaptivityElement/UIComponents/__snapshots__/AdaptivityElementDialogContainer.test.tsx.snap +++ b/src/Components/CoreTest/Presentation/Adaptivity/AdaptivityElement/UIComponents/__snapshots__/AdaptivityElementDialogContainer.test.tsx.snap @@ -35,7 +35,7 @@ exports[`AdaptivityElementDialogContainer should render 1`] = ` Date: Thu, 15 Feb 2024 14:47:52 +0100 Subject: [PATCH 2/2] added localization to spaceGoalPanel --- .../UIComponents/AdaptivityElementDialogContainer.tsx | 2 +- .../LearningSpaceGoalPanel/LearningSpaceGoalPanel.tsx | 9 ++++++--- src/localize/de/learningElement.json | 1 + src/localize/de/spaceGoal.json | 5 +++++ src/localize/i18next-config.ts | 3 +++ 5 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 src/localize/de/spaceGoal.json diff --git a/src/Components/Core/Presentation/Adaptivity/AdaptivityElement/UIComponents/AdaptivityElementDialogContainer.tsx b/src/Components/Core/Presentation/Adaptivity/AdaptivityElement/UIComponents/AdaptivityElementDialogContainer.tsx index 032907890..59592feef 100644 --- a/src/Components/Core/Presentation/Adaptivity/AdaptivityElement/UIComponents/AdaptivityElementDialogContainer.tsx +++ b/src/Components/Core/Presentation/Adaptivity/AdaptivityElement/UIComponents/AdaptivityElementDialogContainer.tsx @@ -257,7 +257,7 @@ export default function AdaptivityElementDialogContainer({

- {translate("headerSy")} + {translate("headerLegend")}

(viewModel?.goals); const [isOpen] = useObservable(viewModel?.isOpen); + const { t: translate } = useTranslation("spaceGoal"); + if (!viewModel || !controller || !goals || !goals[0]) return null; return ( @@ -44,12 +47,12 @@ export default function LearningSpaceGoalPanel() { /> {goals.length === 1 && (

- Lernziel + {translate("learningGoalHeader_singular")}

)} {goals.length > 1 && (

- Lernziele +

{translate("learningGoalsHeader_plural")}

)}
@@ -85,7 +88,7 @@ export default function LearningSpaceGoalPanel() { viewModel.isOpen.Value = false; }} > - OK + {translate("confirmButton")}
diff --git a/src/localize/de/learningElement.json b/src/localize/de/learningElement.json index b12a72d05..4bc379e5c 100644 --- a/src/localize/de/learningElement.json +++ b/src/localize/de/learningElement.json @@ -17,6 +17,7 @@ "adaptivityIntro": "Hallo Freund, ich helfe dir zu lernen. Suche dir ein Thema aus und wir arbeiten gemeinsam an deinem Wissen.", "legendHover": "Klicke hier, um die Symbollegende anzuzeigen", + "headerLegend": "Symbollegende Adaptivitätselement", "leftEasy": "Links: Leichte Frage
", "middleNormal": "Mitte: Mittelschwer
", "rightHard": "Rechts: Schwere Frage", diff --git a/src/localize/de/spaceGoal.json b/src/localize/de/spaceGoal.json new file mode 100644 index 000000000..dfaceb7d6 --- /dev/null +++ b/src/localize/de/spaceGoal.json @@ -0,0 +1,5 @@ +{ + "learningGoalHeader_singular": "Lernziel", + "learningGoalsHeader_plural": "Lernziele", + "confirmButton": "OK" +} diff --git a/src/localize/i18next-config.ts b/src/localize/i18next-config.ts index 426c0a13f..122d931c0 100644 --- a/src/localize/i18next-config.ts +++ b/src/localize/i18next-config.ts @@ -9,6 +9,7 @@ import de_worldMenu from "./de/worldMenu.json"; import de_spaceMenu from "./de/spaceMenu.json"; import de_breakTime from "./de/breakTime.json"; import de_learningElement from "./de/learningElement.json"; +import de_spaceGoal from "./de/spaceGoal.json"; const resources = { de: { @@ -20,6 +21,7 @@ const resources = { learningSpace: de_learningSpace, breakTime: de_breakTime, learningElement: de_learningElement, + spaceGoal: de_spaceGoal, }, }; const defaultNS = "start"; @@ -36,6 +38,7 @@ i18next.use(initReactI18next).init({ "learningSpace", "breakTime", "learningElement", + "spaceGoal", ], resources: resources, defaultNS: defaultNS,