[gbrainy] Fixes related bugzilla bugs #631419, #631421 and #631426



commit 1e5e1b20ef6a046020b6ce9c554d8d4d1e279cce
Author: Jordi Mas <jmas softcatala org>
Date:   Tue Oct 5 23:09:16 2010 +0200

    Fixes related bugzilla bugs #631419, #631421 and #631426

 .../Classical/Dialogs/PlayerHistoryDialog.cs       |    2 +-
 src/Games/Logic/PuzzleDivideCircle.cs              |   13 ++++++++++---
 src/Games/Memory/MemoryFacts.cs                    |    4 +++-
 3 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/src/Clients/Classical/Dialogs/PlayerHistoryDialog.cs b/src/Clients/Classical/Dialogs/PlayerHistoryDialog.cs
index 177fdbd..105b379 100644
--- a/src/Clients/Classical/Dialogs/PlayerHistoryDialog.cs
+++ b/src/Clients/Classical/Dialogs/PlayerHistoryDialog.cs
@@ -42,7 +42,7 @@ namespace gbrainy.Clients.Classical
 		{
 			string label;
 
-			label = Catalog.GetString ("The graph below shows the player's game score evolution. ");
+			label = Catalog.GetString ("The graph below shows the player's game score evolution.") + " ";
 
 			if (history.Games.Count < 2)
 			{
diff --git a/src/Games/Logic/PuzzleDivideCircle.cs b/src/Games/Logic/PuzzleDivideCircle.cs
index 0597c5f..ff07f65 100644
--- a/src/Games/Logic/PuzzleDivideCircle.cs
+++ b/src/Games/Logic/PuzzleDivideCircle.cs
@@ -110,7 +110,7 @@ namespace gbrainy.Games.Logic
 				}, true);
 
 			gr.MoveTo (pos_x, pos_y + figure_size * 2 + 0.05);
-			gr.ShowPangoText (String.Format (Catalog.GetString ("Has {0} regions"), 2));
+			gr.ShowPangoText (HasNRegionString (2));
 			gr.Stroke ();
 
 			// Second circle
@@ -125,7 +125,7 @@ namespace gbrainy.Games.Logic
 				}, true);
 
 			gr.MoveTo (pos_x, pos_y + figure_size * 2 + 0.05);
-			gr.ShowPangoText (String.Format (Catalog.GetString ("Has {0} regions"), 4));
+			gr.ShowPangoText (HasNRegionString (4));
 			gr.Stroke ();
 
 			// Third circle
@@ -142,7 +142,7 @@ namespace gbrainy.Games.Logic
 				}, true);
 
 			gr.MoveTo (pos_x, pos_y + figure_size * 2 + 0.05);
-			gr.ShowPangoText (String.Format (Catalog.GetString ("Has {0} regions"), 8));
+			gr.ShowPangoText (HasNRegionString (8));
 			gr.Stroke ();
 
 			switch (dots) {
@@ -173,5 +173,12 @@ namespace gbrainy.Games.Logic
 			gr.Stroke ();		
 			DrawAndConnectPoints (gr, pos_x, pos_y, circles, DrawAnswer);
 		}
+		
+		string HasNRegionString (int regions)
+		{
+			return String.Format (Catalog.GetPluralString ("Has {0} region", 
+				"Has {0} regions", regions), regions);
+			
+		}
 	}
 }
diff --git a/src/Games/Memory/MemoryFacts.cs b/src/Games/Memory/MemoryFacts.cs
index 5886d6a..8b12903 100644
--- a/src/Games/Memory/MemoryFacts.cs
+++ b/src/Games/Memory/MemoryFacts.cs
@@ -105,7 +105,9 @@ namespace gbrainy.Games.Memory
 				fact.answers [1] = 1914 + random.Next (50);
 				fact.fact = String.Format (
 					// Translators: {0} is replaced by a number, {1} by a year (like 1940)
-					Catalog.GetString ("Shiny Cars had already announced a {0} days production halt next month, but before that it had not cut production since {1}."),
+					Catalog.GetPluralString ("Shiny Cars had already announced a {0} day production halt next month, but before that it had not cut production since {1}.",
+					"Shiny Cars had already announced a {0} days production halt next month, but before that it had not cut production since {1}.",
+					fact.answers [0]),
 					fact.answers [0], fact.answers [1]);
 				fact.questions [0] = Catalog.GetString ("For how many days did Shiny Cars halt its production?");
 				fact.questions [1] = Catalog.GetString ("In what year did Shiny Cars last halt its production?");



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]