Merge pull request #1006 from City-of-Helsinki/UHF-10120

UHF-10120: Add language to request + UHF-9289 fixes backend error messages in frontend
City-of-Helsinki · Jun 13, 2024 · f3192d5 · f3192d5
2 parents ef5b399 + 4dc123c
commit f3192d5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/dist/js/job-search.min.js b/dist/js/job-search.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/js/react/apps/job-search/containers/SearchMonitorContainer.tsx b/src/js/react/apps/job-search/containers/SearchMonitorContainer.tsx
@@ -33,8 +33,7 @@ const SearchMonitorContainer = () => {
     query: currentRelativeUrl,
     email,
     search_description: searchDescription,
-    // lang is filled by Drupal module
-    lang
+    lang: window.drupalSettings.path.currentLanguage || 'fi'
   };
 
   const onSubmit = async (
@@ -108,9 +107,8 @@ const SearchMonitorContainer = () => {
 
     // Oops, error from backend
     if (!response.ok) {
-      seterrorMessage(
-        `Error submitting form: ${response.statusText}`,
-      );
+      console.log(response.statusText);
+      seterrorMessage(Drupal.t('Saving search failed. Please try again.', {}, { context: 'Search monitor error submitting' }));
       if (submitButton) {
         submitButton.removeAttribute('disabled');
       }

diff --git a/translations/fi.po b/translations/fi.po
@@ -1273,3 +1273,7 @@ msgstr "Valinta on pakollinen: Käyttöehdot"
 msgctxt "Search monitor error email"
 msgid "This field is mandatory: Email address"
 msgstr "Kenttä on pakollinen: Sähköpostiosoite"
+
+msgctxt "Search monitor error submitting"
+msgid "Saving search failed. Please try again."
+msgstr "Hakuvahdin tilaus epäonnistui. Yritä uudestaan."
diff --git a/translations/sv.po b/translations/sv.po
@@ -1275,3 +1275,7 @@ msgstr "Valet är obligatoriskt: Användningsvillkor"
 msgctxt "Search monitor error email"
 msgid "This field is mandatory: Email address"
 msgstr "Fältet är obligatoriskt: E-postadress"
+
+msgctxt "Search monitor error submitting"
+msgid "Saving search failed. Please try again."
+msgstr "Sparad sökning misslyckades. Var god att försök igen."