Merge pull request #2546 from atjn/meridians-force

Support forced meridians
espruino · Aug 27, 2024 · 7000f5d · 7000f5d
2 parents 4b413bf + b3add18
commit 7000f5d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/libs/js/banglejs/locale.js b/libs/js/banglejs/locale.js
@@ -47,6 +47,6 @@ exports = { name : "system", currencySym:"£",
   distance : (m,dp) => (m<1000)?round(m,dp)+"m":round(m/1000,dp)+"km", // meters to "123m" or "1.2km" depending on size
   speed : (s,dp) => round(s/1.60934,dp)+"mph",// kph to "123mph"
   temp : (t,dp) => round(t,dp)+"'C", // degrees C to degrees C
-  meridian: d => is12Hours() ? (d.getHours() <= 12) ? "am":"pm" : "", // Date to am/pm
+  meridian: (d,force) => (force||is12Hours()) ? (d.getHours() <= 12) ? "am":"pm" : "", // Date to am/pm
   is12Hours,
 };
diff --git a/libs/js/banglejs/locale.min.js b/libs/js/banglejs/locale.min.js