chronojump r384 - in trunk: . build/data build/data/locale/ca/LC_MESSAGES build/data/locale/es/LC_MESSAGES po src src/gui

[xaviblas svn gnome org]

Author: xaviblas
Date: Sat May 10 20:46:42 2008
New Revision: 384
URL: http://svn.gnome.org/viewvc/chronojump?rev=384&view=rev

Log:
improved translating of sport stuff at load session
updated catalan translation
updated spanish translation


Modified:
   trunk/build/data/chronojump.prg
   trunk/build/data/chronojump_mini.prg
   trunk/build/data/locale/ca/LC_MESSAGES/chronojump.mo
   trunk/build/data/locale/es/LC_MESSAGES/chronojump.mo
   trunk/changelog.txt
   trunk/howto_translate.txt
   trunk/po/ChangeLog
   trunk/po/ca.po
   trunk/po/es.po
   trunk/src/constants.cs
   trunk/src/gui/session.cs

Modified: trunk/build/data/chronojump.prg
==============================================================================
Binary files. No diff available.

Modified: trunk/build/data/chronojump_mini.prg
==============================================================================
Binary files. No diff available.

Modified: trunk/build/data/locale/ca/LC_MESSAGES/chronojump.mo
==============================================================================
Binary files. No diff available.

Modified: trunk/build/data/locale/es/LC_MESSAGES/chronojump.mo
==============================================================================
Binary files. No diff available.

Modified: trunk/changelog.txt
==============================================================================
--- trunk/changelog.txt	(original)
+++ trunk/changelog.txt	Sat May 10 20:46:42 2008
@@ -1,5 +1,10 @@
 CHRONOJUMP DETAILED CHANGELOG:
 
+10 May 2008 (2)
+	improved translating of sport stuff at load session
+	updated catalan translation
+	updated spanish translation
+
 10 May 2008
 	0.6.2.9 (0.7 pre-release)
 	db changed to 0.56

Modified: trunk/howto_translate.txt
==============================================================================
--- trunk/howto_translate.txt	(original)
+++ trunk/howto_translate.txt	Sat May 10 20:46:42 2008
@@ -31,6 +31,7 @@
 msgmerge -o ca.po ca_old.po untitled.pot
 
 5.- edit the ca.po with a multiporpose editor like vim, or a po editor like poedit
+poedit it's better because it fast finds what needs to be translated
 
 6.- generate the locales
 cd ..

Modified: trunk/src/constants.cs
==============================================================================
--- trunk/src/constants.cs	(original)
+++ trunk/src/constants.cs	Sat May 10 20:46:42 2008
@@ -226,19 +226,25 @@
 
 	public static int SportUndefinedID = 1;
 	public static string SportUndefined = "--Undefined";
+	private static string dumbVariableForTranslatingSportUndefined = Catalog.GetString("--Undefined");
 	public static int SportNoneID = 2;
 	public static string SportNone = "-None";
+	private static string dumbVariableForTranslatingSportNone = Catalog.GetString("-None");
 
 	public static int SpeciallityUndefinedID = -1;
 	public static string SpeciallityUndefined = "Undefined"; 
+	private static string dumbVariableForTranslatingSpeciallityUndefined = Catalog.GetString("Undefined");
+	
 	
 	//levels of sport practice
 	//int will go into person database
 	//string will be shown in user language
 	public static int LevelUndefinedID = -1;
 	public static string LevelUndefined = "Undefined"; 
+	private static string dumbVariableForTranslatingLevelUndefined = Catalog.GetString("Undefined");
 	public static int LevelSedentaryID = 0; 
 	public static string LevelSedentary = "Sedentary/Ocasional practice"; 
+	private static string dumbVariableForTranslatingLevelSedentary = Catalog.GetString("Sedentary/Ocasional practice");
 	public static string [] Levels = {
 		LevelUndefinedID.ToString() + ":" + Catalog.GetString(LevelUndefined), 
 		LevelSedentaryID.ToString() + ":" + Catalog.GetString(LevelSedentary), 

Modified: trunk/src/gui/session.cs
==============================================================================
--- trunk/src/gui/session.cs	(original)
+++ trunk/src/gui/session.cs	Sat May 10 20:46:42 2008
@@ -682,18 +682,27 @@
 		string [] mySessions = SqliteSession.SelectAllSessions(); //returns a string of values separated by ':'
 		foreach (string session in mySessions) {
 			string [] myStringFull = session.Split(new char[] {':'});
-				
-			string mySpeciallity = ""; //done because Undefined has "" as name and crashes with gettext
-			if (myStringFull[6] != "") 
-				mySpeciallity = Catalog.GetString(myStringFull[6])
-					;
+		
+			//don't show any text at sport, speciallity and level if it's undefined	
+			string mySport = "";
+			if (myStringFull[4] != Catalog.GetString(Constants.SportUndefined)) 
+				mySport = Catalog.GetString(myStringFull[4]);
+
+			string mySpeciallity = ""; //done also because Undefined has "" as name and crashes with gettext
+			if (myStringFull[5] != "") 
+				mySpeciallity = Catalog.GetString(myStringFull[5]);
+			
+			string myLevel = "";
+			if (myStringFull[6] != Catalog.GetString(Constants.LevelUndefined)) 
+				myLevel = Catalog.GetString(myStringFull[6]);
+
 			store.AppendValues (myStringFull[0], myStringFull[1], 
 					myStringFull[2], 
 					Util.DateAsDateTime(myStringFull[3]).ToShortDateString(),
 					myStringFull[8],	//number of jumpers x session
-					myStringFull[4],	//personsSport
-					myStringFull[5],	//personsSpeciallity
-					myStringFull[6],	//personsLevel
+					mySport,		//personsSport
+					mySpeciallity,		//personsSpeciallity
+					myLevel,		//personsLevel
 					myStringFull[9],	//number of jumps x session
 					myStringFull[10],	//number of jumpsRj x session
 					myStringFull[11], 	//number of runs x session