Merge branch 'main' into deploy

davwheat · Jun 22, 2024 · a524a22 · a524a22
2 parents 1c0b4e9 + c06645c
commit a524a22
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/announcement-data/systems/stations/AmeyPhil.tsx b/src/announcement-data/systems/stations/AmeyPhil.tsx
@@ -4751,9 +4751,14 @@ export default class AmeyPhil extends StationAnnouncementSystem {
         const mins = num % 60
 
         if (hours > 0) {
-          files.push(getNumber(hours), hours === 1 ? 'm.hour' : 'm.hours', 'm.and')
+          files.push(getNumber(hours), hours === 1 ? 'm.hour' : 'm.hours')
+        }
+        if (hours > 0 && mins > 0) {
+          files.push('m.and')
+        }
+        if (mins > 0) {
+          files.push(getNumber(mins), `${endInflection}.${mins !== 1 ? 'minutes' : 'minute'}`)
         }
-        files.push(getNumber(mins), `${endInflection}.${mins !== 1 ? 'minutes' : 'minute'}`)
 
         if (Array.isArray(options.disruptionReason)) {
           files.push('m.due to', ...options.disruptionReason)