fix locales structuration Refs #4698

6 files changed, 16 insertions, 13 deletions

diff --git a/app/views/referential_lines/show.html.slim b/app/views/referential_lines/show.html.slim
index d50f51335..55f352bb6 100644
--- a/app/views/referential_lines/show.html.slim
+++ b/app/views/referential_lines/show.html.slim
@@ -1,6 +1,6 @@
 / PageHeader
 = pageheader 'ligne',
-            t('lines.index.line') + " " + @line.name,
+            t('lines.index.line', line: @line.name),
              '',
              t('last_update', time: l(@line.updated_at, format: :short)) do
 
@@ -34,7 +34,7 @@
 
     .row
       .col-lg-12
-        .h3 = t('routes.show.itineraries')
+        .h3 = t('lines.show.routes.title', route: "", line: "")
         - if params[:q].present? or @routes.any?
           .row
             .col-lg-12
diff --git a/app/views/routes/show.html.slim b/app/views/routes/show.html.slim
index be3b526cf..e62335924 100644
--- a/app/views/routes/show.html.slim
+++ b/app/views/routes/show.html.slim
@@ -1,6 +1,6 @@
 / PageHeader
 = pageheader 'itineraire',
-        t('routes.index.itinerarie') + " " + @route.name,
+        t('routes.index.title', route: @route.name),
              '',
              t('last_update', time: l(@route.updated_at, format: :short)),
              (policy(@route).edit? ? link_to(t('actions.edit'), edit_referential_line_route_path(@referential, @line, @route), class: 'btn btn-default') : '') do
@@ -32,7 +32,7 @@
 
     .row
       .col-lg-12
-        .h3 = t('routes.show.itineraries')
+        .h3 = t('routes.show.stop_areas.title')
         - if @route_sp.any?
           = table_builder_2 @route_sp,
             [ \
diff --git a/config/locales/lines.en.yml b/config/locales/lines.en.yml
index 9efc9a4cc..15e08290d 100644
--- a/config/locales/lines.en.yml
+++ b/config/locales/lines.en.yml
@@ -21,12 +21,13 @@ en:
       title: "Update line %{line}"
     show:
       title: "Line %{line}"
-      itineraries: "Line's route list"
+      routes:
+        title: "Routes list"
       group_of_lines: "Groups of lines"
     index:
       deactivated: "Disabled line"
       title: "Lines"
-      line: "Ligne"
+      line: "Line %{line}"
       name_or_number_or_objectid: "Search by name, short name or ID Codif..."
       no_networks: "No networks"
       no_companies: "No companies"
diff --git a/config/locales/lines.fr.yml b/config/locales/lines.fr.yml
index 4a6106a21..c459eb51b 100644
--- a/config/locales/lines.fr.yml
+++ b/config/locales/lines.fr.yml
@@ -21,12 +21,14 @@ fr:
       title: "Editer la ligne %{line}"
     show:
       title: "Ligne %{line}"
+      routes:
+        title: "Liste des Itinéraires"
       itineraries: "Liste des séquences d'arrêts de la ligne"
       group_of_lines: "Groupes de lignes"
     index:
       deactivated: "Ligne désactivée"
       title: "Lignes"
-      line: "Ligne"
+      line: "Ligne %{line}"
       name_or_number_or_objectid: "Recherche par nom, nom court ou ID Codif..."
       no_networks: "Aucun réseaux"
       no_companies: "Aucun transporteurs"
diff --git a/config/locales/routes.en.yml b/config/locales/routes.en.yml
index 6b8372a85..4437b62b9 100644
--- a/config/locales/routes.en.yml
+++ b/config/locales/routes.en.yml
@@ -39,13 +39,13 @@ en:
     show:
       title: "Route %{route}"
       stop_points: "Stop point on route list"
-      itineraries: "List of routes"
+      stop_areas:
+        title: "Stop area list"
       journey_patterns: "Route journey patterns list"
       no_opposite_route: "No reversed route associated"
       undefined: "Undefined"
     index:
-      title: "Routes"
-      itinerarie: "Route"
+      title: "Routes %{route}"
       selection: "Selection"
       selection_all: "All"
     edit_boarding_alighting:
diff --git a/config/locales/routes.fr.yml b/config/locales/routes.fr.yml
index a396b5f9d..83a96732d 100644
--- a/config/locales/routes.fr.yml
+++ b/config/locales/routes.fr.yml
@@ -39,13 +39,13 @@ fr:
     show:
       title: "Itinéraire %{route} de la ligne %{line}"
       stop_points: "Liste des arrêts de l'itinéraire"
-      itineraries: "Liste des itinéraires"
+      stop_areas:
+        title: "Liste des arrêts"
       journey_patterns: "Liste des missions"
       no_opposite_route: "Aucun itinéraire associé"
       undefined: "Non défini"
     index:
-      title: "Itinéraires"
-      itinerarie: "Itinéraire"
+      title: "Itinéraire %{route}"
       selection: "Sélection"
       selection_all: "Tous"
     edit_boarding_alighting: