[Super-tux-commit] supertux/src Makefile.am,1.32,1.33 setup.cpp,1.93,1.94 supertux.cpp,1.19,1.20

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14258/src

Modified Files:
	Makefile.am setup.cpp supertux.cpp 
Log Message:
added gettext support to autoconf&others and translated the main menu to german

Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- setup.cpp	2 Jun 2004 20:54:46 -0000	1.93
+++ setup.cpp	2 Jun 2004 23:00:26 -0000	1.94
@@ -52,6 +52,7 @@
 #include "resources.h"
 #include "intro.h"
 #include "sound_manager.h"
+#include "gettext.h"
 
 #include "player.h"
 
@@ -384,12 +385,12 @@
   worldmap_menu  = new Menu();
 
   main_menu->set_pos(screen->w/2, 335);
-  main_menu->additem(MN_GOTO, "Start Game",0,load_game_menu, MNID_STARTGAME);
-  main_menu->additem(MN_GOTO, "Contrib Levels",0,contrib_menu, MNID_CONTRIB);
-  main_menu->additem(MN_GOTO, "Options",0,options_menu, MNID_OPTIONMENU);
-  main_menu->additem(MN_ACTION,"Level Editor",0,0, MNID_LEVELEDITOR);
-  main_menu->additem(MN_ACTION,"Credits",0,0, MNID_CREDITS);
-  main_menu->additem(MN_ACTION,"Quit",0,0, MNID_QUITMAINMENU);
+  main_menu->additem(MN_GOTO, _("Start Game"),0,load_game_menu, MNID_STARTGAME);
+  main_menu->additem(MN_GOTO, _("Contrib Levels"),0,contrib_menu, MNID_CONTRIB);
+  main_menu->additem(MN_GOTO, _("Options"),0,options_menu, MNID_OPTIONMENU);
+  main_menu->additem(MN_ACTION, _("Level Editor"),0,0, MNID_LEVELEDITOR);
+  main_menu->additem(MN_ACTION, _("Credits"),0,0, MNID_CREDITS);
+  main_menu->additem(MN_ACTION, _("Quit"),0,0, MNID_QUITMAINMENU);
 
   options_menu->additem(MN_LABEL,"Options",0,0);
   options_menu->additem(MN_HL,"",0,0);

Index: supertux.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/supertux.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- supertux.cpp	31 May 2004 02:40:30 -0000	1.19
+++ supertux.cpp	2 Jun 2004 23:00:26 -0000	1.20
@@ -37,12 +37,18 @@
 #include "resources.h"
 #include "screen/texture.h"
 #include "tile.h"
+#include "gettext.h"
 
 int main(int argc, char * argv[])
 {
 #ifndef DEBUG
   try {
 #endif
+    setlocale(LC_ALL, "");
+    bindtextdomain(PACKAGE, LOCALEDIR);
+    textdomain(PACKAGE);
+    bind_textdomain_codeset(PACKAGE, "ISO-8859-1");
+      
     st_directory_setup();
     parseargs(argc, argv);
 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/Makefile.am,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Makefile.am	31 May 2004 22:13:14 -0000	1.32
+++ Makefile.am	2 Jun 2004 23:00:26 -0000	1.33
@@ -1,4 +1,7 @@
+localedir = $(datadir)/locale
+
 bin_PROGRAMS = supertux
+supertux_CXXFLAGS = -DLOCALEDIR=\"$(localedir)\"
 
 supertux_SOURCES = \
 screen/drawing_context.h \