From 2c4db439d235b68478d90c450289d2d0ba418547 Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Wed, 18 Mar 2020 08:59:09 -0400
Subject: add upstream 10.21

---
 zen/format_unit.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'zen/format_unit.cpp')

diff --git a/zen/format_unit.cpp b/zen/format_unit.cpp
index f2df4153..91a881dc 100644
--- a/zen/format_unit.cpp
+++ b/zen/format_unit.cpp
@@ -11,6 +11,7 @@
 #include "i18n.h"
 #include "time.h"
 #include "globals.h"
+#include "utf.h"
 
     #include <clocale> //thousands separator
     #include "utf.h"   //
@@ -115,7 +116,7 @@ std::wstring roundToBlock(double timeInHigh,
 
     std::wstring output = formatUnitTime(roundedtimeInLow / unitLowPerHigh, unitHigh);
     if (unitLowPerHigh > blockSizeLow)
-        output += L" " + formatUnitTime(roundedtimeInLow % unitLowPerHigh, unitLow);
+        output += L' ' + formatUnitTime(roundedtimeInLow % unitLowPerHigh, unitLow);
     return output;
 }
 }
@@ -194,7 +195,7 @@ std::wstring zen::formatUtcToLocalTime(time_t utcTime)
 
     TimeComp loc = getLocalTime(utcTime);
 
-    std::wstring dateString = formatTime<std::wstring>(L"%x  %X", loc);
+    std::wstring dateString = utfTo<std::wstring>(formatTime(Zstr("%x  %X"), loc));
     return !dateString.empty() ? dateString : errorMsg();
 }
 
-- 
cgit