r7237 - packages/trunk/pixbros/debian/patches

[Miriam Ruiz]

Author: miriam
Date: 2008-06-06 08:30:45 +0000 (Fri, 06 Jun 2008)
New Revision: 7237

Added:
   packages/trunk/pixbros/debian/patches/fix_i18m.patch
Modified:
   packages/trunk/pixbros/debian/patches/directories.patch
   packages/trunk/pixbros/debian/patches/series
Log:
Fixed i18n problems



Modified: packages/trunk/pixbros/debian/patches/directories.patch
===================================================================
--- packages/trunk/pixbros/debian/patches/directories.patch	2008-06-06 07:53:28 UTC (rev 7236)
+++ packages/trunk/pixbros/debian/patches/directories.patch	2008-06-06 08:30:45 UTC (rev 7237)
@@ -3,8 +3,8 @@
 
 Index: pixbros-0.6.1/src/pixbros.prg
 ===================================================================
---- pixbros-0.6.1.orig/src/pixbros.prg	2008-06-06 07:54:07.000000000 +0000
-+++ pixbros-0.6.1/src/pixbros.prg	2008-06-06 07:54:27.000000000 +0000
+--- pixbros-0.6.1.orig/src/pixbros.prg	2008-06-06 08:15:14.000000000 +0000
++++ pixbros-0.6.1/src/pixbros.prg	2008-06-06 08:20:25.000000000 +0000
 @@ -152,19 +152,19 @@
  		end
  	end
@@ -38,3 +38,29 @@
  	carga_sonidos();
  	frame;
  	set_center(fpg_pix,8,26,33);
+Index: pixbros-0.6.1/src/menu.pr-
+===================================================================
+--- pixbros-0.6.1.orig/src/menu.pr-	2008-06-06 08:20:38.000000000 +0000
++++ pixbros-0.6.1/src/menu.pr-	2008-06-06 08:21:42.000000000 +0000
+@@ -720,8 +720,8 @@
+ 			case "fr": ops.lenguaje=1; lang_suffix="es"; end
+ 		end
+ 
+-		fpg_menu2=load_fpg("fpg/menu-"+lang_suffix+".fpg");
+-		fpg_intro=load_fpg("fpg/intro-"+lang_suffix+".fpg");
++		fpg_menu2=load_fpg("/usr/share/games/pixbros/fpg/menu-"+lang_suffix+".fpg");
++		fpg_intro=load_fpg("/usr/share/games/pixbros/fpg/intro-"+lang_suffix+".fpg");
+ 		let_me_alone();
+ 		logo_pixjuegos();	
+ 		return;
+@@ -734,8 +734,8 @@
+ 				if(elecc==2) ops.lenguaje=2; lang_suffix="it"; end
+ 				if(elecc==3) ops.lenguaje=3; lang_suffix="de"; end
+ 				if(elecc==4) ops.lenguaje=4; lang_suffix="fr"; end
+-				fpg_menu2=load_fpg("fpg/menu-"+lang_suffix+".fpg");
+-				fpg_intro=load_fpg("fpg/intro-"+lang_suffix+".fpg");
++				fpg_menu2=load_fpg("/usr/share/games/pixbros/fpg/menu-"+lang_suffix+".fpg");
++				fpg_intro=load_fpg("/usr/share/games/pixbros/fpg/intro-"+lang_suffix+".fpg");
+ 				let_me_alone();
+ 				logo_pixjuegos();	
+ 				tecenter=1;

Added: packages/trunk/pixbros/debian/patches/fix_i18m.patch
===================================================================
--- packages/trunk/pixbros/debian/patches/fix_i18m.patch	                        (rev 0)
+++ packages/trunk/pixbros/debian/patches/fix_i18m.patch	2008-06-06 08:30:45 UTC (rev 7237)
@@ -0,0 +1,56 @@
+Index: pixbros-0.6.1/src/menu.pr-
+===================================================================
+--- pixbros-0.6.1.orig/src/menu.pr-	2008-06-06 08:29:53.000000000 +0000
++++ pixbros-0.6.1/src/menu.pr-	2008-06-06 08:29:53.000000000 +0000
+@@ -715,9 +715,9 @@
+ 		ops.lenguaje=0; lang_suffix="en";
+ 		switch(lenguajelinux)
+ 			case "es": ops.lenguaje=1; lang_suffix="es"; end
+-			case "it": ops.lenguaje=1; lang_suffix="es"; end
+-			case "de": ops.lenguaje=1; lang_suffix="es"; end
+-			case "fr": ops.lenguaje=1; lang_suffix="es"; end
++			case "it": ops.lenguaje=2; lang_suffix="it"; end
++			case "de": ops.lenguaje=3; lang_suffix="de"; end
++			case "fr": ops.lenguaje=4; lang_suffix="fr"; end
+ 		end
+ 
+ 		fpg_menu2=load_fpg("/usr/share/games/pixbros/fpg/menu-"+lang_suffix+".fpg");
+Index: pixbros-0.6.1/src/pixbros.prg
+===================================================================
+--- pixbros-0.6.1.orig/src/pixbros.prg	2008-06-06 08:29:53.000000000 +0000
++++ pixbros-0.6.1/src/pixbros.prg	2008-06-06 08:30:42.000000000 +0000
+@@ -99,6 +99,7 @@
+ 	i;
+ 	duracion;
+ 	tipo;
++	string env_lang;
+ Begin
+ 	if(fxi_os==0) //windows
+ 		savegamedir=getenv("APPDATA")+developerpath;
+@@ -116,6 +117,17 @@
+ 		load(savegamedir+"opciones.dat",ops);
+ 		full_screen=!ops.ventana;
+ 	end
++	if(fxi_os==1) 
++		env_lang=getenv("LANG");
++		env_lang=env_lang[0]+env_lang[1];
++		ops.lenguaje=0; lang_suffix="en";
++		switch(env_lang)
++			case "es": ops.lenguaje=1; lang_suffix="es"; end
++			case "it": ops.lenguaje=2; lang_suffix="it"; end
++			case "de": ops.lenguaje=3; lang_suffix="de"; end
++			case "fr": ops.lenguaje=4; lang_suffix="fr"; end
++		end
++	end
+ 	switch(ops.lenguaje)
+ 		case 0:	lang_suffix="en"; end
+ 		case 1:	lang_suffix="es"; end
+@@ -171,7 +183,7 @@
+ 	set_center(fpg_pux,8,26,33);
+ 	set_center(fpg_pax,8,26,33);
+ 	if(ops.lenguaje==100)
+-		elige_lenguaje(); 
++		elige_lenguaje();
+ 		signal(id,s_kill);
+ 	end
+ 	logo_pixjuegos();

Modified: packages/trunk/pixbros/debian/patches/series
===================================================================
--- packages/trunk/pixbros/debian/patches/series	2008-06-06 07:53:28 UTC (rev 7236)
+++ packages/trunk/pixbros/debian/patches/series	2008-06-06 08:30:45 UTC (rev 7237)
@@ -1,3 +1,4 @@
 build.patch
 directories.patch
 browser.patch
+fix_i18m.patch