From 34be8488a5c59b8d70ea8ae048b0d5628d71ee0f Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 10 Mar 2018 12:12:32 +0100 Subject: [PATCH] StringUtil: Fix Windows encoding in ThousandSeparate Some locales use non-breaking spaces as separators, so getting the encoding right is important. If DolphinWX gets a string that isn't valid UTF-8, it flat out won't display the string. --- Source/Core/Common/StringUtil.h | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Source/Core/Common/StringUtil.h b/Source/Core/Common/StringUtil.h index b5632c364b..ec2e5c6337 100644 --- a/Source/Core/Common/StringUtil.h +++ b/Source/Core/Common/StringUtil.h @@ -45,15 +45,23 @@ std::string StripQuotes(const std::string& s); template std::string ThousandSeparate(I value, int spaces = 0) { - std::ostringstream oss; +#ifdef _WIN32 + std::wostringstream stream; +#else + std::ostringstream stream; +#endif // std::locale("") seems to be broken on many platforms #if defined _WIN32 || (defined __linux__ && !defined __clang__) - oss.imbue(std::locale("")); + stream.imbue(std::locale("")); #endif - oss << std::setw(spaces) << value; + stream << std::setw(spaces) << value; - return oss.str(); +#ifdef _WIN32 + return UTF16ToUTF8(stream.str()); +#else + return stream.str(); +#endif } std::string StringFromBool(bool value);