godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12730 from mhilbrunner/unicode 

Use UTF-8 for locale names. Fixes #12462.
This commit is contained in:
Poommetee Ketson 2017-11-08 06:35:04 +07:00 committed by GitHub
parent 1bf132f53d d5b7df8523
commit d4b19d8d83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/translation.cpp
View File

@ -966,7 +966,7 @@ Vector<String> TranslationServer::get_all_locale_names() {
const char **ptr = locale_names; const char **ptr = locale_names;
while (*ptr) { while (*ptr) {
locales.push_back(*ptr); locales.push_back(String::utf8(*ptr));
ptr++; ptr++;
} }
@ -1168,6 +1168,6 @@ TranslationServer::TranslationServer()
for (int i = 0; locale_list[i]; ++i) { 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]));
} }
} }