diff --git a/ayanova/src/components/time-control.vue b/ayanova/src/components/time-control.vue
index 583ad2da..290653a5 100644
--- a/ayanova/src/components/time-control.vue
+++ b/ayanova/src/components/time-control.vue
@@ -17,7 +17,7 @@
           <v-time-picker
             scrollable
             ampm-in-title
-            :format="24hr"
+            :format="ampmFormat"
             v-model="timeOnly"
           >
             <v-spacer></v-spacer>
@@ -61,7 +61,7 @@ export default {
     date: null,
     oldDate: null,
     dlgtime: false,
-    ampmFormat: "ampm" //or "24hr"
+    ampmFormat: window.$gz.locale.format().hour12 ? "ampm" : "24hr"
   }),
   props: {
     label: String,