From f2027bea58c7b657875096d1be84eccd31e0d303 Mon Sep 17 00:00:00 2001 From: Titus Tscharntke Date: Sun, 2 Sep 2012 19:33:32 +0000 Subject: [PATCH] Default Language is always used as fallback, just a console message is given about missing strings. Lets see if this is what we want... --- source/glest_game/global/lang.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/glest_game/global/lang.cpp b/source/glest_game/global/lang.cpp index e99bf580..ac49f78f 100644 --- a/source/glest_game/global/lang.cpp +++ b/source/glest_game/global/lang.cpp @@ -408,7 +408,9 @@ string Lang::get(const string &s, string uselanguage, bool fallbackToDefault) { } //printf("#2 fallbackToDefault = %d [%s] uselanguage [%s] DEFAULT_LANGUAGE [%s] this->language [%s]\n",fallbackToDefault,s.c_str(),uselanguage.c_str(),DEFAULT_LANGUAGE,this->language.c_str()); - if(fallbackToDefault == true && uselanguage != DEFAULT_LANGUAGE && this->language != DEFAULT_LANGUAGE) { + + //if(fallbackToDefault == true && uselanguage != DEFAULT_LANGUAGE && this->language != DEFAULT_LANGUAGE) { + if( uselanguage != DEFAULT_LANGUAGE && this->language != DEFAULT_LANGUAGE) { return get(s, DEFAULT_LANGUAGE, false); }