From b0784ba87168e24b0533fc8718a0157cda5ea405 Mon Sep 17 00:00:00 2001 From: est31 Date: Tue, 7 Jul 2015 05:55:07 +0200 Subject: Use UTF-8 instead of narrow Use wide_to_utf8 and utf8_to_wide instead of wide_to_narrow and narrow_to_wide at almost all places. Only exceptions: test functions for narrow conversion, and chat, which is done in a separate commit. --- src/gettext.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/gettext.cpp') diff --git a/src/gettext.cpp b/src/gettext.cpp index 509d506d4..0fd6b574e 100644 --- a/src/gettext.cpp +++ b/src/gettext.cpp @@ -102,8 +102,9 @@ const char* MSVC_LocaleLookup(const char* raw_shortname) { last_raw_value = shortname; - if (glb_supported_locales.find(narrow_to_wide(shortname)) != glb_supported_locales.end()) { - last_full_name = wide_to_narrow(glb_supported_locales[narrow_to_wide(shortname)]); + if (glb_supported_locales.find(utf8_to_wide(shortname)) != glb_supported_locales.end()) { + last_full_name = wide_to_utf8( + glb_supported_locales[utf8_to_wide(shortname)]); return last_full_name.c_str(); } -- cgit v1.2.3