From 2946e10122969f228174e9840cae95b98cd93f79 Mon Sep 17 00:00:00 2001 From: adrian w kirk Date: Sat, 10 Apr 2021 00:03:39 +0100 Subject: [PATCH] Bug fix to quarter from/to --- apps/slidingtext/slidingtext.local.en2.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/slidingtext/slidingtext.local.en2.js b/apps/slidingtext/slidingtext.local.en2.js index 205a75c0e..b651cfc97 100644 --- a/apps/slidingtext/slidingtext.local.en2.js +++ b/apps/slidingtext/slidingtext.local.en2.js @@ -40,16 +40,18 @@ class EnglishTraditionalDateFormatter extends DateFormatter { formatDate(date){ var hours = hoursToText(date.getHours()); var mins = date.getMinutes(); + // Deal with the special times first if(mins == 0){ return [hours,"", "O'","CLOCK"]; } else if(mins == 30){ return ["","HALF", "PAST", "", hours]; + } else if(mins == 15){ + return ["","QUARTER", "PAST", "", hours]; + } else if(mins == 45) { + return ["", "QUARTER", "TO", "", hours]; } - var mins_txt = ['','']; - if(mins == 15 || mins == 45){ - mins_txt[0] = "QUARTER"; - } - var from_to = ''; + var mins_txt; + var from_to; if(mins > 30){ from_to = "TO"; mins_txt = numberToText(60-mins);