[Wesnoth-cvs-commits] wesnoth/src game.cpp

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    04/09/19 16:12:08

Modified files:
        src            : game.cpp 

Log message:
        set language before reading config files, to allow things in game.cfg 
to get translated (incomplete hack)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.136&tr2=1.137&r1=text&r2=text

Patches:
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.136 wesnoth/src/game.cpp:1.137
--- wesnoth/src/game.cpp:1.136  Sun Sep 19 10:00:07 2004
+++ wesnoth/src/game.cpp        Sun Sep 19 16:12:08 2004
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.136 2004/09/19 10:00:07 silene Exp $ */
+/* $Id: game.cpp,v 1.137 2004/09/19 16:12:08 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1344,7 +1344,7 @@
        SDL_EventState(SDL_SYSWMEVENT, SDL_ENABLE);
 #endif
 
-       res = game.init_config() && game.init_language();
+       res = game.init_language() && game.init_config();
        if(res == false) {
                return 0;
        }
@@ -1418,6 +1418,7 @@
 int main(int argc, char** argv)
 {
        // setup locale first so that early error messages can get localized
+       // but this does not take GUI language setting into account
        setlocale (LC_ALL, "");
 
        const std::string& intl_dir = get_intl_dir();