tweak numerical output; fix warnings

1 files changed, 7 insertions, 5 deletions

diff --git a/countdown.hs b/countdown.hs
index 7c510b5..afd9266 100755
--- a/countdown.hs
+++ b/countdown.hs
@@ -130,8 +130,6 @@ drawUI st = [a]
         (countdownWidget (isSimulatedTime st) $ st ^. stDisplayTime)
       ]
 
-printRemain unit quantity = printf "%d %s%s remain%s"
-
 showTime :: NominalDiffTime -> String
 showTime t | t < 1           = printf "%.3f seconds" (realToFrac t :: Float)
 showTime t | t == 1          = "1 second"
@@ -197,7 +195,7 @@ countdownWidget isSimulated t =
                         (commasF 2 minutesLeft)
                         (pluralize $ (floor minutesLeft :: Integer))
                         (pluralizeVerb $ (floor minutesLeft :: Integer))
-                        (commasF 1 secondsLeft)
+                        (commasF' 1 secondsLeft)
                         (pluralize secondsLeft)
                         (pluralizeVerb secondsLeft)))
      , (borderWithLabel (str "Cosmic Time") $
@@ -227,7 +225,7 @@ countdownWidget isSimulated t =
         (str $ printf "Day %d of %d\nSecond %s of %s"
               dayNum
               numDays
-              (commas $ 1 + toSeconds yearElapsed)
+              (commas $ (1 + toSeconds yearElapsed :: Int))
               (commas $ toSeconds yearLength))
       ,
       str "   "
@@ -254,7 +252,10 @@ countdownWidget isSimulated t =
     x // y         = fromRational $ toRational x / toRational y :: Double
     progressLabel  = printf "%.6F%%" (100 * (yearElapsed // yearLength))
 
-commasF :: RealFrac x => Int -> x -> Text
+commasF' 1 n = if (floor (n * 10) `mod` 10 :: Int) == 0 then commasF 0 n else commasF 1 n
+commasF' p n = commasF p n
+
+commasF', commasF :: RealFrac x => Int -> x -> Text
 commasF precision = prettyF cfg
   where
     cfg = PrettyCfg precision (Just ',') '.'
@@ -275,6 +276,7 @@ nextWholeSecond (ZonedTime (LocalTime day (TimeOfDay h m s)) z) = (ZonedTime (Lo
 diffZonedTime :: ZonedTime -> ZonedTime -> NominalDiffTime
 diffZonedTime = diffLocalTime `Prelude.on` zonedTimeToLocalTime
 
+isNewYearsEve :: LocalTime -> Bool
 isNewYearsEve t = dayNumOfYear t == daysInYear t
 
 queueNextEvent :: MonadIO m => Bool -> BChan CustomEvent -> m ZonedTime