[gbrainy] Explain how to give an answer + use standard math variables

[Jordi Mas <jmas src gnome org>]

commit 163030712993a7b15025783671993a5a5bc4dddf
Author: Jordi Mas <jmas softcatala org>
Date:   Thu Jun 17 20:55:04 2010 +0200

    Explain how to give an answer + use standard math variables

 src/Games/Calculation/CalculationRatio.cs      |    4 ++--
 src/Games/Calculation/CalculationTwoNumbers.cs |   17 +++++++----------
 2 files changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/src/Games/Calculation/CalculationRatio.cs b/src/Games/Calculation/CalculationRatio.cs
index bff61f5..9995e26 100644
--- a/src/Games/Calculation/CalculationRatio.cs
+++ b/src/Games/Calculation/CalculationRatio.cs
@@ -41,7 +41,7 @@ namespace gbrainy.Games.Calculation
 		public override string Question {
 			get {
 				return String.Format (
-					Catalog.GetString ("Two numbers sum {0} and have a ratio of {1} to {2}. Which are these numbers?"), 
+					Catalog.GetString ("Two numbers sum {0} and have a ratio of {1} to {2}. Which are these numbers? Answer using two numbers (e.g.: 1 and 2)."), 
 					number_a + number_b, ratio_a, ratio_b);
 			}
 		}
@@ -107,7 +107,7 @@ namespace gbrainy.Games.Calculation
 			gr.SetPangoLargeFontSize ();
 
 			gr.MoveTo (x, DrawAreaY + 0.22);
-			gr.ShowPangoText (String.Format (Catalog.GetString ("number1 + number2 = {0}"), number_a + number_b));
+			gr.ShowPangoText (String.Format (Catalog.GetString ("x + y = {0}"), number_a + number_b));
 		
 			gr.MoveTo (x, DrawAreaY + 0.44);
 			gr.ShowPangoText (String.Format (Catalog.GetString ("have a ratio of {0}:{1}"), ratio_a, ratio_b));
diff --git a/src/Games/Calculation/CalculationTwoNumbers.cs b/src/Games/Calculation/CalculationTwoNumbers.cs
index 61ea8a5..bc177e1 100644
--- a/src/Games/Calculation/CalculationTwoNumbers.cs
+++ b/src/Games/Calculation/CalculationTwoNumbers.cs
@@ -51,10 +51,9 @@ namespace gbrainy.Games.Calculation
 			get {
 				switch (type) {
 				case SubGameTypes.Addition:
-					return String.Format (Catalog.GetString ("Which two numbers when added are {0} and when multiplied are {1}?"), op1, op2);
-
+					return String.Format (Catalog.GetString ("Which two numbers when added are {0} and when multiplied are {1}? Answer using two numbers (e.g.: 1 and 2)."), op1, op2);
 				case SubGameTypes.Subtraction:
-					return String.Format (Catalog.GetString ("Which two numbers when subtracted are {0} and when multiplied are {1}?"), op1, op2);
+					return String.Format (Catalog.GetString ("Which two numbers when subtracted are {0} and when multiplied are {1}? Answer using two numbers (e.g.: 1 and 2)."), op1, op2);
 				default:
 					throw new InvalidOperationException ();
 				}
@@ -115,28 +114,26 @@ namespace gbrainy.Games.Calculation
 
 		public override void Draw (CairoContextEx gr, int area_width, int area_height, bool rtl)
 		{	
-			double x = DrawAreaX + 0.1;
+			double x = DrawAreaX + 0.25;
 
 			base.Draw (gr, area_width, area_height, rtl);
 
 			gr.SetPangoLargeFontSize ();
-
 			gr.MoveTo (x, DrawAreaY + 0.22);
 
 			switch (type) {
 			case SubGameTypes.Addition:
-				gr.ShowPangoText (String.Format (Catalog.GetString ("number1 + number2 = {0}"), op1));
+				gr.ShowPangoText (String.Format (Catalog.GetString ("x + y = {0}"), op1));
 				break;
 			case SubGameTypes.Subtraction:
-				gr.ShowPangoText (String.Format (Catalog.GetString ("number1 - number2 = {0}"), op1));
+				gr.ShowPangoText (String.Format (Catalog.GetString ("x - y = {0}"), op1));
 				break;
 			default:
 				throw new InvalidOperationException ();
 			}
-		
+
 			gr.MoveTo (x, DrawAreaY + 0.44);
-			gr.ShowPangoText (String.Format (Catalog.GetString ("number1 * number2 = {0}"), op2));
+			gr.ShowPangoText (String.Format (Catalog.GetString ("x * y = {0}"), op2));
 		}
-
 	}
 }