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

- added a default translation file for techtrees, <techtreename>_default.lng

This commit is contained in:
Mark Vejvoda 2012-05-03 14:43:28 +00:00
parent 2267011cbc
commit 0120c5211a
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,9 +260,11 @@ void Lang::loadTechTreeStrings(string techTree) {
string techTreeFolder = currentPath + techTree + "/";
string path = techTreeFolder + "lang/" + techTree + "_" + language + ".lng";
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] path = [%s]\n",__FILE__,__FUNCTION__,__LINE__,path.c_str());
string pathDefault = techTreeFolder + "lang/" + techTree + "_default.lng";
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] path = [%s] pathDefault = [%s]\n",__FILE__,__FUNCTION__,__LINE__,path.c_str(),pathDefault.c_str());
techTreeStrings.clear();
techTreeStringsDefault.clear();
//try to load the current language first
if(fileExists(path)) {
@ -279,6 +281,10 @@ void Lang::loadTechTreeStrings(string techTree) {
techTreeStrings.load(path);
}
}
if(fileExists(pathDefault)) {
techTreeStringsDefault.load(pathDefault);
}
}
bool Lang::hasString(const string &s, string uselanguage, bool fallbackToDefault) {
@ -381,7 +387,15 @@ string Lang::getTechTreeString(const string &s,const char *defaultValue) {
string result = "";
if(techTreeStrings.hasString(s) == true || defaultValue == NULL) {
result = techTreeStrings.getString(s);
if(techTreeStrings.hasString(s) == false && techTreeStringsDefault.hasString(s) == true) {
result = techTreeStringsDefault.getString(s);
}
else {
result = techTreeStrings.getString(s);
}
}
else if(techTreeStringsDefault.hasString(s) == true) {
result = techTreeStringsDefault.getString(s);
}
else if(defaultValue != NULL) {
result = defaultValue;

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

@ -38,6 +38,7 @@ private:
Properties strings;
Properties scenarioStrings;
Properties techTreeStrings;
Properties techTreeStringsDefault;
std::map<string,Properties> otherLanguageStrings;