gbrainy r428 - in trunk/src: . MemoryGames PuzzleGames

[jmas svn gnome org]

Author: jmas
Date: Tue Aug 19 20:02:49 2008
New Revision: 428
URL: http://svn.gnome.org/viewvc/gbrainy?rev=428&view=rev

Log:
2008-08-19 Jordi Mas <jmas softcatala org>

	* PuzzleGames/PuzzleOstracism.cs: Configurable answers
	* MemoryGames/MemoryFiguresNumbers.cs: Remove unnecessary spaces
	* PuzzleGames/PuzzleLargerShape.cs: Remove unnecessary spaces
	* GameDrawingArea.cs: Make message more clear



Modified:
   trunk/src/ChangeLog
   trunk/src/GameDrawingArea.cs
   trunk/src/MemoryGames/MemoryFiguresNumbers.cs
   trunk/src/PuzzleGames/PuzzleLargerShape.cs
   trunk/src/PuzzleGames/PuzzleOstracism.cs

Modified: trunk/src/GameDrawingArea.cs
==============================================================================
--- trunk/src/GameDrawingArea.cs	(original)
+++ trunk/src/GameDrawingArea.cs	Tue Aug 19 20:02:49 2008
@@ -399,8 +399,8 @@
 			return Catalog.GetString ("Do all the problems, even the difficult ones. Improvement comes from practising.");
 		case 6:
 			return Catalog.GetString ("Play on a daily basis, you will notice progress soon.");
-		case 7:
-			return Catalog.GetString ("Use the Custom Game Selection to choose exactly which games you want to play.");
+		case 7: // Translators: Custom Game Selection is a menu option
+			return Catalog.GetString ("Use the 'Custom Game Selection' to choose exactly which games you want to play.");
 		case 8:
 			return Catalog.GetString ("Use the Settings to adjust the difficulty level of the game.");
 		case 9:

Modified: trunk/src/MemoryGames/MemoryFiguresNumbers.cs
==============================================================================
--- trunk/src/MemoryGames/MemoryFiguresNumbers.cs	(original)
+++ trunk/src/MemoryGames/MemoryFiguresNumbers.cs	Tue Aug 19 20:02:49 2008
@@ -38,7 +38,7 @@
 
 	public override string MemoryQuestion {
 		get { return String.Format (
-			Catalog.GetString ("Which one of these squares was previously shown?  Answer {0}, {1}, {2} or {3}."),
+			Catalog.GetString ("Which one of these squares was previously shown? Answer {0}, {1}, {2} or {3}."),
 			GetPossibleAnswer (0), GetPossibleAnswer (1), GetPossibleAnswer (2), GetPossibleAnswer (3));}
 	}
 

Modified: trunk/src/PuzzleGames/PuzzleLargerShape.cs
==============================================================================
--- trunk/src/PuzzleGames/PuzzleLargerShape.cs	(original)
+++ trunk/src/PuzzleGames/PuzzleLargerShape.cs	Tue Aug 19 20:02:49 2008
@@ -112,7 +112,7 @@
 
 	public override string Question {
 		get {return String.Format (
-			Catalog.GetString ("Which larger shape can you make combining the first two figures?  Answer {0}, {1}, {2} or {3}."),
+			Catalog.GetString ("Which larger shape can you make combining the first two figures? Answer {0}, {1}, {2} or {3}."),
 			GetPossibleAnswer (0), GetPossibleAnswer (1), GetPossibleAnswer (2), GetPossibleAnswer (3));}
 	}
 

Modified: trunk/src/PuzzleGames/PuzzleOstracism.cs
==============================================================================
--- trunk/src/PuzzleGames/PuzzleOstracism.cs	(original)
+++ trunk/src/PuzzleGames/PuzzleOstracism.cs	Tue Aug 19 20:02:49 2008
@@ -39,7 +39,9 @@
 	}
 
 	public override string Question {
-		get {return Catalog.GetString ("Which equation does not belong to the group? Answer A, B, C, D or E.");} 
+		get {return String.Format (
+			Catalog.GetString ("Which equation does not belong to the group? Answer {0}, {1}, {2}, {3} or {4}."),
+			GetPossibleAnswer (0), GetPossibleAnswer (1), GetPossibleAnswer (2), GetPossibleAnswer (3), GetPossibleAnswer (4));}
 	}
 
 
@@ -64,7 +66,7 @@
 		for (int i = 0; i < random_indices.Count; i++)
 		{
 			if (random_indices[i] == wrong_answer) {
-				right_answer += ((char) (65 + i));
+				right_answer = GetPossibleAnswer (i);
 				break;
 			}
 		}
@@ -80,7 +82,7 @@
 		for (int i = 0; i < random_indices.Count; i++)
 		{
 			gr.MoveTo (x, y);
-			gr.ShowPangoText (((char)( 65 + i)) + ") " +  equations [random_indices[i]]);
+			gr.ShowPangoText (String.Format ("{0}) {1}", GetPossibleAnswer (i), equations [random_indices[i]]));
 			y += 0.1;
 		}
 	}