slight refactor

1 files changed, 34 insertions, 36 deletions

diff --git a/countdown.hs b/countdown.hs
index 0d072e1..f9da70e 100755
--- a/countdown.hs
+++ b/countdown.hs
@@ -285,44 +285,42 @@ countdownWidget showConversion isSimulated t =
             str ""
           ]
 
+    strWhen b s = str $ if b then s else ""
     countdownBox =
       (borderWithLabel (str $ printf "Countdown %d" currentYear) $
-         (str $ printf "Day %d of %d; %d remaining\nSecond %s of %s"
-               dayNum
-               numDays
-               daysLeft
-               (commas $ (1 + toSeconds yearElapsed :: Int))
-               (commas $ toSeconds yearLength))
-         <=>
-         -- (str $ printf "%d day%s remain%s"
-         --                daysLeft
-         --                (pluralize daysLeft)
-         --                (pluralizeVerb daysLeft)
-         -- )
-         -- <=>
-         (str $ if hoursLeft < 24 && hoursLeft > 1
-           then
-             printf "%s hour%s remain%s"
-             (commasF 2 hoursLeft)
-             (pluralize $ (floor hoursLeft :: Integer))
-             (pluralizeVerb $ (floor hoursLeft :: Integer))
-           else "")
-         <=>
-         (str $ if hoursLeft <= 1 && minutesLeft > 1
-           then
-             printf "%s minute%s remain%s"
-             (commasF 2 minutesLeft)
-             (pluralize $ (floor minutesLeft :: Integer))
-             (pluralizeVerb $ (floor minutesLeft :: Integer))
-           else "")
-         <=>
-         (str $ if minutesLeft <= 1
-           then
-             printf "%s second%s remain%s"
-             (commasF' 1 secondsLeft)
-             (pluralize secondsLeft)
-             (pluralizeVerb secondsLeft)
-           else ""))
+        vBox $
+        (str $ printf "Day %d of %d\nSecond %s of %s"
+          dayNum
+          numDays
+          (commas $ (1 + toSeconds yearElapsed :: Int))
+          (commas $ toSeconds yearLength)) : remains
+        )
+    remains =
+        [
+          strWhen (hoursLeft >= 24) $
+          printf "%d day%s remain%s"
+          daysLeft
+          (pluralize daysLeft)
+          (pluralizeVerb daysLeft),
+
+          strWhen (hoursLeft < 24 && hoursLeft > 1) $
+          printf "%s hour%s remain%s"
+          (commasF 2 hoursLeft)
+          (pluralize $ (floor hoursLeft :: Integer))
+          (pluralizeVerb $ (floor hoursLeft :: Integer)),
+
+          strWhen (hoursLeft <= 1 && minutesLeft > 1) $
+          printf "%s minute%s remain%s"
+          (commasF 2 minutesLeft)
+          (pluralize $ (floor minutesLeft :: Integer))
+          (pluralizeVerb $ (floor minutesLeft :: Integer)),
+
+          strWhen (minutesLeft <= 1) $
+          printf "%s second%s remain%s"
+          (commasF' 1 secondsLeft)
+          (pluralize secondsLeft)
+          (pluralizeVerb secondsLeft)
+        ]
 
     cosmicTimeBox =
       (borderWithLabel (str "Cosmic Time") $