From 1e9e63ad9fc8166397b8f5dfb11f024f249c96ad Mon Sep 17 00:00:00 2001
From: Moises Arcos <marcos@emergya.com>
Date: Fri, 24 Feb 2012 09:16:12 +0100
Subject: [PATCH] Add new ordinals array to turn instructions
 internationalized.

---
 DataStructures/TurnInstructions.h | 22 +++++-----------------
 DataStructures/languages/EN_EN    | 11 +++++++++++
 DataStructures/languages/ES_ES    | 11 +++++++++++
 DataStructures/languages/fr       | 12 +++++++++++-
 4 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/DataStructures/TurnInstructions.h b/DataStructures/TurnInstructions.h
index e9fbc1bb9..db3870691 100644
--- a/DataStructures/TurnInstructions.h
+++ b/DataStructures/TurnInstructions.h
@@ -53,8 +53,6 @@ struct TurnInstructionsClass {
 
     //This is a hack until c++0x is available enough to use initializer lists.
     TurnInstructionsClass(string nameFile){
-	// Ahora mismo la ruta estñá puesta de manera manual
-	//char nameFile[] = "/home/usuario/workspace/Project-OSRM/DataStructures/languages/ES_ES.txt";
         // Declare an input file stream
 	ifstream fread;
 	// Open a file for only read
@@ -70,27 +68,17 @@ struct TurnInstructionsClass {
 	int i = 0;
 	while (!fread.eof()){
 		/* Write the result in an array */
+		std::string str(buffer);
 		if(i<15){
-			std::string str(buffer);
-			TurnStrings[i] = str;
-			i++;
+			TurnStrings[i] = str;	
+		}else if(i>=15 && i<26){
+			Ordinals[i-15] = str;	
 		}
 		/* Read the next line */
+		i++;
 		fread.getline(buffer, 128);
 	}
 	fread.close();
-
-        Ordinals[0]     = "zeroth";
-        Ordinals[1]     = "first";
-        Ordinals[2]     = "second";
-        Ordinals[3]     = "third";
-        Ordinals[4]     = "fourth";
-        Ordinals[5]     = "fifth";
-        Ordinals[6]     = "sixth";
-        Ordinals[7]     = "seventh";
-        Ordinals[8]     = "eighth";
-        Ordinals[9]     = "nineth";
-        Ordinals[10]     = "tenth";
     };
 
     static inline double GetTurnDirectionOfInstruction( const double angle ) {
diff --git a/DataStructures/languages/EN_EN b/DataStructures/languages/EN_EN
index ef244e42f..c66ac6bc9 100644
--- a/DataStructures/languages/EN_EN
+++ b/DataStructures/languages/EN_EN
@@ -13,3 +13,14 @@ Enter round-about
 Leave round-about
 Stay on round-about
 Start
+zeroth
+first
+second
+third
+fourth
+fifth
+sixth
+seventh
+eighth
+nineth
+tenth
diff --git a/DataStructures/languages/ES_ES b/DataStructures/languages/ES_ES
index 57e760f32..157518265 100644
--- a/DataStructures/languages/ES_ES
+++ b/DataStructures/languages/ES_ES
@@ -13,3 +13,14 @@ Introduzca rotonda
 Deja rotonda
 Permanezca en rotonda
 Comenzar
+cero
+primero
+segundo
+tercero
+cuarto
+quinto
+sexto
+séptimo
+octavo
+noveno
+décimo
diff --git a/DataStructures/languages/fr b/DataStructures/languages/fr
index f3cefa697..f619327bc 100644
--- a/DataStructures/languages/fr
+++ b/DataStructures/languages/fr
@@ -13,4 +13,14 @@ Entrez rond-point
 Laissez rond-point
 Rester sur rond-point
 Commencer
-
+zéro
+première
+deuxième
+troisième
+quatrième
+cinquième
+sixième
+septième
+huitième
+neuvième
+dixième