Merge pull request #1123 from culturecreates/develop

Develop
culturecreates · May 23, 2024 · b210037 · b210037
2 parents 056f9e4 + dc8b021
commit b210037
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/src/locales/fr/transalationFr.json b/src/locales/fr/transalationFr.json
@@ -492,7 +492,7 @@
         "email": "Courriel",
         "memberOf": "Membre de",
         "location": "Endroit",
-        "Edit": "Éditer",
+        "edit": "Éditer",
         "socialMediaLinks": "Liens vers les réseaux sociaux"
       },
       "createNew": {

diff --git a/src/pages/Dashboard/OrganizationsReadOnly/OrganizationsReadOnly.jsx b/src/pages/Dashboard/OrganizationsReadOnly/OrganizationsReadOnly.jsx
@@ -187,7 +187,7 @@ function OrganizationsReadOnly() {
                     <div className="button-container">
                       <OutlinedButton
                         data-cy="button-edit-organization"
-                        label={t('dashboard.organization.readOnly.Edit')}
+                        label={t('dashboard.organization.readOnly.edit')}
                         size="middle"
                         style={{ height: '40px', width: '60px' }}
                         onClick={() =>

diff --git a/src/pages/Dashboard/Settings/WidgetSettings/WidgetSettings.jsx b/src/pages/Dashboard/Settings/WidgetSettings/WidgetSettings.jsx
@@ -48,9 +48,7 @@ const WidgetSettings = () => {
   const { eventDetailsUrlTemplate = '', listEventsUrlTemplate = '' } = currentCalendarData?.widgetSettings || {};
   const calendarSlug = currentCalendarData?.slug;
   const calendarName = currentCalendarData?.name[user?.interfaceLanguage?.toLowerCase()];
-  const encodedCalendarLogoUri = encodeURIComponent(currentCalendarData?.image?.uri || '');
-  const encodedEventDetailsUrlTemplate = encodeURIComponent(eventDetailsUrlTemplate);
-  const encodedListEventsUrlTemplate = encodeURIComponent(listEventsUrlTemplate);
+  const calendarLogoUri = currentCalendarData?.image?.uri || '';
 
   const [color, setColor] = useState('#607EFC');
   const [locationOptions, setLocationOptions] = useState([]);
@@ -151,7 +149,7 @@ const WidgetSettings = () => {
         arrayToQueryParam(allValues?.region ?? [], 'region') +
         arrayToQueryParam([...(allValues?.person ?? []), ...(allValues?.organizer ?? [])], 'person-organization');
 
-      const searchEventsFilters = encodeURIComponent(filtersParam);
+      const searchEventsFilters = filtersParam;
 
       const locale = onLanguageSelect(allValues?.language);
       const urlCopy = new URL(widgetUrl);
@@ -163,9 +161,9 @@ const WidgetSettings = () => {
       urlCopy.searchParams.append('limit', limit);
       urlCopy.searchParams.append('calendar', calendarSlug);
       urlCopy.searchParams.append('calendarName', calendarName);
-      urlCopy.searchParams.append('logo', encodedCalendarLogoUri);
-      urlCopy.searchParams.append('eventUrl', encodedEventDetailsUrlTemplate);
-      urlCopy.searchParams.append('searchEventsUrl', encodedListEventsUrlTemplate);
+      urlCopy.searchParams.append('logo', calendarLogoUri);
+      urlCopy.searchParams.append('eventUrl', eventDetailsUrlTemplate);
+      urlCopy.searchParams.append('searchEventsUrl', listEventsUrlTemplate);
       urlCopy.searchParams.append('searchEventsFilters', searchEventsFilters);
       urlCopy.searchParams.append('locale', locale?.key.toLowerCase());
 
@@ -177,9 +175,9 @@ const WidgetSettings = () => {
       urlCopyMobile.searchParams.append('limit', limit);
       urlCopyMobile.searchParams.append('calendar', calendarSlug);
       urlCopyMobile.searchParams.append('calendarName', calendarName);
-      urlCopyMobile.searchParams.append('logo', encodedCalendarLogoUri);
-      urlCopyMobile.searchParams.append('eventUrl', encodedEventDetailsUrlTemplate);
-      urlCopyMobile.searchParams.append('searchEventsUrl', encodedListEventsUrlTemplate);
+      urlCopyMobile.searchParams.append('logo', calendarLogoUri);
+      urlCopyMobile.searchParams.append('eventUrl', eventDetailsUrlTemplate);
+      urlCopyMobile.searchParams.append('searchEventsUrl', listEventsUrlTemplate);
       urlCopyMobile.searchParams.append('searchEventsFilters', searchEventsFilters);
       urlCopyMobile.searchParams.append('locale', locale?.key.toLowerCase());
       urlCopyMobile.searchParams.append('height', '600');
@@ -329,9 +327,9 @@ const WidgetSettings = () => {
     const limit = form.getFieldValue('limit') ?? 9;
     const locale = form.getFieldValue('locale') ?? languageOptions[0].value;
 
-    urlCopy.searchParams.append('eventUrl', encodedEventDetailsUrlTemplate);
-    urlCopy.searchParams.append('searchEventsUrl', encodedListEventsUrlTemplate);
-    urlCopy.searchParams.append('logo', encodedCalendarLogoUri);
+    urlCopy.searchParams.append('eventUrl', eventDetailsUrlTemplate);
+    urlCopy.searchParams.append('searchEventsUrl', listEventsUrlTemplate);
+    urlCopy.searchParams.append('logo', calendarLogoUri);
     urlCopy.searchParams.append('locale', onLanguageSelect(locale)?.key.toLowerCase());
     urlCopy.searchParams.append('limit', limit);
     urlCopy.searchParams.append('color', color);
@@ -340,9 +338,9 @@ const WidgetSettings = () => {
     urlCopy.searchParams.append('height', height);
     setUrl(urlCopy);
 
-    urlCopyMobile.searchParams.append('eventUrl', encodedEventDetailsUrlTemplate);
-    urlCopyMobile.searchParams.append('searchEventsUrl', encodedListEventsUrlTemplate);
-    urlCopyMobile.searchParams.append('logo', encodedCalendarLogoUri);
+    urlCopyMobile.searchParams.append('eventUrl', eventDetailsUrlTemplate);
+    urlCopyMobile.searchParams.append('searchEventsUrl', listEventsUrlTemplate);
+    urlCopyMobile.searchParams.append('logo', calendarLogoUri);
     urlCopyMobile.searchParams.append('locale', onLanguageSelect(locale)?.key.toLowerCase());
     urlCopyMobile.searchParams.append('limit', limit);
     urlCopyMobile.searchParams.append('color', color);