- added missing translation strings to spanish (used bablefish for translations)

- updated exit text to support newlines in language text
- added support for netwlines in language string code
This commit is contained in:
Mark Vejvoda 2010-07-03 06:48:24 +00:00
parent 087c6c87b1
commit 66d4fce081
4 changed files with 19 additions and 1 deletions

View File

@ -72,7 +72,9 @@ void Lang::loadScenarioStrings(const string &scenarioDir, const string &scenario
string Lang::get(const string &s){
try{
return strings.getString(s);
string result = strings.getString(s);
replaceAll(result, "\\n", "\n");
return result;
}
catch(exception &){
return "???" + s + "???";

View File

@ -448,6 +448,10 @@ int glestMain(int argc, char** argv){
//throw runtime_error("test!");
//ExceptionHandler::DisplayMessage("test!", false);
//Lang &lang= Lang::getInstance();
//string test = lang.get("ExitGameServer?");
//printf("[%s]",test.c_str());
//main loop
while(Window::handleEvent()){
program->loop();

View File

@ -122,6 +122,8 @@ void restoreVideoMode(bool exitingApp=false);
bool EndsWith(const string &str, const string& key);
string replaceAll(string& context, const string& from, const string& to);
int getScreenW();
int getScreenH();

View File

@ -831,6 +831,16 @@ bool isKeyDown(int virtualKey) {
}
string replaceAll(string& context, const string& from, const string& to) {
size_t lookHere = 0;
size_t foundHere;
while((foundHere = context.find(from, lookHere)) != string::npos) {
context.replace(foundHere, from.size(), to);
lookHere = foundHere + to.size();
}
return context;
}
// =====================================
// ModeInfo
// =====================================