zhangyiss/indicators
1
0
Fork 0
mirror of https://github.com/p-ranav/indicators.git synced 2025-12-14 03:08:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the issue where the localization information is set before the program calls the 'utf8_decode' function in the project code. After calling the 'utf8_decode' function, the restored localization information is the default setting from the user environment variables, rather than the current program's localization information. Therefore, the 'setlocale(LC_ALL, "")' call should be changed to 'setlocale(LC_ALL, NULL)' to align with the code logic.

Browse Source
This commit is contained in:
CodingRookie98
2025-01-25 14:56:42 +08:00
parent 9c855c95e7
commit c793684c9c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/indicators/display_width.hpp
View File

@@ -311,7 +311,7 @@ static inline int mk_wcswidth_cjk(const wchar_t *pwcs, size_t n) {
// convert UTF-8 string to wstring // convert UTF-8 string to wstring
#ifdef _MSC_VER #ifdef _MSC_VER
static inline std::wstring utf8_decode(const std::string& s) { static inline std::wstring utf8_decode(const std::string& s) {
auto r = setlocale(LC_ALL, ""); auto r = setlocale(LC_ALL, NULL);
std::string curLocale; std::string curLocale;
if (r) if (r)
curLocale = r; curLocale = r;
@@ -327,7 +327,7 @@ static inline std::wstring utf8_decode(const std::string& s) {
} }
#else #else
static inline std::wstring utf8_decode(const std::string& s) { static inline std::wstring utf8_decode(const std::string& s) {
auto r = setlocale(LC_ALL, ""); auto r = setlocale(LC_ALL, NULL);
std::string curLocale; std::string curLocale;
if (r) if (r)
curLocale = r; curLocale = r;