diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/breadcrumbs.rb | 20 | ||||
| -rw-r--r-- | config/locales/export_tasks.en.yml | 59 | ||||
| -rw-r--r-- | config/locales/export_tasks.fr.yml | 59 | ||||
| -rw-r--r-- | config/locales/exports.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/exports.fr.yml | 1 | ||||
| -rw-r--r-- | config/locales/imports.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/imports.fr.yml | 1 | ||||
| -rw-r--r-- | config/locales/journey_frequencies.en.yml | 13 | ||||
| -rw-r--r-- | config/locales/journey_frequencies.fr.yml | 13 | ||||
| -rw-r--r-- | config/locales/ninoxe.en.yml | 9 | ||||
| -rw-r--r-- | config/locales/ninoxe.fr.yml | 10 | ||||
| -rw-r--r-- | config/locales/referentials.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/referentials.fr.yml | 1 | ||||
| -rw-r--r-- | config/locales/stop_area_copies.en.yml | 14 | ||||
| -rw-r--r-- | config/locales/stop_area_copies.fr.yml | 14 | ||||
| -rw-r--r-- | config/locales/timebands.en.yml | 28 | ||||
| -rw-r--r-- | config/locales/timebands.fr.yml | 28 | ||||
| -rw-r--r-- | config/locales/validation_tasks.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/validation_tasks.fr.yml | 2 | ||||
| -rw-r--r-- | config/locales/vehicle_journeys.en.yml | 2 | ||||
| -rw-r--r-- | config/routes.rb | 12 |
21 files changed, 3 insertions, 288 deletions
diff --git a/config/breadcrumbs.rb b/config/breadcrumbs.rb index 28a117d52..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 @@ -271,16 +261,6 @@ crumb :journey_patterns do |referential, route| parent :route, referential, route end -crumb :referential_stop_areas do |referential| - link I18n.t('stop_areas.index.title'), referential_stop_areas_path(referential) - parent :referential, referential -end - -crumb :referential_stop_area do |referential, stop_area| - link breadcrumb_name(stop_area), referential_stop_area_path(referential, stop_area) - parent :referential_stop_areas, referential -end - crumb :vehicle_journeys do |referential, route| link I18n.t('vehicle_journeys.index.title', route: route.name), referential_line_route_vehicle_journeys_path(referential, route.line, route) parent :route, referential, route diff --git a/config/locales/export_tasks.en.yml b/config/locales/export_tasks.en.yml deleted file mode 100644 index fe0e32828..000000000 --- a/config/locales/export_tasks.en.yml +++ /dev/null @@ -1,59 +0,0 @@ -en: - export_tasks: - actions: - new: "New export" - new: - title: "New export" - all: "All" - flash: "Export task on queue, refresh page to see progression" - fields_gtfs_export: - warning: "Filter on stop areas export only GTFS stops and transfers files, these may contain extra attributes" - activemodel: - models: - export_task: - zero: "export" - one: "export" - other: "exports" - neptune_export: - zero: "export" - one: "Neptune export" - other: "exports" - gtfs_export: - zero: "export" - one: "GTFS export" - other: "exports" - netex_export: - zero: "export" - one: "NeTEx export" - other: "exports" - attributes: - export_task: - name: "Export name" - start_date: "Start date" - end_date: "End date" - start_date_greater_than: "Start date must be greater than or equal to %{tt_st_date}." - end_date_less_than: "End date must be less than or equal to %{tt_ed_date}." - end_date_greater_than_start_date: "End date must be greater than start date" - extensions: "Extensions" - created_at: "Created on" - status: "Status" - references_type: "Associated Data Type" - 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: - titles: - export_task: - time_zone: "according to TZ encoding (see http://en.wikipedia.org/wiki/Tz_database)" - object_id_prefix: "when prefix has this value, it will be removed to build GTFS id" - start_date: "reduce import to vehicle journeys running from this date" - end_date: "reduce import to vehicle journeys running until this date" - 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 deleted file mode 100644 index 770384a21..000000000 --- a/config/locales/export_tasks.fr.yml +++ /dev/null @@ -1,59 +0,0 @@ -fr: - export_tasks: - actions: - new: "Nouvel export" - new: - title: "Nouvel export" - all: "Tous" - flash: "La demande d'export est mise en file d'attente, veuillez rafraichir régulièrement la page pour en suivre la progression" - fields_gtfs_export: - warning: "Le filtre sur arrêts exporte uniquement les fichiers GTFS stops et transfers gtfs, ceux-ci pouvant contenir des attributs supplémentaires" - activemodel: - models: - export_task: - zero: "export" - one: "export" - other: "exports" - neptune_export: - zero: "export" - one: "export Neptune" - other: "exports" - gtfs_export: - zero: "export" - one: "export GTFS" - other: "exports" - netex_export: - zero: "export" - one: "export NeTEx" - other: "exports" - attributes: - export_task: - name: "Nom de l'export" - start_date: "Date de début" - end_date: "Date de fin" - start_date_greater_than: "La date de début doit être postérieure ou égale à %{tt_st_date}." - end_date_less_than: "La date de fin doit être antérieure ou égale à %{tt_ed_date}." - end_date_greater_than_start_date: "La date de fin doit être postérieure à la date de début." - extensions: "Extensions" - created_at: "Créé le" - status: "Status" - references_type: "Type de données incluses" - 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: - titles: - export_task: - time_zone: "selon le codage TZ (http://fr.wikipedia.org/wiki/Tz_database)" - object_id_prefix: "lorsque le préfixe d'identifiant Netpune prend cette valeur, il n'est pas utilisé pour composer l'identifiant GTFS" - start_date: "limite l'export aux courses circulant à partir de cette date" - end_date: "limite l'export aux courses circulant jusqu'à cette date" - 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/stop_area_copies.en.yml b/config/locales/stop_area_copies.en.yml deleted file mode 100644 index 0e9053bae..000000000 --- a/config/locales/stop_area_copies.en.yml +++ /dev/null @@ -1,14 +0,0 @@ -en: - stop_area_copies: - new: - success: "Clone succedeed" - title: - child: "Clone as child" - parent: "Clone as parent" - errors: - copy_aborted: "Errors prohibited this copy from completing: " - exception: "internal error" - activemodel: - attributes: - stop_area_copy: - area_type: "Area type" diff --git a/config/locales/stop_area_copies.fr.yml b/config/locales/stop_area_copies.fr.yml deleted file mode 100644 index 55543cfb3..000000000 --- a/config/locales/stop_area_copies.fr.yml +++ /dev/null @@ -1,14 +0,0 @@ -fr: - stop_area_copies: - new: - success: "Clonage réussi" - title: - child: "Cloner pour créer un fils" - parent: "Cloner pour créer un père" - errors: - copy_aborted: "Des erreurs ont empéchées le bon déroulement de la copie: " - exception: "erreur interne" - activemodel: - attributes: - stop_area_copy: - area_type: "Type d'arrêt" 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..dc9a17482 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' @@ -95,13 +94,6 @@ ChouetteIhm::Application.routes.draw do resources :vehicle_journeys, controller: 'referential_vehicle_journeys', only: [:index] - resources :import_tasks, :only => [:new, :create] - resources :export_tasks, :only => [:new, :create] do - collection do - get 'references' - end - end - resources :exports, :only => [:index, :show, :destroy] do member do get "exported_file" @@ -126,15 +118,11 @@ ChouetteIhm::Application.routes.draw do resources :time_table_combinations end - resources :timebands - resources :access_points do resources :access_links end resources :stop_areas, controller: "referential_stop_areas" do - resources :access_points - resources :stop_area_copies resources :stop_area_routing_lines member do get 'add_children' |
