Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- language order sorted by english filename

Browse Source
This commit is contained in:
Mark Vejvoda 2011-12-01 00:20:14 +00:00
parent 6937785f22
commit 8ccd238fcf
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/glest_game/global/lang.cpp
View File

@ -372,20 +372,15 @@ pair<string,string> Lang::getNavtiveNameFromLanguageName(string langName) {
//printf("looking for language [%s]\n",langName.c_str()); //printf("looking for language [%s]\n",langName.c_str());
map<string,string> nativeList = Lang::getDiscoveredLanguageList(); map<string,string> nativeList = Lang::getDiscoveredLanguageList(true);
for(map<string,string>::iterator iterMap = nativeList.begin(); map<string,string>::iterator iterMap = nativeList.find(langName);
iterMap != nativeList.end(); ++iterMap) { if(iterMap != nativeList.end()) {
//printf("language [%s][%s]\n",iterMap->second.c_str(), iterMap->first.c_str()); result = make_pair(iterMap->second,iterMap->first);
if(iterMap->second == langName) {
result = make_pair(iterMap->first,iterMap->second);
break;
}
} }
return result; return result;
} }
map<string,string> Lang::getDiscoveredLanguageList() { map<string,string> Lang::getDiscoveredLanguageList(bool searchKeyIsLangName) {
map<string,string> result; map<string,string> result;
string data_path = getGameReadWritePath(GameConstants::path_data_CacheLookupKey); string data_path = getGameReadWritePath(GameConstants::path_data_CacheLookupKey);
@ -397,7 +392,12 @@ map<string,string> Lang::getDiscoveredLanguageList() {
string testLanguage = langResults[i]; string testLanguage = langResults[i];
string testLanguageFile = userDataPath + "data/lang/" + testLanguage + ".lng"; string testLanguageFile = userDataPath + "data/lang/" + testLanguage + ".lng";
string nativeName = getNativeLanguageName(testLanguage, testLanguageFile); string nativeName = getNativeLanguageName(testLanguage, testLanguageFile);
result[nativeName] = testLanguage; if(searchKeyIsLangName == false) {
result[nativeName] = testLanguage;
}
else {
result[testLanguage] = nativeName;
}
} }
vector<string> langResults2; vector<string> langResults2;
@ -412,7 +412,12 @@ map<string,string> Lang::getDiscoveredLanguageList() {
string testLanguageFile = data_path + "data/lang/" + testLanguage + ".lng"; string testLanguageFile = data_path + "data/lang/" + testLanguage + ".lng";
string nativeName = getNativeLanguageName(testLanguage, testLanguageFile); string nativeName = getNativeLanguageName(testLanguage, testLanguageFile);
result[nativeName] = testLanguage; if(searchKeyIsLangName == false) {
result[nativeName] = testLanguage;
}
else {
result[testLanguage] = nativeName;
}
} }
} }

2
source/glest_game/global/lang.h
View File

@ -55,7 +55,7 @@ public:
string getLanguage() const { return language; } string getLanguage() const { return language; }
bool isLanguageLocal(string compareLanguage) const; bool isLanguageLocal(string compareLanguage) const;
bool isUTF8Language() const; bool isUTF8Language() const;
map<string,string> getDiscoveredLanguageList(); map<string,string> getDiscoveredLanguageList(bool searchKeyIsLangName=false);
pair<string,string> getNavtiveNameFromLanguageName(string langName); pair<string,string> getNavtiveNameFromLanguageName(string langName);
}; };

6
source/glest_game/menu/menu_state_options.cpp
View File

@ -308,10 +308,10 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu):
// langResults.push_back(testLanguage); // langResults.push_back(testLanguage);
// } // }
// } // }
languageList = Lang::getInstance().getDiscoveredLanguageList(); languageList = Lang::getInstance().getDiscoveredLanguageList(true);
for(map<string,string>::iterator iterMap = languageList.begin(); for(map<string,string>::iterator iterMap = languageList.begin();
iterMap != languageList.end(); ++iterMap) { iterMap != languageList.end(); ++iterMap) {
langResults.push_back(iterMap->second + "-" + iterMap->first); langResults.push_back(iterMap->first + "-" + iterMap->second);
} }
listBoxLang.setItems(langResults); listBoxLang.setItems(langResults);
@ -1005,7 +1005,7 @@ void MenuStateOptions::saveConfig(){
map<string,string>::iterator iterMap = languageList.begin(); map<string,string>::iterator iterMap = languageList.begin();
std::advance(iterMap, listBoxLang.getSelectedItemIndex()); std::advance(iterMap, listBoxLang.getSelectedItemIndex());
config.setString("Lang", iterMap->second); config.setString("Lang", iterMap->first);
lang.loadStrings(config.getString("Lang")); lang.loadStrings(config.getString("Lang"));
int index= listBoxShadows.getSelectedItemIndex(); int index= listBoxShadows.getSelectedItemIndex();