From f655873269ccd8992c5f5610327a24f78c449403 Mon Sep 17 00:00:00 2001 From: Todd Lunter Date: Sun, 26 May 2013 13:23:59 -0400 Subject: Made parseTemplate recursively replace template variables. --- src/Plugins/Monitors/Batt.hs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/Plugins/Monitors/Batt.hs') diff --git a/src/Plugins/Monitors/Batt.hs b/src/Plugins/Monitors/Batt.hs index eddec06..4c0232f 100644 --- a/src/Plugins/Monitors/Batt.hs +++ b/src/Plugins/Monitors/Batt.hs @@ -163,9 +163,8 @@ runBatt' bfs args = do case c of Result x w t s -> do l <- fmtPercent x - let ts = [fmtTime $ floor t, fmtWatts w opts suffix d] - s' <- parseTemplate' (s ++ "") (l ++ "":ts) - parseTemplate (l ++ s':ts) + let ts = [fmtTime $ floor t, fmtWatts w opts suffix d] + parseTemplate (l ++ s:ts) NA -> return "N/A" where fmtPercent :: Float -> Monitor [String] fmtPercent x = do -- cgit v1.2.3