- client: Fix beyond 24 hour time format for en locale

eoghan2t9 · Jun 4, 2020 · 459e3cf · 459e3cf
1 parent 539ccb2
commit 459e3cf
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/client/src/helpers/helpers.js b/client/src/helpers/helpers.js
@@ -43,8 +43,10 @@ export const formatTime = (time) => {
  * @returns string Returns the date and time in the format DD/MM/YYYY, HH:mm
  */
 export const formatDateTime = (dateTime, options = DEFAULT_DATE_FORMAT_OPTIONS) => {
-    const currentLanguage = i18n.languages[0] || DEFAULT_LANGUAGE;
-    const parsedTime = dateParse(dateTime);
+    const { language } = navigator;
+    const currentLanguage = (language.slice(0, 2) === 'en' || !language) ? 'en-GB' : language;
+
+    const parsedTime = new Date(dateTime);
 
     return parsedTime.toLocaleString(currentLanguage, options);
 };