fix: Localize Date and Time translations using AM/PM

app/helpers/general-date.js

@@ -1,9 +1,20 @@
 import Helper from '@ember/component/helper';
 import moment from 'moment';
 
+const locales12Hours = new Set(['en', 'bn', 'hi', 'id', 'ja', 'run', 'th', 'vi', 'ko']);
+
 export function generalDate(params) {
   const timezone = params[1] || moment.tz.guess();
-  const format = params[2] || 'h:mm A, MMMM Do YYYY (z)';
+
+  const local = moment(params[0]).tz(timezone).locale();
+
+  let format = params[2] || 'dddd, D MMMM, YYYY h:mm A (z)';
+
+  if (!locales12Hours.has(local)) {
+    format = format.replaceAll('h', 'H');
+    format = format.replace(' A', '');
+    format = format.replace(' a', '');
+  }
   return moment(params[0]).tz(timezone).format(format);
 }
 

app/helpers/header-date.js

@@ -1,9 +1,21 @@
 import Helper from '@ember/component/helper';
 import moment from 'moment';
 
+const locales12Hours = new Set(['en', 'bn', 'hi', 'id', 'ja', 'run', 'th', 'vi', 'ko']);
+
 export function headerDate(params) {
   const timezone = params[1] ? params[1] : moment.tz.guess();
-  return `${moment(params[0]).tz(timezone).format('dddd, MMMM Do YYYY, h:mm A')} (${moment.tz(params[0], timezone).zoneAbbr()})`;
+
+  const local = moment(params[0]).tz(timezone).locale();
+
+  let format = 'dddd, MMMM Do YYYY, h:mm A';
+
+  if (!locales12Hours.has(local)) {
+    format = format.replace('h', 'HH');
+    format = format.replace(' A', '');
+  }
+
+  return `${moment(params[0]).tz(timezone).format(format)} (${moment.tz(params[0], timezone).zoneAbbr()})`;
 }
 
 export default Helper.helper(headerDate);

app/templates/components/event-invoice/event-info.hbs

@@ -12,9 +12,9 @@
   <div class="ui padded segment">
     <strong>{{t 'At'}} {{this.event.locationName}}</strong>
     <br>
-    <strong>{{t 'From'}}:</strong> {{header-date this.event.startsAt}}
+    <strong>{{t 'From'}}:</strong> {{general-date this.event.startsAt}}
     <br>
-    <strong>{{t 'To'}}:</strong> {{header-date this.event.endsAt}}
+    <strong>{{t 'To'}}:</strong> {{general-date this.event.endsAt}}
     {{#if this.event.ownerName}}
       <br>
       <strong>{{t 'Organized By'}}:</strong> {{this.event.ownerName}}

app/templates/components/orders/event-info.hbs

@@ -24,9 +24,9 @@
       <strong>{{t 'Location or online event details to be announced'}}</strong>
     {{/if}}
     <br>
-    <strong>{{t 'From'}}:</strong> {{header-date this.data.event.startsAt}}
+    <strong>{{t 'From'}}:</strong> {{general-date this.data.event.startsAt}}
     <br>
-    <strong>{{t 'To'}}:</strong> {{header-date this.data.event.endsAt}}
+    <strong>{{t 'To'}}:</strong> {{general-date this.data.event.endsAt}}
     {{#if this.data.event.ownerName}}
       <br>
       <strong>{{t 'Organized By'}}:</strong> {{this.data.event.ownerName}}

app/templates/orders/expired.hbs

@@ -7,7 +7,7 @@
   <div class="row">
     <div class="column">
       <div class="ui small gray-text">
-        {{header-date this.model.event.startsAt}} - {{header-date this.model.event.endsAt}}
+        {{general-date this.model.event.startsAt}} - {{general-date this.model.event.endsAt}}
         <br>
         {{this.model.event.locationName}}
       </div>

app/templates/orders/new.hbs

@@ -8,7 +8,7 @@
     <div class="row">
       <div class="column">
         <div class="ui small gray-text">
-          {{header-date this.model.order.event.startsAt}} - {{header-date this.model.order.event.endsAt}}
+          {{general-date this.model.order.event.startsAt}} - {{general-date this.model.order.event.endsAt}}
           <br>
           {{this.model.order.event.locationName}}
         </div>

app/templates/orders/pending.hbs

@@ -8,7 +8,7 @@
     <div class="row">
       <div class="column">
         <div class="ui small gray-text">
-          {{header-date this.model.order.event.startsAt}} - {{header-date this.model.order.event.endsAt}}
+          {{general-date this.model.order.event.startsAt}} - {{general-date this.model.order.event.endsAt}}
           <br>
           {{this.model.order.event.locationName}}
         </div>

app/templates/orders/view.hbs

@@ -7,7 +7,7 @@
   <div class="row print">
     <div class="column">
       <div class="ui small gray-text">
-        {{header-date this.model.order.event.startsAt}} - {{header-date this.model.order.event.endsAt}}
+        {{general-date this.model.order.event.startsAt}} - {{general-date this.model.order.event.endsAt}}
         <br>
         {{this.model.order.event.locationName}}
       </div>