summaryrefslogtreecommitdiff
path: root/src/gettext.cpp
diff options
context:
space:
mode:
authorest31 <MTest31@outlook.com>2015-07-07 05:55:07 +0200
committerest31 <MTest31@outlook.com>2015-07-08 10:12:44 +0200
commitb0784ba87168e24b0533fc8718a0157cda5ea405 (patch)
tree24ca04bbfe2a13193400493e1bde5e520c589e03 /src/gettext.cpp
parente234d8b3786d5adfbdf3d1a2123c3e8d91c21880 (diff)
downloadminetest-b0784ba87168e24b0533fc8718a0157cda5ea405.tar.gz
minetest-b0784ba87168e24b0533fc8718a0157cda5ea405.tar.bz2
minetest-b0784ba87168e24b0533fc8718a0157cda5ea405.zip
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.
Diffstat (limited to 'src/gettext.cpp')
-rw-r--r--src/gettext.cpp5
1 files changed, 3 insertions, 2 deletions
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();
}