Modify locale default behaviour in StepDefaults 5.0 and 5.1

dgbowl · Aug 21, 2024 · cae7e21 · cae7e21
1 parent 3dbdf61
commit cae7e21
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/dgbowl_schemas/yadg/dataschema_5_0/stepdefaults.py b/src/dgbowl_schemas/yadg/dataschema_5_0/stepdefaults.py
@@ -35,5 +35,12 @@ def timezone_resolve_localtime(cls, v):
     @classmethod
     def locale_set_default(cls, v):
         if v is None:
-            v = ".".join(locale.getlocale())
+            for loc in (locale.getlocale(), locale.getlocale(locale.LC_NUMERIC)):
+                try:
+                    v = ".".join(loc)
+                    break
+                except TypeError:
+                    pass
+            else:
+                v = "en_GB.UTF-8"
         return v
diff --git a/src/dgbowl_schemas/yadg/dataschema_5_1/stepdefaults.py b/src/dgbowl_schemas/yadg/dataschema_5_1/stepdefaults.py
@@ -36,9 +36,12 @@ def timezone_resolve_localtime(cls, v):
     @classmethod
     def locale_set_default(cls, v):
         if v is None:
-            v = locale.getlocale(locale.LC_NUMERIC)[0]
-        try:
-            v = str(Locale.parse(v))
-        except (TypeError, UnknownLocaleError):
-            v = "en_GB"
+            for loc in (locale.getlocale(locale.LC_NUMERIC), locale.getlocale()):
+                try:
+                    v = str(Locale.parse(loc[0]))
+                    break
+                except (TypeError, UnknownLocaleError):
+                    pass
+            else:
+                v = "en_GB"
         return v