Ticket #2938: hoursDisplay.patch

source/i18n/L10n.cpp

@@ -36 +36 @@
 #include "ps/Filesystem.h"
 #include "ps/GameSetup/GameSetup.h"
 
-
 static Status ReloadChangedFileCB(void* param, const VfsPath& path)
 {
     return static_cast<L10n*>(param)->ReloadChangedFile(path);
@@ -402 +401 @@
 
 std::string L10n::FormatMillisecondsIntoDateString(UDate milliseconds, const std::string& formatString)
 {
-    UErrorCode success = U_ZERO_ERROR;
-    UnicodeString utf16Date;
-    UnicodeString utf16LocalizedDateTimeFormat = UnicodeString::fromUTF8(formatString.c_str());
+    UErrorCode status;
+    UnicodeString dateString;
+    CStr resultString;
 
-    // The format below should never reach the user, the one that matters is the
-    // one from the formatString parameter.
-    UnicodeString utf16SourceDateTimeFormat = UnicodeString::fromUTF8("No format specified (you should not be seeing this string!)");
+    UnicodeString unicodeFormat = UnicodeString::fromUTF8(formatString.c_str());
+    SimpleDateFormat* dateFormat = new SimpleDateFormat(unicodeFormat, status);
+   
+    if(U_FAILURE(status))
+        LOGERROR(L"Error creating SimpleDateFormat: %s", u_errorName(status));
 
-    SimpleDateFormat* dateFormatter = new SimpleDateFormat(utf16SourceDateTimeFormat, currentLocale, success);
-    dateFormatter->applyLocalizedPattern(utf16LocalizedDateTimeFormat, success);
-    dateFormatter->format(milliseconds, utf16Date);
-    delete dateFormatter;
+    TimeZone* timeZone = TimeZone::createTimeZone("GMT");
+    
+    Calendar* calendar = Calendar::createInstance(timeZone, currentLocale, status);
+   
+    if(U_FAILURE(status))
+        LOGERROR(L"Error creating calendar: %s", u_errorName(status));
+   
+    dateFormat->adoptCalendar(calendar);
+    dateFormat->format(milliseconds, dateString);
+    dateString.toUTF8String(resultString);
 
-    char utf8Date[512];
-    CheckedArrayByteSink sink(utf8Date, ARRAY_SIZE(utf8Date));
-    utf16Date.toUTF8(sink);
-    ENSURE(!sink.Overflowed());
+    //We only need to delete the dateFormat pointer, because it accepts
+    //ownership of calendar and timeZone.
+    delete dateFormat;
 
-    return std::string(utf8Date, sink.NumberOfBytesWritten());
+    return resultString;
 }
 
 std::string L10n::FormatDecimalNumberIntoString(double number)