summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormhilbrunner <m.hilbrunner@gmail.com>2017-11-07 21:55:14 +0100
committermhilbrunner <m.hilbrunner@gmail.com>2017-11-07 21:57:43 +0100
commitd5b7df852358cfc80169d7db8752ca006c44cc99 (patch)
treec2ded4178aa839e91c05609d0602aad6ce998eb2
parentb279f641c0b9e7af711d857917353905b48c6913 (diff)
Use UTF-8 for locale names. Fixes #12462.
-rw-r--r--core/translation.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/translation.cpp b/core/translation.cpp
index 058db956e5..7e4d4feb89 100644
--- a/core/translation.cpp
+++ b/core/translation.cpp
@@ -966,7 +966,7 @@ Vector<String> TranslationServer::get_all_locale_names() {
const char **ptr = locale_names;
while (*ptr) {
- locales.push_back(*ptr);
+ locales.push_back(String::utf8(*ptr));
ptr++;
}
@@ -1168,6 +1168,6 @@ TranslationServer::TranslationServer()
for (int i = 0; locale_list[i]; ++i) {
- locale_name_map.insert(locale_list[i], locale_names[i]);
+ locale_name_map.insert(locale_list[i], String::utf8(locale_names[i]));
}
}