From d5b7df852358cfc80169d7db8752ca006c44cc99 Mon Sep 17 00:00:00 2001 From: mhilbrunner Date: Tue, 7 Nov 2017 21:55:14 +0100 Subject: [PATCH] Use UTF-8 for locale names. Fixes #12462. --- core/translation.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/translation.cpp b/core/translation.cpp index 058db956e51..7e4d4feb896 100644 --- a/core/translation.cpp +++ b/core/translation.cpp @@ -966,7 +966,7 @@ Vector 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])); } }