popup language menu now shows native and english version of language name
This commit is contained in:
parent
c04a73017c
commit
7011d49868
|
@ -858,8 +858,22 @@ void MainWindow::eventMouseDown(int x, int y, MouseButton mouseButton){
|
||||||
// Exit game
|
// Exit game
|
||||||
if(result.first != cancelLanguageSelection) {
|
if(result.first != cancelLanguageSelection) {
|
||||||
//toggleLanguage(result.second);
|
//toggleLanguage(result.second);
|
||||||
|
//this->triggerLanguageToggle = true;
|
||||||
|
//this->triggerLanguage = result.second;
|
||||||
|
|
||||||
|
Lang &lang= Lang::getInstance();
|
||||||
|
map<string,string> languageList = lang.getDiscoveredLanguageList(true);
|
||||||
|
for(map<string,string>::iterator iterMap = languageList.begin();
|
||||||
|
iterMap != languageList.end(); ++iterMap) {
|
||||||
|
string matchLanguage = iterMap->first + "-" + iterMap->second;
|
||||||
|
if(matchLanguage == result.second) {
|
||||||
this->triggerLanguageToggle = true;
|
this->triggerLanguageToggle = true;
|
||||||
this->triggerLanguage = result.second;
|
this->triggerLanguage = iterMap->first;
|
||||||
|
//printf("Switching to lang [%s] [%s] [%s]\n",this->triggerLanguage.c_str(),iterMap->first.c_str(), iterMap->second.c_str());
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
@ -1028,8 +1042,9 @@ void MainWindow::render() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::showLanguages() {
|
void MainWindow::showLanguages() {
|
||||||
|
|
||||||
|
/*
|
||||||
Lang &lang= Lang::getInstance();
|
Lang &lang= Lang::getInstance();
|
||||||
//PopupMenu popupMenu;
|
|
||||||
std::vector<string> menuItems;
|
std::vector<string> menuItems;
|
||||||
|
|
||||||
vector<string> langResults;
|
vector<string> langResults;
|
||||||
|
@ -1056,6 +1071,24 @@ void MainWindow::showLanguages() {
|
||||||
menuItems.push_back(lang.getString("Exit"));
|
menuItems.push_back(lang.getString("Exit"));
|
||||||
cancelLanguageSelection = menuItems.size()-1;
|
cancelLanguageSelection = menuItems.size()-1;
|
||||||
|
|
||||||
|
popupMenu.setW(100);
|
||||||
|
popupMenu.setH(100);
|
||||||
|
popupMenu.init(lang.getString("GameMenuTitle"),menuItems);
|
||||||
|
popupMenu.setEnabled(true);
|
||||||
|
popupMenu.setVisible(true);
|
||||||
|
*/
|
||||||
|
|
||||||
|
Lang &lang= Lang::getInstance();
|
||||||
|
std::vector<string> menuItems;
|
||||||
|
map<string,string> languageList = lang.getDiscoveredLanguageList(true);
|
||||||
|
for(map<string,string>::iterator iterMap = languageList.begin();
|
||||||
|
iterMap != languageList.end(); ++iterMap) {
|
||||||
|
menuItems.push_back(iterMap->first + "-" + iterMap->second);
|
||||||
|
}
|
||||||
|
|
||||||
|
menuItems.push_back(lang.getString("Exit"));
|
||||||
|
cancelLanguageSelection = menuItems.size()-1;
|
||||||
|
|
||||||
popupMenu.setW(100);
|
popupMenu.setW(100);
|
||||||
popupMenu.setH(100);
|
popupMenu.setH(100);
|
||||||
popupMenu.init(lang.getString("GameMenuTitle"),menuItems);
|
popupMenu.init(lang.getString("GameMenuTitle"),menuItems);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user