Merge pull request #1048 from culturecreates/develop

Develop
culturecreates · Apr 2, 2024 · 8cefde3 · 8cefde3
2 parents cb50685 + c32f691
commit 8cefde3
Show file tree

Hide file tree

Showing 4 changed files with 484 additions and 449 deletions.
diff --git a/src/locales/fr/transalationFr.json b/src/locales/fr/transalationFr.json
@@ -923,7 +923,7 @@
         "color": "Couleur principale du thème",
         "colorDescreption": "Entrez le code hexadécimal de la couleur principale. Choisissez une couleur qui donne suffisamment de contraste pour que l'utilisateur puisse lire le contenu.",
         "colorPlaceHolder": "Collez votre code couleur ou sélectionnez une couleur",
-        "height": "Largeur",
+        "height": "Hauteur",
         "width": "Largeur maximale",
         "language": "Choix de langue",
         "eventType": "Type d'événement",
@@ -995,11 +995,11 @@
         "heading": "Nouvelle taxonomie",
         "class": "Classe",
         "classDropdownOptions": {
-          "event": "Event",
-          "place": "Place",
-          "person": "Person",
-          "organization": "Organization",
-          "virtualLocation": "Virtual location"
+          "event": "Événement",
+          "place": "Lieu",
+          "person": "Personne",
+          "organization": "Organisation",
+          "virtualLocation": "Emplacement virtuel"
         },
         "classValidation": "Sélectionnez une classe",
         "classPlaceHolder": "Sélectionner une classe",

diff --git a/src/pages/Dashboard/AddUser/AddUser.jsx b/src/pages/Dashboard/AddUser/AddUser.jsx
@@ -43,6 +43,7 @@ import { setReloadCalendar } from '../../../redux/reducer/selectedCalendarSlice'
 import CalendarAccordion from '../../../components/Accordion/CalendarAccordion';
 import { removeObjectArrayDuplicates } from '../../../utils/removeObjectArrayDuplicates';
 import Select from '../../../components/Select';
+import Cookies from 'js-cookie';
 
 const AddUser = () => {
   const navigate = useNavigate();
@@ -356,10 +357,11 @@ const AddUser = () => {
                           roles: response?.roles,
                           isSuperAdmin: response?.isSuperAdmin ? true : false,
                           userName: response?.userName,
-                          interfaceLanguage: response?.languagePreference,
+                          interfaceLanguage: response?.interfaceLanguage,
                         },
                       };
                       dispatch(setUser(userDetails));
+                      Cookies.set('interfaceLanguage', response?.interfaceLanguage?.toLowerCase());
                     });
                   notification.success({
                     description: t('dashboard.userProfile.notification.profileUpdate'),
@@ -448,10 +450,11 @@ const AddUser = () => {
                           roles: response?.roles,
                           isSuperAdmin: response?.isSuperAdmin ? true : false,
                           userName: response?.userName,
-                          interfaceLanguage: response?.languagePreference,
+                          interfaceLanguage: response?.interfaceLanguage,
                         },
                       };
                       dispatch(setUser(userDetails));
+                      Cookies.set('interfaceLanguage', response?.interfaceLanguage?.toLowerCase());
 
                       navigate(-2);
                     });