From 8d0d21d832660a9c1f00f9bf836194b826d212dd Mon Sep 17 00:00:00 2001 From: Pyry Koivisto Date: Fri, 20 Dec 2024 17:27:37 +0200 Subject: [PATCH] VKT(Frontend): Move fixed UI strings to translation files [deploy] --- .../vkt/public/i18n/fi-FI/examiner.json | 21 +++++++++++++++++++ ...lerkEnrollmentAppointmentDetailsFields.tsx | 4 ++-- .../appointment/EnrollmentHistoryModal.tsx | 11 +++++----- .../appointment/GradeModal.tsx | 17 +++++++-------- .../ClerkEnrollmentContactRequestPage.tsx | 2 +- 5 files changed, 37 insertions(+), 18 deletions(-) diff --git a/frontend/packages/vkt/public/i18n/fi-FI/examiner.json b/frontend/packages/vkt/public/i18n/fi-FI/examiner.json index 08e03f7f1..c455cc78f 100644 --- a/frontend/packages/vkt/public/i18n/fi-FI/examiner.json +++ b/frontend/packages/vkt/public/i18n/fi-FI/examiner.json @@ -1,12 +1,24 @@ { "vkt": { "component": { + "enrollmentAppointment": { + "gradeModal": { + "grade": "Arvosana", + "gradeComments": "Huomautuksia", + "partialExam": "Osakoe", + "title": "Anna arvosanat" + }, + "historyModal": { + "title": "Aiempien tutkintojen tiedot" + } + }, "examinerContactRequest": { "contactRequest": "Yhteydenottopyyntö", "contactFields": "Yhteystiedot", "lastName": "Sukunimi", "firstName": "Etunimi", "email": "Sähköpostiosoite", + "examination": "Tutkinto", "phoneNumber": "Puhelinnumero", "partialExams": "Osakokeet, jotka haluan suorittaa", "previousExams": "Osallistunut aiempiin tutkintoihin?", @@ -90,6 +102,7 @@ "fillings": "Paikkoja täytetty", "hidden": "Piilotettu", "isPublic": "Näytä tutkintopäivä julkisesti", + "languagePlaceAndTime": "Tutkinnon kieli, aika ja paikka", "languageAndLevel": "Kieli ja taso", "location": "Tutkintopaikan tarkka osoite", "maxParticipants": "Paikkojen lukumäärä", @@ -97,6 +110,7 @@ "previousEnrollment": "Aikaisempi osallistuminen valtionhallinnon kielitutkintoon", "registrationCloses": "Ilmoittautuminen päättyy" }, + "heading": "Tutkinnon tiedot", "payment": { "create": "Luo maksulinkki", "setRefunded": "Merkitse maksu palautetuksi", @@ -119,6 +133,13 @@ "historyTitle": "Maksuhistoria", "recentTitle": "Maksun tila" }, + "paymentStatus": { + "DELAYED": "Myöhässä", + "FAIL": "Peruttu", + "NEW": "Aloitettu", + "OK": "Maksettu", + "PENDING": "Odottaa" + }, "status": "Ilmoittautumisen tila" }, "examinerExamEventUpsert": { diff --git a/frontend/packages/vkt/src/components/clerkEnrollment/appointment/ClerkEnrollmentAppointmentDetailsFields.tsx b/frontend/packages/vkt/src/components/clerkEnrollment/appointment/ClerkEnrollmentAppointmentDetailsFields.tsx index 0bbbe4293..035461790 100644 --- a/frontend/packages/vkt/src/components/clerkEnrollment/appointment/ClerkEnrollmentAppointmentDetailsFields.tsx +++ b/frontend/packages/vkt/src/components/clerkEnrollment/appointment/ClerkEnrollmentAppointmentDetailsFields.tsx @@ -355,11 +355,11 @@ const ExamAndEnrollmentDetailsSection = ({ return ( <>
-

Tutkinnon tiedot

+

{t('heading')}

{enrollment.examEvent && (
-

Tutkinnon kieli, aika ja paikka

+

{t('header.languagePlaceAndTime')}

{translateCommon(`examLanguage.${enrollment.examEvent.language}`)} {', '} diff --git a/frontend/packages/vkt/src/components/clerkEnrollment/appointment/EnrollmentHistoryModal.tsx b/frontend/packages/vkt/src/components/clerkEnrollment/appointment/EnrollmentHistoryModal.tsx index 35777ce3e..d16486e2d 100644 --- a/frontend/packages/vkt/src/components/clerkEnrollment/appointment/EnrollmentHistoryModal.tsx +++ b/frontend/packages/vkt/src/components/clerkEnrollment/appointment/EnrollmentHistoryModal.tsx @@ -12,7 +12,7 @@ import { import { APIResponseStatus, Color, Variant } from 'shared/enums'; import { EnrollmentSkillsListTable } from 'components/clerkEnrollment/appointment/EnrollmentSkillsListTable'; -import { useCommonTranslation } from 'configs/i18n'; +import { useCommonTranslation, useExaminerTranslation } from 'configs/i18n'; import { useAppDispatch, useAppSelector } from 'configs/redux'; import { ExamLevel } from 'enums/app'; import { ClerkEnrollmentAppointmentHistory } from 'interfaces/clerkEnrollment'; @@ -34,6 +34,9 @@ export const EnrollmentHistoryModal = ({ }) => { const dispatch = useAppDispatch(); const translateCommon = useCommonTranslation(); + const { t } = useExaminerTranslation({ + keyPrefix: 'vkt.component.enrollmentAppointment.historyModal', + }); const { historyStatus, enrollmentHistory } = useAppSelector( clerkEnrollmentAppointmentSelector, ); @@ -46,11 +49,7 @@ export const EnrollmentHistoryModal = ({ }, [dispatch, historyStatus, enrollmentId, oid]); return ( - + <>
diff --git a/frontend/packages/vkt/src/components/clerkEnrollment/appointment/GradeModal.tsx b/frontend/packages/vkt/src/components/clerkEnrollment/appointment/GradeModal.tsx index 9f7c70323..caa49e9fe 100644 --- a/frontend/packages/vkt/src/components/clerkEnrollment/appointment/GradeModal.tsx +++ b/frontend/packages/vkt/src/components/clerkEnrollment/appointment/GradeModal.tsx @@ -13,7 +13,7 @@ import { Variant, } from 'shared/enums'; -import { useCommonTranslation } from 'configs/i18n'; +import { useCommonTranslation, useExaminerTranslation } from 'configs/i18n'; import { useAppDispatch, useAppSelector } from 'configs/redux'; import { ExamGrades } from 'enums/app'; import { @@ -47,6 +47,9 @@ export const GradeModal = ({ oid: string; }) => { const translateCommon = useCommonTranslation(); + const { t } = useExaminerTranslation({ + keyPrefix: 'vkt.component.enrollmentAppointment.gradeModal', + }); const dispatch = useAppDispatch(); const exams: Array = [ 'writingPartialExam', @@ -115,17 +118,13 @@ export const GradeModal = ({ ]; return ( - + <>
- Osakoe - Arvosana - Huomautuksia + {t('partialExam')} + {t('grade')} + {t('gradeComments')} {selectedSkills.map((skill: keyof GradedExams, index) => ( diff --git a/frontend/packages/vkt/src/pages/ClerkEnrollmentContactRequestPage.tsx b/frontend/packages/vkt/src/pages/ClerkEnrollmentContactRequestPage.tsx index 9d64571d5..2db19f82a 100644 --- a/frontend/packages/vkt/src/pages/ClerkEnrollmentContactRequestPage.tsx +++ b/frontend/packages/vkt/src/pages/ClerkEnrollmentContactRequestPage.tsx @@ -271,7 +271,7 @@ export const ClerkEnrollmentContactRequestPage: FC = () => {
a.label.localeCompare(b.label))}