aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorZog2018-05-29 10:18:16 +0200
committerJohan Van Ryseghem2018-05-30 16:29:33 +0200
commit3e8d95ac8168205ac9526fb8663459d691d09c30 (patch)
treefd2bc220473f4defe30a35668d6b9eead76f00fa /config
parent971b267958c3bf78abea332e0af4c46a23679b61 (diff)
downloadchouette-core-3e8d95ac8168205ac9526fb8663459d691d09c30.tar.bz2
Refs #6433; Fix specs
Diffstat (limited to 'config')
-rw-r--r--config/breadcrumbs.rb10
-rw-r--r--config/locales/export_tasks.en.yml2
-rw-r--r--config/locales/export_tasks.fr.yml2
-rw-r--r--config/locales/exports.en.yml1
-rw-r--r--config/locales/exports.fr.yml1
-rw-r--r--config/locales/imports.en.yml1
-rw-r--r--config/locales/imports.fr.yml1
-rw-r--r--config/locales/journey_frequencies.en.yml13
-rw-r--r--config/locales/journey_frequencies.fr.yml13
-rw-r--r--config/locales/ninoxe.en.yml9
-rw-r--r--config/locales/ninoxe.fr.yml10
-rw-r--r--config/locales/referentials.en.yml1
-rw-r--r--config/locales/referentials.fr.yml1
-rw-r--r--config/locales/timebands.en.yml28
-rw-r--r--config/locales/timebands.fr.yml28
-rw-r--r--config/locales/validation_tasks.en.yml2
-rw-r--r--config/locales/validation_tasks.fr.yml2
-rw-r--r--config/locales/vehicle_journeys.en.yml2
-rw-r--r--config/routes.rb3
19 files changed, 3 insertions, 127 deletions
diff --git a/config/breadcrumbs.rb b/config/breadcrumbs.rb
index d2edb7d5e..76942d476 100644
--- a/config/breadcrumbs.rb
+++ b/config/breadcrumbs.rb
@@ -81,16 +81,6 @@ crumb :time_table do |referential, time_table|
parent :time_tables, referential
end
-crumb :timebands do |referential|
- link I18n.t('timebands.index.title'), referential_timebands_path(referential)
- parent :referential, referential
-end
-
-crumb :timeband do |referential, timeband|
- link breadcrumb_name(timeband), referential_timeband_path(referential, timeband)
- parent :timebands, referential
-end
-
crumb :compliance_check_sets do |workbench|
link I18n.t('compliance_check_sets.index.title'), workbench_compliance_check_sets_path(workbench)
parent :workbench, workbench
diff --git a/config/locales/export_tasks.en.yml b/config/locales/export_tasks.en.yml
index fe0e32828..505cf688e 100644
--- a/config/locales/export_tasks.en.yml
+++ b/config/locales/export_tasks.en.yml
@@ -41,7 +41,6 @@ en:
reference_ids: "Associated Data"
object_id_prefix: "Neptune Id prefix"
max_distance_for_commercial: "Max distance for commercial stop"
- max_distance_for_connection_link: "Max distance for connection link"
ignore_last_word: "ignore last word"
ignore_end_chars: "ignore last chars"
formtastic:
@@ -54,6 +53,5 @@ en:
dates:
not_nul: "HUB Export interrupted. Start date and end date must be provided."
max_distance_for_commercial: "Maximal distance to merge homonymous stops in commercial stop in meter"
- max_distance_for_connection_link: "Maximal distance to link stops by connection link stop in meter"
ignore_last_word: "ignore last word on stop name in homonymous detection (inappliable when just one word occurs)"
ignore_end_chars: "ignore some chars at the end of stop names in homonymous detection"
diff --git a/config/locales/export_tasks.fr.yml b/config/locales/export_tasks.fr.yml
index 770384a21..268f9b2ce 100644
--- a/config/locales/export_tasks.fr.yml
+++ b/config/locales/export_tasks.fr.yml
@@ -41,7 +41,6 @@ fr:
reference_ids: "Données incluses"
object_id_prefix: "Préfixe d'identifiants"
max_distance_for_commercial: "Distance max pour créer les zones"
- max_distance_for_connection_link: "Distance max pour créer les correspondances"
ignore_last_word: "ignorer le dernier mot"
ignore_end_chars: "ignorer les n derniers caractères"
formtastic:
@@ -54,6 +53,5 @@ fr:
dates:
not_nul: "Export HUB interrompu. Les dates de début et de fin doivent êtres renseignées."
max_distance_for_commercial: "Distance maximale entre deux arrêts homonymes pour créer les zones d'arrêt (en mètre)"
- max_distance_for_connection_link: "Distance maximale entre deux arrêts pour créer les correspondances (en mètre)"
ignore_last_word: "Ignorer le dernier mot pour détecter l'homonymie des noms d'arrêt (inapplicable quand le nom ne comporte qu'un mot)"
ignore_end_chars: "Ignorer les n derniers caractères du nom de l'arrêt pour détecter l'homonymie"
diff --git a/config/locales/exports.en.yml b/config/locales/exports.en.yml
index de34e797c..9a4c65d41 100644
--- a/config/locales/exports.en.yml
+++ b/config/locales/exports.en.yml
@@ -81,7 +81,6 @@ en:
no_save: "No save"
object_id_prefix: "Neptune Id prefix"
max_distance_for_commercial: "Max distance for commercial stop"
- max_distance_for_connection_link: "Max distance for connection link"
ignore_last_word: "ignore last word"
ignore_end_chars: "ignore last chars"
type: "Export type"
diff --git a/config/locales/exports.fr.yml b/config/locales/exports.fr.yml
index 62aae70cd..e3479b052 100644
--- a/config/locales/exports.fr.yml
+++ b/config/locales/exports.fr.yml
@@ -81,7 +81,6 @@ fr:
references_type: "Données à exporter"
object_id_prefix: "Préfixe d'identifiants"
max_distance_for_commercial: "Distance max pour créer les zones"
- max_distance_for_connection_link: "Distance max pour créer les correspondances"
ignore_last_word: "ignorer le dernier mot"
ignore_end_chars: "ignorer les n derniers caractères"
type: "Type d'export"
diff --git a/config/locales/imports.en.yml b/config/locales/imports.en.yml
index 51939c1fb..32c93d19a 100644
--- a/config/locales/imports.en.yml
+++ b/config/locales/imports.en.yml
@@ -92,7 +92,6 @@ en:
no_save: "No save"
object_id_prefix: "Neptune Id prefix"
max_distance_for_commercial: "Max distance for commercial stop"
- max_distance_for_connection_link: "Max distance for connection link"
ignore_last_word: "ignore last word"
ignore_end_chars: "ignore last chars"
referential: Referential
diff --git a/config/locales/imports.fr.yml b/config/locales/imports.fr.yml
index 219414e57..110155865 100644
--- a/config/locales/imports.fr.yml
+++ b/config/locales/imports.fr.yml
@@ -96,7 +96,6 @@ fr:
references_type: "Données à importer"
object_id_prefix: "Préfixe d'identifiants"
max_distance_for_commercial: "Distance max pour créer les zones"
- max_distance_for_connection_link: "Distance max pour créer les correspondances"
ignore_last_word: "ignorer le dernier mot"
ignore_end_chars: "ignorer les n derniers caractères"
referential: Jeu de données
diff --git a/config/locales/journey_frequencies.en.yml b/config/locales/journey_frequencies.en.yml
deleted file mode 100644
index b6303c248..000000000
--- a/config/locales/journey_frequencies.en.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-en:
- journey_frequencies:
- time_band: Time band
- form:
- add_line: Add a timeband
- activerecord:
- attributes:
- journey_frequency:
- first_departure_time: First departure
- last_departure_time: Last departure
- scheduled_headway_interval: Interval
- exact_time: Exact?
- timeband: Time bands
diff --git a/config/locales/journey_frequencies.fr.yml b/config/locales/journey_frequencies.fr.yml
deleted file mode 100644
index 7c5a25c73..000000000
--- a/config/locales/journey_frequencies.fr.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-fr:
- journey_frequencies:
- time_band: Créneaux horaires
- form:
- add_line: Ajouter un créneau
- activerecord:
- attributes:
- journey_frequency:
- first_departure_time: Premier départ
- last_departure_time: Dernier départ
- scheduled_headway_interval: Intervalle
- exact_time: Exact ?
- timeband: Créneau horaire
diff --git a/config/locales/ninoxe.en.yml b/config/locales/ninoxe.en.yml
index 134ef4f66..c380c2fb6 100644
--- a/config/locales/ninoxe.en.yml
+++ b/config/locales/ninoxe.en.yml
@@ -8,16 +8,9 @@ en:
invalid_object_id_type: invalid type, must be %{type}
time_table_period:
start_must_be_before_end: end date must be after start date
- time_table_date:
+ time_table_date:
attributes:
date:
taken: dupplicate date for this timetable
vehicle_journey_at_stop:
arrival_must_be_before_departure: arrival time must be before departure time
- timeband:
- start_must_be_before_end: end date must be after start date
- journey_frequency:
- start_must_be_after_timeband: the date of departure must be greater or equal to the time bands
- end_must_be_before_timeband: the end date must be less than or equal to the time bands
- end_must_be_different_from_first: the end date must be different from first date
- scheduled_headway_interval_greater_than_zero: interval must be greater than 0
diff --git a/config/locales/ninoxe.fr.yml b/config/locales/ninoxe.fr.yml
index 3a823465d..6e3e2c35e 100644
--- a/config/locales/ninoxe.fr.yml
+++ b/config/locales/ninoxe.fr.yml
@@ -8,16 +8,10 @@ fr:
invalid_object_id_type: type invalide, %{type} attendu
time_table_period:
start_must_be_before_end: la date de fin doit être postérieure à la date de début
- time_table_date:
+ time_table_date:
attributes:
date:
taken: date déjà saisie pour ce calendrier
vehicle_journey_at_stop:
arrival_must_be_before_departure: "l'heure d'arrivée doit être antérieure à l'heure de départ"
- timeband:
- start_must_be_before_end: la date de fin doit être postérieure à la date de début
- journey_frequency:
- start_must_be_after_timeband: la date de départ doit être supérieure ou égal à la plage horaire
- end_must_be_before_timeband: la date de fin doit être inférieur ou égal à la plage horaire
- end_must_be_different_from_first: la date de fin doit être différent de la date de départ
- scheduled_headway_interval_greater_than_zero: l'intervalle doit être supérieur à 0
+
diff --git a/config/locales/referentials.en.yml b/config/locales/referentials.en.yml
index 3caec8933..c37362cc7 100644
--- a/config/locales/referentials.en.yml
+++ b/config/locales/referentials.en.yml
@@ -101,7 +101,6 @@ en:
compliance_checks: "Validations"
data_format_restrictions: "Data format constraint"
data_format: "Favorite format for export"
- timebands: "Time bands"
routing_constraint_zone: Routing constraint zone
validity_period: "Inclusive validity period"
updated_at: "Updated"
diff --git a/config/locales/referentials.fr.yml b/config/locales/referentials.fr.yml
index e932494ce..77fc3ba9d 100644
--- a/config/locales/referentials.fr.yml
+++ b/config/locales/referentials.fr.yml
@@ -101,7 +101,6 @@ fr:
compliance_checks: "Validations"
data_format_restrictions: "Format d'export privilégié"
data_format: "Format d'export privilégié"
- timebands: "Créneaux horaires"
routing_constraint_zone: Zone de contrainte
validity_period: "Période de validité englobante"
updated_at: "Edité le"
diff --git a/config/locales/timebands.en.yml b/config/locales/timebands.en.yml
deleted file mode 100644
index 1ac68644d..000000000
--- a/config/locales/timebands.en.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-en:
- timebands:
- actions:
- new: "Add a time band"
- edit: "Edit a time band"
- destroy: "Delete a time band"
- destroy_confirm: "Thank you to confirm the deletion of these time band."
- new:
- title: "Add a time band"
- edit:
- title: "Edit this time band %{timeband}"
- show:
- title: "Time band %{timeband}"
- index:
- title: "Time bands"
- activerecord:
- models:
- timeband:
- zero: "Time band"
- one: "Time band"
- other: "Time bands"
- attributes:
- timeband:
- name: "Title"
- start_time: "Start time"
- end_time: "End time"
- created_at: Created at
- updated_at: Updated at
diff --git a/config/locales/timebands.fr.yml b/config/locales/timebands.fr.yml
deleted file mode 100644
index 9d401ef8a..000000000
--- a/config/locales/timebands.fr.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-fr:
- timebands:
- actions:
- new: "Ajouter un créneau horaire"
- edit: "Editer ce créneau horaire"
- destroy: "Supprimer ce créneau horaire"
- destroy_confirm: "Merci de confirmer la suppression de ce créneau horaire."
- new:
- title: "Ajouter un créneau horaire"
- edit:
- title: "Editer le créneau horaire %{timeband}"
- show:
- title: "Créneau horaire %{timeband}"
- index:
- title: "Créneaux horaires"
- activerecord:
- models:
- timeband:
- zero: "créneau horaire"
- one: "créneau horaire"
- other: "créneaux horaires"
- attributes:
- timeband:
- name: "Titre"
- start_time: "Heure de début"
- end_time: "Heure de fin"
- created_at: "Créé le"
- updated_at: "Edité le"
diff --git a/config/locales/validation_tasks.en.yml b/config/locales/validation_tasks.en.yml
index ebccae383..da9add988 100644
--- a/config/locales/validation_tasks.en.yml
+++ b/config/locales/validation_tasks.en.yml
@@ -98,13 +98,11 @@ en:
no_save: "No save"
object_id_prefix: "Neptune Id prefix"
max_distance_for_commercial: "Max distance for commercial stop"
- max_distance_for_connection_link: "Max distance for connection link"
ignore_last_word: "ignore last word"
ignore_end_chars: "ignore last chars"
formtastic:
titles:
validation_task:
max_distance_for_commercial: "Maximal distance to merge homonymous stops in commercial stop in meter"
- max_distance_for_connection_link: "Maximal distance to link stops by connection link stop in meter"
ignore_last_word: "ignore last word on stop name in homonymous detection (inappliable when just one word occurs)"
ignore_end_chars: "ignore some chars at the end of stop names in homonymous detection"
diff --git a/config/locales/validation_tasks.fr.yml b/config/locales/validation_tasks.fr.yml
index 286807edd..7ae414400 100644
--- a/config/locales/validation_tasks.fr.yml
+++ b/config/locales/validation_tasks.fr.yml
@@ -98,13 +98,11 @@ fr:
references_type: "Sous ensemble"
object_id_prefix: "Préfixe d'identifiants"
max_distance_for_commercial: "Distance max pour créer les zones"
- max_distance_for_connection_link: "Distance max pour créer les correspondances"
ignore_last_word: "ignorer le dernier mot"
ignore_end_chars: "ignorer les n derniers caractères"
formtastic:
titles:
validation_task:
max_distance_for_commercial: "Distance maximale entre deux arrêts homonymes pour créer les zones d'arrêt (en mètre)"
- max_distance_for_connection_link: "Distance maximale entre deux arrêts pour créer les correspondances (en mètre)"
ignore_last_word: "Ignorer le dernier mot pour détecter l'homonymie des noms d'arrêt (inapplicable quand le nom ne comporte qu'un mot)"
ignore_end_chars: "Ignorer les n derniers caractères du nom de l'arrêt pour détecter l'homonymie"
diff --git a/config/locales/vehicle_journeys.en.yml b/config/locales/vehicle_journeys.en.yml
index c073fd1e7..f9019411e 100644
--- a/config/locales/vehicle_journeys.en.yml
+++ b/config/locales/vehicle_journeys.en.yml
@@ -90,7 +90,6 @@ en:
arrival: "Arrival"
bounding: "From %{start} to %{end}"
departure: "Departure"
- journey_frequencies: "Timeband"
stop_title: "Stop"
time_tables: "Calendars list"
title: "Vehicle Journey %{vehicle journey}"
@@ -132,7 +131,6 @@ en:
flexible_service: "On demond transportation"
footnote_ids: "Footnotes"
id: "Journey ID"
- journey_frequency_ids: "Timeband"
journey_name: "Name of the vehicle journey"
journey_pattern_id: "Pattern ID"
journey_pattern: "Journey Pattern"
diff --git a/config/routes.rb b/config/routes.rb
index cde1701f8..5693b86f9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -50,7 +50,6 @@ ChouetteIhm::Application.routes.draw do
end
resources :autocomplete_purchase_windows, only: [:index]
resources :autocomplete_time_tables, only: [:index]
- resources :autocomplete_timebands
resources :group_of_lines, controller: "referential_group_of_lines" do
collection do
get 'name_filter'
@@ -126,8 +125,6 @@ ChouetteIhm::Application.routes.draw do
resources :time_table_combinations
end
- resources :timebands
-
resources :access_points do
resources :access_links
end