[Wesnoth-cvs-commits] wesnoth data/translations/english.cfg src/langu...

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    04/08/29 14:54:40

Modified files:
        data/translations: english.cfg 
        src            : language.cpp 

Log message:
        drop the font from english.cfg, fill it directly from font.cpp.  also 
drop useless strings

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/translations/english.cfg.diff?tr1=1.158&tr2=1.159&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/language.cpp.diff?tr1=1.37&tr2=1.38&r1=text&r2=text

Patches:
Index: wesnoth/data/translations/english.cfg
diff -u wesnoth/data/translations/english.cfg:1.158 
wesnoth/data/translations/english.cfg:1.159
--- wesnoth/data/translations/english.cfg:1.158 Sat Aug 28 13:51:39 2004
+++ wesnoth/data/translations/english.cfg       Sun Aug 29 14:54:39 2004
@@ -1,8 +1,4 @@
 [language]
-id=en
-language="English"
-font=_"Vera.ttf"
-
 EASY= _ "Easy"
 NORMAL= _ "Medium"
 HARD= _ "Hard"
Index: wesnoth/src/language.cpp
diff -u wesnoth/src/language.cpp:1.37 wesnoth/src/language.cpp:1.38
--- wesnoth/src/language.cpp:1.37       Sat Aug 28 21:16:17 2004
+++ wesnoth/src/language.cpp    Sun Aug 29 14:54:39 2004
@@ -1,4 +1,4 @@
-/* $Id: language.cpp,v 1.37 2004/08/28 21:16:17 gruikya Exp $ */
+/* $Id: language.cpp,v 1.38 2004/08/29 14:54:39 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -135,6 +135,7 @@
 
        current_language = locale;
        setlocale (LC_MESSAGES, locale.localename.c_str());
+       font::set_font();
 
        // fill string_table (should be moved somwhere else some day)
        try {
@@ -155,9 +156,6 @@
        }
        // end of string_table fill
 
-       // ENGLISH-CFG
-       font::set_font(string_table["font"]);
-
        return true;
 }