Configure preferred calendar

openmrs · Aug 22, 2023 · 5b04af7 · 5b04af7
1 parent 5e20bd7
commit 5b04af7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/packages/framework/esm-styleguide/src/config-schema.ts b/packages/framework/esm-styleguide/src/config-schema.ts
@@ -13,10 +13,10 @@ export const esmStyleGuideSchema = {
     _default: "#007d79",
     _type: Type.String,
   },
-  datePicker: {
-    preferredEthiopicLocale: {
-      _default: "am-AM-u-ca-ethiopic",
-      _type: Type.String,
+  preferredCalendar: {
+    _type: Type.Object,
+    _default: {
+      am: "ethiopic",
     },
   },
 };
diff --git a/packages/framework/esm-styleguide/src/datepicker/index.tsx b/packages/framework/esm-styleguide/src/datepicker/index.tsx
@@ -65,24 +65,21 @@ export const OpenmrsDatePicker: React.FC<OpenmrsDatePickerProps> = ({
   invalidText,
   onChange,
 }) => {
-  const [preferredEthiopicLocale, setPreferredEthiopicLocale] = useState();
+  const [preferredCalendar, setPreferredCalendar] = useState();
 
   const locale = useMemo(() => {
-    if (preferredLocale) {
-      return preferredLocale;
-    }
-    const currentLocale = getLocale();
-    if (currentLocale === "am" && preferredEthiopicLocale) {
-      return preferredEthiopicLocale;
+    const currentLocale = preferredLocale || getLocale();
+    if (preferredCalendar?.[currentLocale]) {
+      return new Intl.Locale(currentLocale, {
+        calendar: preferredCalendar[currentLocale],
+      }).toString();
     }
     return currentLocale;
-  }, [preferredLocale, preferredEthiopicLocale]);
+  }, [preferredLocale, preferredCalendar]);
 
   getConfigStore("@openmrs/esm-styleguide").subscribe((store) => {
     if (store.loaded && store.config) {
-      setPreferredEthiopicLocale(
-        store.config["datePicker"].preferredEthiopicLocale
-      );
+      setPreferredCalendar(store.config["preferredCalendar"]);
     }
   });