Use numeric ordinals (#68)

freenerd · web-flow · commit 596564a20b48 · 2016-11-08T12:54:28.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file. For change
 - put future changes here
 - Run tests per language via LANGUAGE=de npm test
 - Shorter merge instructions (Merge slightly left -> Merge left)
+- Numeric ordinals (1st, 2nd) instead of word ordinals (first, second)
 
 # 0.0.5 2016-10-26
 
diff --git a/instructions/en.json b/instructions/en.json
@@ -5,16 +5,16 @@
     "v5": {
         "constants": {
             "ordinalize": {
-                "1": "first",
-                "2": "second",
-                "3": "third",
-                "4": "fourth",
-                "5": "fifth",
-                "6": "sixth",
-                "7": "seventh",
-                "8": "eighth",
-                "9": "ninth",
-                "10": "tenth"
+                "1": "1st",
+                "2": "2nd",
+                "3": "3rd",
+                "4": "4th",
+                "5": "5th",
+                "6": "6th",
+                "7": "7th",
+                "8": "8th",
+                "9": "9th",
+                "10": "10th"
             },
             "direction": {
                 "north": "north",
diff --git a/test/fixtures/v5/rotary/exit_10.json b/test/fixtures/v5/rotary/exit_10.json
@@ -7,5 +7,5 @@
         },
         "name": ""
     },
-    "instruction": "Enter the rotary and take the tenth exit"
+    "instruction": "Enter the rotary and take the 10th exit"
 }
diff --git a/test/fixtures/v5/rotary/exit_1_default.json b/test/fixtures/v5/rotary/exit_1_default.json
@@ -7,5 +7,5 @@
         },
         "name": ""
     },
-    "instruction": "Enter the rotary and take the first exit"
+    "instruction": "Enter the rotary and take the 1st exit"
 }
diff --git a/test/fixtures/v5/rotary/exit_1_destination.json b/test/fixtures/v5/rotary/exit_1_destination.json
@@ -8,5 +8,5 @@
         "name": "Way Name",
         "destinations": "Destination 1,Destination 2"
     },
-    "instruction": "Enter the rotary and take the first exit towards Destination 1"
+    "instruction": "Enter the rotary and take the 1st exit towards Destination 1"
 }
diff --git a/test/fixtures/v5/rotary/exit_1_name.json b/test/fixtures/v5/rotary/exit_1_name.json
@@ -7,5 +7,5 @@
         },
         "name": "Way Name"
     },
-    "instruction": "Enter the rotary and take the first exit onto Way Name"
+    "instruction": "Enter the rotary and take the 1st exit onto Way Name"
 }
diff --git a/test/fixtures/v5/rotary/exit_2.json b/test/fixtures/v5/rotary/exit_2.json
@@ -7,5 +7,5 @@
         },
         "name": ""
     },
-    "instruction": "Enter the rotary and take the second exit"
+    "instruction": "Enter the rotary and take the 2nd exit"
 }
diff --git a/test/fixtures/v5/rotary/exit_3.json b/test/fixtures/v5/rotary/exit_3.json
@@ -7,5 +7,5 @@
         },
         "name": ""
     },
-    "instruction": "Enter the rotary and take the third exit"
+    "instruction": "Enter the rotary and take the 3rd exit"
 }
diff --git a/test/fixtures/v5/rotary/exit_4.json b/test/fixtures/v5/rotary/exit_4.json
@@ -7,5 +7,5 @@
         },
         "name": ""
     },
-    "instruction": "Enter the rotary and take the fourth exit"
+    "instruction": "Enter the rotary and take the 4th exit"
 }
diff --git a/test/fixtures/v5/rotary/exit_5.json b/test/fixtures/v5/rotary/exit_5.json
@@ -7,5 +7,5 @@
         },
         "name": ""
     },
-    "instruction": "Enter the rotary and take the fifth exit"
+    "instruction": "Enter the rotary and take the 5th exit"
 }
diff --git a/test/fixtures/v5/rotary/exit_6.json b/test/fixtures/v5/rotary/exit_6.json
@@ -7,5 +7,5 @@
         },
         "name": ""
     },
-    "instruction": "Enter the rotary and take the sixth exit"
+    "instruction": "Enter the rotary and take the 6th exit"
 }
