ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue in language selection screen (improper utf-8 decoding)

Browse Source
This commit is contained in:
Marianne Gagnon
2015-10-18 19:53:20 -04:00
parent 0571db6bef
commit 1a58df0696
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/states_screens/options_screen_ui.cpp
View File

@@ -192,12 +192,13 @@ void OptionsScreenUI::init()
// The names need to be sorted alphabetically. Store the 2-letter
// language names in a mapping, to be able to get them from the
// user visible full name.
std::vector<std::string> nice_lang_list;
std::map<std::string, std::string> nice_name_2_id;
std::vector<core::stringw> nice_lang_list;
std::map<core::stringw, std::string> nice_name_2_id;
for (int n=0; n<amount; n++)
{
std::string code_name = (*lang_list)[n];
std::string nice_name = tinygettext::Language::from_name(code_name).get_name();
std::string s_name = tinygettext::Language::from_name(code_name).get_name();
core::stringw nice_name = StringUtils::utf8_to_wide(s_name.c_str());
nice_lang_list.push_back(nice_name);
nice_name_2_id[nice_name] = code_name;
}
@@ -205,7 +206,7 @@ void OptionsScreenUI::init()
for(unsigned int i=0; i<nice_lang_list.size(); i++)
{
list_widget->addItem(nice_name_2_id[nice_lang_list[i]],
nice_lang_list[i].c_str());
nice_lang_list[i]);
}
list_widget->setSelectionID( list_widget->getItemID(UserConfigParams::m_language) );