TILA-1848 and TILA-2148 Translations missing (#566)

* TILA-2184/1848 Translations missing

Added inclTax swedish translation

* Update common.json

Added inclTax traslation

* Update home.json

Added translations

* Update home.json

Added translations

* Update dateSelector.json

Added translations

* Update dateSelector.json

Updated translations

* Update errors.json

Modified error messages

* Update errors.json

Added swedish translations

* Update errors.json

Added english translations

* Update reservationApplication.json

Modified content in labels

* Update reservationApplication.json

Added swedish translations

* Update reservationApplication.json

Added missing comma

* Update reservationApplication.json

Added english translations

* Update reservationCalendar.json

Modified content on some labels.

* Update reservationCalendar.json

Added swedish translations

* Update reservationCalendar.json

Added english translations

* Update reservations.json

Modified some label contents

* Update reservations.json

Added swedish translations

* Update reservations.json

Added english translations

* Update reservationUnit.json

Modified label's contents

* Update reservationUnit.json

Added swedish translations

* Update reservationUnit.json

Added tag "reservationInfo2"

* Update reservationUnit.json

Added tag "reservationInfo2"

* Update reservationUnit.json

Added english translations

* TILA-1848 cleanup t10n

* TILA-1840 reflect copy changes to tests

* TILA-1848 cleanup

---------

Co-authored-by: Mikko Sartanen <sartanen@gmail.com>

Author: aceViilee

ui/components/reservation/__tests__/ReservationOrderStatus.test.tsx

@@ -35,7 +35,7 @@ const renderComponent = (props?: Partial<Props>) =>
   { status: "PAID_MANUALLY", label: "Paikan päällä" },
   { status: "CANCELLED", label: "Peruttu" },
   { status: "EXPIRED", label: "Maksamatta" },
-  { status: "REFUNDED", label: "Palautettu" },
+  { status: "REFUNDED", label: "Hyvitetty" },
 ].forEach((state) => {
   test(`should render ${state.status}`, () => {
     renderComponent({ orderStatus: state.status });

ui/cypress/e2e/reservation-unit.cy.ts

@@ -79,8 +79,10 @@ const matchEvent = (): void => {
     });
 };
 
-const reservationEnds = (date: Date) =>
-  format(addDays(date, 10), "d.M.yyyy 'klo' H.mm");
+const reservationEnds = (date: Date, justDate = false) => {
+  const fmt = justDate ? "d.M.yyyy" : "d.M.yyyy 'klo' H.mm";
+  return format(addDays(date, 10), fmt);
+};
 
 const drawReservation = (): void => {
   hzNavigationFwd().click();
@@ -353,18 +355,18 @@ describe("renders with basic data", () => {
       "Voit tehdä varauksen aikaisintaan 12 kuukautta ja viimeistään 2 päivää etukäteen."
     );
     reservationInfo().contains(
-      `Varauskalenteri on auki ${reservationEnds(new Date())} asti.`
+      `Tämä kohde on varattavissa ${reservationEnds(new Date(), true)}`
     );
     reservationInfo().contains(
-      "Varauksen keston tulee olla välillä 1 tunti ja 1 tunti 30 minuuttia."
+      "Varauksen keston tulee olla välillä 1 tunti - 1 tunti 30 minuuttia."
     );
     reservationInfo().contains(
       "Sinulla voi olla samanaikaisesti enintään yksi varaus."
     );
 
     reservationNotice().click();
     reservationNotice().contains(
-      `Huomioi hinnoittelumuutos ${toUIDate(addDays(new Date(), 2))} alkaen.`
+      `Tämän kohteen hinta muuttuu ${toUIDate(addDays(new Date(), 2))} alkaen.`
     );
     reservationNotice().contains(
       "Uusi hinta on 10,00 - 30,00 € / 15 min (sis. alv. 20%)"
@@ -394,7 +396,7 @@ describe("has pricing terms modal", () => {
 
     pricingTermsLink("reservation-unit-head").click();
 
-    pricingTermsDialog().should("contain.text", "Hinnoitteluperiaatteet");
+    pricingTermsDialog().should("contain.text", "Alennusryhmät");
     pricingTermsDialog().should("contain.text", "Hinnoitteluehdot body Fi");
 
     pricingTermsDialog().find("button").click();
@@ -450,7 +452,7 @@ describe("quick reservation", () => {
 
     pricingTermsLink("quick-reservation").click();
 
-    pricingTermsDialog().should("contain.text", "Hinnoitteluperiaatteet");
+    pricingTermsDialog().should("contain.text", "Alennusryhmät");
     pricingTermsDialog().should("contain.text", "Hinnoitteluehdot body Fi");
 
     pricingTermsDialog().find("button").click();
@@ -500,7 +502,7 @@ describe("with payment terms", () => {
     paymentAndCancellationTerms().contains("Maksuehdot Fi");
     paymentAndCancellationTerms().contains("Peruutusehdot Fi");
 
-    pricingTerms().find("> button").contains("Hinnoitteluperiaatteet");
+    pricingTerms().find("> button").contains("Alennusryhmät");
     pricingTerms().contains("Hinnoitteluehdot Fi");
   });
 });
@@ -516,7 +518,10 @@ describe("with reservation times", () => {
     calendarWrapper().should("not.exist");
     reservationControls().should("not.exist");
 
-    reservationStartNotification().should("contain", "Varauskalenteri avautuu");
+    reservationStartNotification().should(
+      "contain",
+      "Voit tehdä varauksen tähän kohteeseen"
+    );
   });
 });
 
@@ -535,12 +540,10 @@ describe("with reservation quota notification", () => {
 
     reservationSubmitButton().should("not.exist");
 
-    reservationQuotaNotification()
-      .invoke("text")
-      .should(
-        "match",
-        /^Sinulla on jo \d+ varausta tähän tilaan. Et voi tehdä uusia varauksia.$/
-      );
+    reservationQuotaNotification().should(
+      "contain.text",
+      "Et voi tehdä uusia varauksia."
+    );
 
     reservationInfo().contains(
       "Sinulla voi olla samanaikaisesti enintään 10 varausta."
@@ -565,7 +568,7 @@ describe("with reservation quota notification", () => {
 
     reservationQuotaNotification()
       .invoke("text")
-      .should("match", /^Sinulla on jo \d+\/\d+ varausta tähän tilaan.$/);
+      .should("match", /^Sinulla on \d+\/\d+ varausta tähän kohteeseen.$/);
 
     reservationInfo().contains(
       "Sinulla voi olla samanaikaisesti enintään 30 varausta."
@@ -687,7 +690,7 @@ describe("with metadataset", () => {
     );
     cy.get("main#main").should(
       "contain.text",
-      "Haen maksuttomuutta tai hinnan alennusta ja olen tutustunut alennusperusteisiin"
+      "Haen maksutonta käyttöä tai hinnan alennusta ja olen tutustunut alennusryhmiin."
     );
 
     cy.get('button[type="submit"]').click();
@@ -696,7 +699,10 @@ describe("with metadataset", () => {
       "contain.text",
       "Varauksen päivitys epäonnistui"
     );
-    errorNotificationBody().should("contain.text", "Hyväksy ehdot jatkaaksesi");
+    errorNotificationBody().should(
+      "contain.text",
+      "Hyväksy sopimusehdot jatkaaksesi varausta."
+    );
     errorNotificationCloseButton().click();
 
     cy.get("#generic-and-service-specific-terms-terms-accepted").click();
@@ -707,7 +713,10 @@ describe("with metadataset", () => {
       "contain.text",
       "Varauksen päivitys epäonnistui"
     );
-    errorNotificationBody().should("contain.text", "Hyväksy ehdot jatkaaksesi");
+    errorNotificationBody().should(
+      "contain.text",
+      "Hyväksy sopimusehdot jatkaaksesi varausta."
+    );
     errorNotificationCloseButton().click();
 
     cy.get("#cancellation-and-payment-terms-terms-accepted").click();
@@ -754,7 +763,7 @@ describe("with application", () => {
 
     cy.get("main#main").should(
       "contain.text",
-      "Saat sähköpostiisi (USER@NA.ME) varausvahvistuksen, kun varaus on käsitelty."
+      "Saat sähköpostiisi (USER@NA.ME) varausvahvistuksen, kun olemme käsitelleet varauksesi."
     );
   });
 
@@ -788,7 +797,7 @@ describe("with application", () => {
 
     cy.get("main#main").should(
       "contain.text",
-      "Saat sähköpostiisi (USER@NA.ME) varausvahvistuksen, kun varaus on käsitelty."
+      "Saat sähköpostiisi (USER@NA.ME) varausvahvistuksen, kun olemme käsitelleet varauksesi."
     );
   });
 });

ui/cypress/e2e/reservations.cy.ts

@@ -267,7 +267,7 @@ describe("Tilavaraus user reservations", () => {
     cancelCancelButton().should("not.be.disabled");
 
     cancelCancelButton().click();
-    cancelTitle().should("have.text", "Varaus peruttu!");
+    cancelTitle().should("have.text", "Varauksesi on peruttu!");
 
     reservationInfoCard()
       .should("contain.text", ", 2 t")
@@ -325,7 +325,10 @@ describe("Tilavaraus user reservations", () => {
       "have.text",
       "Varauksen muokkaaminen epäonnistui"
     );
-    errorNotificationBody().should("have.text", "Hyväksy ehdot jatkaaksesi.");
+    errorNotificationBody().should(
+      "have.text",
+      "Hyväksy sopimusehdot jatkaaksesi varausta."
+    );
     errorNotificationCloseButton().click();
 
     cy.get("#cancellation-and-payment-terms-terms-accepted").click();

ui/public/locales/en/common.json

@@ -105,6 +105,6 @@
   "fyiLabel": "For information",
   "add": "Add",
   "subtract": "Subtract",
-  "inclTax": "",
+  "inclTax": "incl. VAT {{taxPercentage}} %",
   "headAlt": "Tilan ikoni"
-}
+}

ui/public/locales/en/dateSelector.json

@@ -3,21 +3,21 @@
   "dateTypeThisWeek": "This week",
   "dateTypeToday": "Today",
   "dateTypeTomorrow": "Tomorrow",
-  "dateTypeWeekend": "Weekend",
-  "infoDate": "pp.kk.vvvv",
+  "dateTypeWeekend": "On the weekend",
+  "infoDate": "dd.mm.yyyy",
   "labelEndDate": "End date",
   "labelStartDate": "Start date",
-  "errorEndDateBeforeStartDate": "Start date must be before end date",
-  "errorDateFormat": "Date must be in format: dd.mm.yyyy",
+  "errorEndDateBeforeStartDate": "The start date must be before the end date",
+  "errorDateFormat": "The date must be in the format dd.mm.yyyy",
   "menu": {
     "buttonBack": "Back",
     "buttonClose": "Close",
     "buttonCustom": "Select dates"
   },
-  "title": "Select dates",
+  "title": "Select time",
   "accessibility": {
-    "chooseDayPrefix": "Choose",
+    "chooseDayPrefix": "Select",
     "nextMonth": "Next month",
-    "previousMonth": "Prev month"
+    "previousMonth": "Previous month"
   }
 }

ui/public/locales/en/errors.json

@@ -6,15 +6,15 @@
     "body": "Something unexpected happened"
   },
   "general_error": "Undefined error.",
-  "RESERVATION_UNIT_NOT_RESERVABLE": "",
-  "OVERLAPPING_RESERVATIONS": "",
-  "RESERVATION_UNIT_IS_NOT_OPEN": "",
-  "RESERVATION_UNIT_IN_OPEN_ROUND": "",
-  "RESERVATION_UNITS_MAX_DURATION_EXCEEDED": "",
-  "RESERVATION_UNIT_MIN_DURATION_NOT_EXCEEDED": "",
-  "MAX_NUMBER_OF_ACTIVE_RESERVATIONS_EXCEEDED": "",
-  "RESERVATION_OVERLAP": "",
-  "RESERVATION_TIME_DOES_NOT_MATCH_ALLOWED_INTERVAL": "",
-  "RESERVATION_NOT_WITHIN_ALLOWED_TIME_RANGE": "",
-  "RESERVATION_UNIT_TYPE_IS_SEASON": ""
+  "RESERVATION_UNIT_NOT_RESERVABLE": "The item cannot be reserved.",
+  "OVERLAPPING_RESERVATIONS": "There are duplicate reservations.",
+  "RESERVATION_UNIT_IS_NOT_OPEN": "The space is closed at the moment.",
+  "RESERVATION_UNIT_IN_OPEN_ROUND": "You can make a seasonal booking application for this space.",
+  "RESERVATION_UNITS_MAX_DURATION_EXCEEDED": "Please shorten the reservation time.",
+  "RESERVATION_UNIT_MIN_DURATION_NOT_EXCEEDED": "Please extend the reservation time.",
+  "MAX_NUMBER_OF_ACTIVE_RESERVATIONS_EXCEEDED": "You have exceeded the maximum number of reservations.",
+  "RESERVATION_OVERLAP": "There are duplicate reservations.",
+  "RESERVATION_TIME_DOES_NOT_MATCH_ALLOWED_INTERVAL": "Please check the reservation time.",
+  "RESERVATION_NOT_WITHIN_ALLOWED_TIME_RANGE": "Please check the reservation time.",
+  "RESERVATION_UNIT_TYPE_IS_SEASON": "You can only make a seasonal booking application for this space."
 }

ui/public/locales/en/home.json

@@ -23,7 +23,7 @@
     "sauna": "",
     "workshop": ""
   },
-  "purposesHeading": "",
-  "unitsHeading": "",
+  "purposesHeading": "What would you like to do?",
+  "unitsHeading": "Where do you want to book the space or equipment?",
   "recommendations": "Recommendations"
 }