diff --git a/test/fixtures/v5/rotary/exit_7.json b/test/fixtures/v5/rotary/exit_7.json
@@ -7,5 +7,5 @@
         },
         "name": ""
     },
-    "instruction": "Enter the rotary and take the seventh exit"
+    "instruction": "Enter the rotary and take the 7th exit"
 }
diff --git a/test/fixtures/v5/rotary/exit_8.json b/test/fixtures/v5/rotary/exit_8.json
@@ -7,5 +7,5 @@
         },
         "name": ""
     },
-    "instruction": "Enter the rotary and take the eighth exit"
+    "instruction": "Enter the rotary and take the 8th exit"
 }
diff --git a/test/fixtures/v5/rotary/exit_9.json b/test/fixtures/v5/rotary/exit_9.json
@@ -7,5 +7,5 @@
         },
         "name": ""
     },
-    "instruction": "Enter the rotary and take the ninth exit"
+    "instruction": "Enter the rotary and take the 9th exit"
 }
diff --git a/test/fixtures/v5/rotary/name_exit_default.json b/test/fixtures/v5/rotary/name_exit_default.json
@@ -8,5 +8,5 @@
         "name": "",
         "rotary_name": "Rotary Name"
     },
-    "instruction": "Enter Rotary Name and take the second exit"
+    "instruction": "Enter Rotary Name and take the 2nd exit"
 }
diff --git a/test/fixtures/v5/rotary/name_exit_destination.json b/test/fixtures/v5/rotary/name_exit_destination.json
@@ -9,5 +9,5 @@
         "rotary_name": "Rotary Name",
         "destinations": "Destination 1,Destination 2"
     },
-    "instruction": "Enter Rotary Name and take the second exit towards Destination 1"
+    "instruction": "Enter Rotary Name and take the 2nd exit towards Destination 1"
 }
diff --git a/test/fixtures/v5/rotary/name_exit_name.json b/test/fixtures/v5/rotary/name_exit_name.json
@@ -8,5 +8,5 @@
         "name": "Way Name",
         "rotary_name": "Rotary Name"
     },
-    "instruction": "Enter Rotary Name and take the second exit onto Way Name"
+    "instruction": "Enter Rotary Name and take the 2nd exit onto Way Name"
 }
diff --git a/test/fixtures/v5/roundabout/exit_default.json b/test/fixtures/v5/roundabout/exit_default.json
@@ -7,5 +7,5 @@
         },
         "name": ""
     },
-    "instruction": "Enter the roundabout and take the first exit"
+    "instruction": "Enter the roundabout and take the 1st exit"
 }
diff --git a/test/fixtures/v5/roundabout/exit_destination.json b/test/fixtures/v5/roundabout/exit_destination.json
@@ -8,5 +8,5 @@
         "name": "Way Name",
         "destinations": "Destination 1,Destination 2"
     },
-    "instruction": "Enter the roundabout and take the first exit towards Destination 1"
+    "instruction": "Enter the roundabout and take the 1st exit towards Destination 1"
 }
diff --git a/test/fixtures/v5/roundabout/exit_name.json b/test/fixtures/v5/roundabout/exit_name.json
@@ -7,5 +7,5 @@
         },
         "name": "Way Name"
     },
-    "instruction": "Enter the roundabout and take the first exit onto Way Name"
+    "instruction": "Enter the roundabout and take the 1st exit onto Way Name"
 }

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@`
`7`	`7`	`},`
`8`	`8`	`"name": ""`
`9`	`9`	`},`
`10`		`- "instruction": "Enter the rotary and take the tenth exit"`
	`10`	`+ "instruction": "Enter the rotary and take the 10th exit"`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@`
`8`	`8`	`"name": "Way Name",`
`9`	`9`	`"destinations": "Destination 1,Destination 2"`
`10`	`10`	`},`
`11`		`- "instruction": "Enter the rotary and take the first exit towards Destination 1"`
	`11`	`+ "instruction": "Enter the rotary and take the 1st exit towards Destination 1"`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@`
`7`	`7`	`},`
`8`	`8`	`"name": "Way Name"`
`9`	`9`	`},`
`10`		`- "instruction": "Enter the rotary and take the first exit onto Way Name"`
	`10`	`+ "instruction": "Enter the rotary and take the 1st exit onto Way Name"`
`11`	`11`	`}`