feat: add language cookie for handler and enforce FI

City-of-Helsinki · Nov 19, 2024 · d77139d · d77139d
1 parent c4a7df7
commit d77139d
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 7 deletions.
diff --git a/backend/benefit/locale/en/LC_MESSAGES/django.po b/backend/benefit/locale/en/LC_MESSAGES/django.po
@@ -1460,6 +1460,12 @@ msgstr ""
 msgid "Handler is not allowed to do this action"
 msgstr ""
 
+msgid "Handling comment"
+msgstr ""
+
+msgid "Manual calculation comment"
+msgstr ""
+
 msgid "Only the terms currently in effect can be approved"
 msgstr ""
 

diff --git a/backend/benefit/locale/fi/LC_MESSAGES/django.po b/backend/benefit/locale/fi/LC_MESSAGES/django.po
@@ -1508,6 +1508,12 @@ msgstr "Hakija ei saa tehdä tätä toimenpidettä"
 msgid "Handler is not allowed to do this action"
 msgstr "Käsittelijä ei saa tehdä tätä toimenpidettä"
 
+msgid "Handling comment"
+msgstr "Käsittelyn perustelu"
+
+msgid "Manual calculation comment"
+msgstr "Manuaalisen laskelman perustelu"
+
 msgid "Only the terms currently in effect can be approved"
 msgstr "Vain voimassa olevat ehdot voidaan hyväksyä"
 

diff --git a/backend/benefit/locale/sv/LC_MESSAGES/django.po b/backend/benefit/locale/sv/LC_MESSAGES/django.po
@@ -1532,6 +1532,12 @@ msgstr "Sökande får inte utföra denna åtgärd"
 msgid "Handler is not allowed to do this action"
 msgstr "Handläggare får inte utföra denna åtgärd"
 
+msgid "Handling comment"
+msgstr ""
+
+msgid "Manual calculation comment"
+msgstr ""
+
 msgid "Only the terms currently in effect can be approved"
 msgstr "Endast de villkor som för tillfället gäller kan godkännas"
 

diff --git a/backend/benefit/users/api/v1/views.py b/backend/benefit/users/api/v1/views.py
@@ -49,11 +49,7 @@ def get(self, request):
         lang = request.GET.get("lang")
 
         if lang in ["fi", "en", "sv"]:
-            token = request.COOKIES.get("yjdhcsrftoken")
-
-            response = Response(
-                {"lang": lang, "token": token}, status=status.HTTP_200_OK
-            )
+            response = Response({"lang": lang}, status=status.HTTP_200_OK)
             response.set_cookie(settings.LANGUAGE_COOKIE_NAME, lang, httponly=True)
             return response
 

diff --git a/frontend/benefit/handler/src/components/header/useHeader.tsx b/frontend/benefit/handler/src/components/header/useHeader.tsx
@@ -1,14 +1,28 @@
+import axios from 'axios';
 import NumberTag from 'benefit/handler/components/header/NumberTag';
-import { ROUTES } from 'benefit/handler/constants';
+import { ROUTES, SUPPORTED_LANGUAGES } from 'benefit/handler/constants';
 import AppContext from 'benefit/handler/context/AppContext';
 import useApplicationAlterationsQuery from 'benefit/handler/hooks/useApplicationAlterationsQuery';
 import { useDetermineAhjoMode } from 'benefit/handler/hooks/useDetermineAhjoMode';
+import {
+  BackendEndpoint,
+  getBackendDomain,
+} from 'benefit-shared/backend-api/backend-api';
 import { useRouter } from 'next/router';
 import { TFunction, useTranslation } from 'next-i18next';
-import React from 'react';
+import React, { useEffect } from 'react';
 import { NavigationItem, OptionType } from 'shared/types/common';
 import { getLanguageOptions } from 'shared/utils/common';
 
+const setLanguageToFinnish = (): void => {
+  const optionsEndpoint = `${getBackendDomain()}/${
+    BackendEndpoint.USER_OPTIONS
+  }`;
+  void axios.get(optionsEndpoint, {
+    params: { lang: SUPPORTED_LANGUAGES.FI },
+  });
+};
+
 type ExtendedComponentProps = {
   t: TFunction;
   languageOptions: OptionType<string>[];
@@ -33,6 +47,8 @@ const useHeader = (): ExtendedComponentProps => {
     [t]
   );
 
+  useEffect(setLanguageToFinnish, []);
+
   const { data: alterationData, isLoading: isAlterationListLoading } =
     useApplicationAlterationsQuery();