Merge branch 'master' into release_6.1.1

GIScience · Jun 2, 2020 · e3261eb · e3261eb
2 parents 6005984 + 93ca6d0
commit e3261eb
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -47,6 +47,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 - Fixed memory issue at graph building ([#659](https://github.com/GIScience/openrouteservice/issues/659))
 - Improve way category assignment for ferry connections ([#678](https://github.com/GIScience/openrouteservice/issues/678))
 ### Changed
+- improve french translation (directions)
 - Make Docker setup more flexible wrt customizations ([#627](https://github.com/GIScience/openrouteservice/issues/627))
 - Updated GraphHopper to newer version (0.13)
 - Give more details to green and quiet routing API descriptions ([#632](https://github.com/GIScience/openrouteservice/issues/632))

diff --git a/openrouteservice/src/main/resources/resources/locales/ors_fr-FR.resources b/openrouteservice/src/main/resources/resources/locales/ors_fr-FR.resources
@@ -1,7 +1,7 @@
 {
     instructions {
         "numerals": {
-            "1": "1er",
+            "1": "1ère",
             "2": "2ème",
             "3": "3ème",
             "4": "4ème",
@@ -13,22 +13,22 @@
             "10": "10ème"
         },
         "directions": {
-            "north": "le nord",
-            "northeast": "le nord-est",
-            "east": "l’est",
-            "southeast": "le sud-est",
-            "south": "le sud",
-            "southwest": "le sud-ouest",
-            "west": "l’ouest",
-            "northwest": "le nord-ouest"
+            "north": "du Nord",
+            "northeast": "du Nord-Est",
+            "east": "de l’Est",
+            "southeast": "du Sud-Est",
+            "south": "du Sud",
+            "southwest": "du Sud-Ouest",
+            "west": "de l’Ouest",
+            "northwest": "du Nord-Ouest"
         },
         "turn_maneuvers": {
-            "left": "gauche",
-            "right": "droit",
-            "sharp_left": "Pointu à gauche",
-            "sharp_right": "Pointu à droite",
-            "slight_left": "Léger à gauche",
-            "slight_right": "Léger à droite",
+            "left": "à gauche",
+            "right": "à droite",
+            "sharp_left": "franchement à gauche",
+            "sharp_right": "franchement à droite",
+            "slight_left": "légerement à gauche",
+            "slight_right": "légèrement à droite",
             "straight": "tout droit",
             "uturn": "demi-tour"
         },
@@ -39,33 +39,33 @@
 							"name": "Arrivez à {way_name}"
                 	},
 					"left": {
-						"default": "Arrivez à votre destination, à gauche",
-						"name": "Arrivez à {way_name}, on the left"
+						"default": "Arrivé à votre destination, sur la gauche",
+						"name": "Arrivé à {way_name}, destination sur la gauche"
 					},
 					"right": {
-						"default": "Arrivez à votre destination, sur la droite",
-						"name": "Arrivez à {way_name}, sur la droite"
+						"default": "Arrivé à votre destination, sur la droite",
+						"name": "Arrivé à {way_name}, destination sur la droite"
 					},
 					"straight": {
-						"default": "Arrivez à votre destination, droit devant",
-						"name": "Arrivez à {way_name}, droit devant"
+						"default": "Arrivé à votre destination, droit devant",
+						"name": "Arrivé à {way_name}, destination droit devant"
 					}
 			},          
             "depart": {
                 "default": {
-                    "default": "Tournez à {direction}",
-                    "name": "Tournez à {direction} sur {way_name}"
+                    "default": "Démarrez en direction {direction}",
+                    "name": "Démarrez en direction {direction} sur {way_name}"
                 }
             },
             "roundabout": {
                 "default": {
                     "exit": {
-                        "default": "Entrez le rond-point et prenez la {exit_number} sortie",
-                        "name": "Entrez le rond-point et prenez la {exit_number} sortie sur {way_name}"
+                        "default": "Entrez sur le rond-point et prenez la {exit_number} sortie",
+                        "name": "Entrez sur le rond-point et prenez la {exit_number} sortie sur {way_name}"
                     },
                     "default": {
-                        "default": "Entrez le rond-point",
-                        "name": "Entrez le rond-point et sortie sur{way_name}"
+                        "default": "Entrez sur le rond-point",
+                        "name": "Entrez sur le rond-point et sortie sur {way_name}"
                     }
                 }
             },
@@ -82,7 +82,7 @@
                 },
                 "uturn": {
                     "default": "Faites un demi-tour ",
-                    "name": "Faites un demi-tour {way_name}"
+                    "name": "Faites un demi-tour sur {way_name}"
                 }
             }
 			"keep": {