aboutsummaryrefslogtreecommitdiffstats
path: root/config/locales
diff options
context:
space:
mode:
authorXinhui2017-12-01 16:07:18 +0100
committerXinhui2017-12-01 16:07:18 +0100
commitbb53d563786da23c1194d0716c2cc2597fd1f82d (patch)
tree98056b3e6d56ad4fed1ed966c1c75e9d083d5092 /config/locales
parent9a77e70223a9aebb278ee8ace6fc79a021c3aa95 (diff)
downloadchouette-core-bb53d563786da23c1194d0716c2cc2597fd1f82d.tar.bz2
Fix conflit with page header title & breadcrumb title on journey_patterns_collections#show
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/journey_patterns.en.yml2
-rw-r--r--config/locales/journey_patterns.fr.yml2
-rw-r--r--config/locales/time_tables.en.yml4
-rw-r--r--config/locales/time_tables.fr.yml2
4 files changed, 5 insertions, 5 deletions
diff --git a/config/locales/journey_patterns.en.yml b/config/locales/journey_patterns.en.yml
index 6116a1b26..e5248c29c 100644
--- a/config/locales/journey_patterns.en.yml
+++ b/config/locales/journey_patterns.en.yml
@@ -19,7 +19,7 @@ en:
title: "Journey Pattern %{journey_pattern}"
stop_points: "Stop point on journey pattern list"
index:
- title: "Journey Patterns of %{route_name}"
+ title: "Journey Patterns of %{route}"
form:
warning: "Be careful, selection is also applied to the %{count} vehicle journeys associated to this journey pattern"
activerecord:
diff --git a/config/locales/journey_patterns.fr.yml b/config/locales/journey_patterns.fr.yml
index 3d19bd049..e989d5820 100644
--- a/config/locales/journey_patterns.fr.yml
+++ b/config/locales/journey_patterns.fr.yml
@@ -19,7 +19,7 @@ fr:
title: "Mission %{journey_pattern}"
stop_points: "Liste des arrêts de la mission"
index:
- title: "Missions de %{route_name}"
+ title: "Missions de %{route}"
form:
warning: "Attention, la sélection s'applique aussi aux %{count} courses de la mission"
activerecord:
diff --git a/config/locales/time_tables.en.yml b/config/locales/time_tables.en.yml
index e68836f99..ff36a6d7d 100644
--- a/config/locales/time_tables.en.yml
+++ b/config/locales/time_tables.en.yml
@@ -36,7 +36,7 @@ en:
error_modal:
title: "Error"
withoutPeriodsWithDaysTypes: "A timetable can't have day type(s) without period(s)."
- withPeriodsWithoutDayTypes: "A tiemetable can't have period(s) swithout day type(s)."
+ withPeriodsWithoutDayTypes: "A tiemetable can't have period(s) swithout day type(s)."
error_submit:
periods_overlaps: "Periods cannot overlap in a timetable"
dates_overlaps: "A period cannot overlap a date in a timetable"
@@ -63,7 +63,7 @@ en:
begin: Period start
end: Period end
show:
- title: "Timetable %{time_table}"
+ title: "Timetable %{name}"
dates: "Application dates"
periods: "Application periods"
from: "from"
diff --git a/config/locales/time_tables.fr.yml b/config/locales/time_tables.fr.yml
index b85f7ca33..631ecca95 100644
--- a/config/locales/time_tables.fr.yml
+++ b/config/locales/time_tables.fr.yml
@@ -63,7 +63,7 @@ fr:
begin: Début de période
end: Fin de période
show:
- title: Calendrier %{time_table}
+ title: Calendrier %{name}
dates: "Dates d'application"
periods: "Périodes d'application"
from: "du"