Merge pull request #1317 from culturecreates/develop

Develop
culturecreates · Sep 11, 2024 · 57d75c9 · 57d75c9
2 parents 64ce150 + 95d431b
commit 57d75c9
Show file tree

Hide file tree

Showing 78 changed files with 5,004 additions and 5,933 deletions.
diff --git a/src/components/Accordion/CalendarAccordion/CalendarAccordion.jsx b/src/components/Accordion/CalendarAccordion/CalendarAccordion.jsx
@@ -479,6 +479,7 @@ function CalendarAccordion(props) {
                 }
                 name={people?.name}
                 description={people?.description}
+                calendarContentLanguage={calendarContentLanguage}
                 bordered
                 closable={readOnly ? false : true}
                 itemWidth="100%"

diff --git a/src/components/BilingualInput/BilingualInput.jsx b/src/components/BilingualInput/BilingualInput.jsx
diff --git a/src/components/BilingualInput/index.js b/src/components/BilingualInput/index.js
diff --git a/src/components/BilingualTextEditor/BilingualTextEditor.jsx b/src/components/BilingualTextEditor/BilingualTextEditor.jsx
diff --git a/src/components/BilingualTextEditor/index.js b/src/components/BilingualTextEditor/index.js
diff --git a/src/components/Card/MandatoryField/MandatoryField.jsx b/src/components/Card/MandatoryField/MandatoryField.jsx
@@ -80,8 +80,7 @@ function MandatoryField(props) {
                 <AddField
                   key={index}
                   label={bilingual({
-                    en: field?.label?.en,
-                    fr: field?.label?.fr,
+                    data: field?.label,
                     interfaceLanguage: user?.interfaceLanguage?.toLowerCase(),
                   })}
                   disabled={field?.preFilled}
@@ -103,8 +102,7 @@ function MandatoryField(props) {
                 <AddField
                   key={index}
                   label={bilingual({
-                    en: field?.label?.en,
-                    fr: field?.label?.fr,
+                    data: field?.label,
                     interfaceLanguage: user?.interfaceLanguage?.toLowerCase(),
                   })}
                   onClick={() => addToFields(field)}

diff --git a/src/components/ContentLanguageInput/ContentLanguageInput.jsx b/src/components/ContentLanguageInput/ContentLanguageInput.jsx
diff --git a/src/components/ContentLanguageInput/index.js b/src/components/ContentLanguageInput/index.js