aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/breadcrumbs.rb9
-rw-r--r--config/initializers/stif.rb31
-rw-r--r--config/locales/compliance_check_sets.en.yml1
-rw-r--r--config/locales/compliance_check_sets.fr.yml1
-rw-r--r--config/locales/import_messages.fr.yml15
-rw-r--r--config/locales/import_resources.fr.yml9
-rw-r--r--config/locales/imports.en.yml10
-rw-r--r--config/locales/imports.fr.yml11
-rw-r--r--config/locales/layouts.en.yml1
-rw-r--r--config/locales/layouts.fr.yml1
-rw-r--r--config/locales/workbenches.en.yml2
-rw-r--r--config/locales/workbenches.fr.yml1
-rw-r--r--config/locales/workgroups.en.yml12
-rw-r--r--config/locales/workgroups.fr.yml12
-rw-r--r--config/routes.rb2
15 files changed, 99 insertions, 19 deletions
diff --git a/config/breadcrumbs.rb b/config/breadcrumbs.rb
index e60ff187f..babaa2c8c 100644
--- a/config/breadcrumbs.rb
+++ b/config/breadcrumbs.rb
@@ -131,6 +131,11 @@ crumb :import_resources do |import, import_resources|
parent :import, import.workbench, import.parent
end
+crumb :import_resource do |import_resource|
+ link I18n.t('import.resources.index.title'), workbench_import_import_resource_path(import_resource.root_import.workbench, import_resource.root_import, import_resource)
+ parent :import, import_resource.root_import.workbench, import_resource.root_import
+end
+
crumb :organisation do |organisation|
link breadcrumb_name(organisation), organisation_path(organisation)
end
@@ -267,6 +272,10 @@ crumb :vehicle_journeys do |referential, route|
parent :route, referential, route
end
+crumb :workgroup do |w|
+ link I18n.t('layouts.navbar.workbench_outputs.edit_workgroup')
+end
+
# crumb :compliance_controls do|compliance_control_sets|
# link
# parent :compliance_control_sets, compliance_control_sets
diff --git a/config/initializers/stif.rb b/config/initializers/stif.rb
index 2ddadbc7e..be25a329f 100644
--- a/config/initializers/stif.rb
+++ b/config/initializers/stif.rb
@@ -1,24 +1,27 @@
# coding: utf-8
+
Rails.application.config.to_prepare do
Organisation.after_create do |organisation|
- line_referential = LineReferential.find_by(name: "CodifLigne")
- stop_area_referential = StopAreaReferential.find_by(name: "Reflex")
+ unless organisation.code == "STIF" # seed is in action
+ line_referential = LineReferential.find_by(name: "CodifLigne")
+ stop_area_referential = StopAreaReferential.find_by(name: "Reflex")
- line_referential.organisations << organisation
- stop_area_referential.organisations << organisation
+ line_referential.organisations << organisation
+ stop_area_referential.organisations << organisation
- workgroup = Workgroup.find_or_create_by(name: "Gestion de l'offre théorique IDFm") do |w|
- w.line_referential = line_referential
- w.stop_area_referential = stop_area_referential
- end
+ workgroup = Workgroup.find_or_create_by(name: "Gestion de l'offre théorique IDFm") do |w|
+ w.line_referential = line_referential
+ w.stop_area_referential = stop_area_referential
+ end
- workbench = organisation.workbenches.find_or_create_by(name: "Gestion de l'offre") do |w|
- w.line_referential = line_referential
- w.stop_area_referential = stop_area_referential
- w.objectid_format = Workbench.objectid_format.stif_netex
- w.workgroup = workgroup
+ organisation.workbenches.find_or_create_by(name: "Gestion de l'offre") do |w|
+ w.line_referential = line_referential
+ w.stop_area_referential = stop_area_referential
+ w.objectid_format = Workbench.objectid_format.stif_netex
+ w.workgroup = workgroup
- Rails.logger.debug "Create Workbench for #{organisation.name}"
+ Rails.logger.debug "Create Workbench for #{organisation.name}"
+ end
end
end
end unless Rails.env.test?
diff --git a/config/locales/compliance_check_sets.en.yml b/config/locales/compliance_check_sets.en.yml
index 73ecf8996..217077d6b 100644
--- a/config/locales/compliance_check_sets.en.yml
+++ b/config/locales/compliance_check_sets.en.yml
@@ -30,6 +30,7 @@ en:
compliance_check_set_executed: "Compliance check set executed"
compliance_control_owner: "Compliance control owner"
import: "Import"
+ status: Status
errors:
no_parent: "The compliance check set doesn't have any parent"
activerecord:
diff --git a/config/locales/compliance_check_sets.fr.yml b/config/locales/compliance_check_sets.fr.yml
index 045fed4ce..be54effde 100644
--- a/config/locales/compliance_check_sets.fr.yml
+++ b/config/locales/compliance_check_sets.fr.yml
@@ -26,6 +26,7 @@ fr:
compliance_check_set_executed: "Jeu de contrôles exécuté"
compliance_control_owner: "Propriétaire du jeu de contrôles"
import: "Rapport d'import"
+ status: Statut
errors:
no_parent: "Le jeux de contrôle n'a pas de parent"
activerecord:
diff --git a/config/locales/import_messages.fr.yml b/config/locales/import_messages.fr.yml
index 76d9d904c..a8dd31f8a 100644
--- a/config/locales/import_messages.fr.yml
+++ b/config/locales/import_messages.fr.yml
@@ -4,8 +4,21 @@ fr:
inconsistent_zip_file: "Le fichier zip contient des repertoires non prévus : %{spurious_dirs} qui seront ignorés"
missing_calendar_in_zip_file: "Le dossier %{source_filename} ne contient pas de calendrier"
wrong_calendar_in_zip_file: "Le calendrier contenu dans %{source_filename} contient des données incorrectes ou incohérentes"
- referential_creation: "Le référentiel %{referential_name} n'a pas pu être créé car un référentiel existe déjà sur les mêmes périodes et lignes"
+ referential_creation: "Le référentiel %{referential_name} n'a pas pu être créé."
+ referential_creation_overlapping_existing_referential: "Le référentiel %{referential_name} n'a pas pu être créé car un référentiel existe déjà sur les mêmes périodes et lignes: <a href='%{overlapped_url}'>%{overlapped_name}</a>"
referential_creation_missing_lines: "Le référentiel %{referential_name} n'a pas pu être créé car aucune ligne ne correspond"
+ referential_creation_lines_found: "Lignes lues dans le dossier: %{line_objectids}"
+ gtfs:
+ agencies:
+ imported: "%{count} agence(s) importée(s)"
+ stops:
+ imported: "%{count} arrêt(s) importé(s)"
+ routes:
+ imported: "%{count} itinéraire(s) importé(s)"
+ trips:
+ imported: "%{count} course(s) importée(s)"
+ calendars:
+ imported: "%{count} calendrier(s) importé(s)"
1_netexstif_2: "Le fichier %{source_filename} ne respecte pas la syntaxe XML ou la XSD NeTEx : erreur '%{error_value}' rencontré"
1_netexstif_5: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number} : l'objet %{source_label} d'identifiant %{source_objectid} a une date de mise à jour dans le futur"
2_netexstif_1_1: "Le fichier commun.xml ne contient pas de frame nommée NTEX_COMMUN"
diff --git a/config/locales/import_resources.fr.yml b/config/locales/import_resources.fr.yml
index 93a576f01..8ddb3fb6b 100644
--- a/config/locales/import_resources.fr.yml
+++ b/config/locales/import_resources.fr.yml
@@ -1,12 +1,17 @@
fr:
import:
resources: &resources
- index:
- title: "Rapport de conformité NeTEx"
+ table: &table
table_state: "%{lines_imported} ligne(s) importée(s) sur %{lines_in_zipfile} présente(s) dans l'archive"
table_title: "Etat des fichiers analysés"
table_explanation: "Dans le cas ou le(s) fichiers calendriers.xml et/ou commun.xml sont dans un état non importé, alors tous les fichiers lignes sont automatiquement dans un état non traité."
+ index:
+ <<: *table
+ title: "Rapport de conformité NeTEx"
metrics: "%{error_count} errors, %{warning_count} warnings"
+ show:
+ <<: *table
+ title: Rapport d'import
import_resources:
<<: *resources
activerecord:
diff --git a/config/locales/imports.en.yml b/config/locales/imports.en.yml
index c8683a2a7..344ee05a8 100644
--- a/config/locales/imports.en.yml
+++ b/config/locales/imports.en.yml
@@ -41,6 +41,16 @@ en:
warning: "Warning"
error: "Error"
fatal: "Fatal"
+ status:
+ new: New
+ pending: Pending
+ successful: Successful
+ ok: Successful
+ warning: Warning
+ failed: Failed
+ running: Running
+ aborted: Aborted
+ canceled: Canceled
activerecord:
models:
import:
diff --git a/config/locales/imports.fr.yml b/config/locales/imports.fr.yml
index 733254fa4..870896111 100644
--- a/config/locales/imports.fr.yml
+++ b/config/locales/imports.fr.yml
@@ -41,6 +41,17 @@ fr:
warning: "Alerte"
error: "Erreur"
fatal: "Fatal"
+ status:
+ new: Nouveau
+ pending: En attente
+ successful: Succès
+ ok: Succès
+ warning: Avertissement
+ failed: Échec
+ error: Échec
+ running: En cours
+ aborted: Annulé
+ canceled: Annulé
import:
base:
<<: *imports
diff --git a/config/locales/layouts.en.yml b/config/locales/layouts.en.yml
index 31bff403c..70e95646e 100644
--- a/config/locales/layouts.en.yml
+++ b/config/locales/layouts.en.yml
@@ -23,6 +23,7 @@ en:
workbench_output:
organisation: Organisation offers
workgroup: Workgroup offers
+ edit_workgroup: Application settings
tools: Tools
sync: Synchronization
sync_icar: iCAR synchronization
diff --git a/config/locales/layouts.fr.yml b/config/locales/layouts.fr.yml
index 019c72701..810ede34c 100644
--- a/config/locales/layouts.fr.yml
+++ b/config/locales/layouts.fr.yml
@@ -23,6 +23,7 @@ fr:
workbench_outputs:
organisation: Offre de mon organisation
workgroup: Offre du groupe de travail
+ edit_workgroup: Paramétrages de l'application
tools: Outils
sync: Synchronisation
sync_icar: Synchronisation iCAR
diff --git a/config/locales/workbenches.en.yml b/config/locales/workbenches.en.yml
index 876f18766..99df24397 100644
--- a/config/locales/workbenches.en.yml
+++ b/config/locales/workbenches.en.yml
@@ -4,6 +4,7 @@ en:
title: "Transport offer %{name}"
edit:
title: "Configure the workbench"
+ link: "Settings"
update:
title: "Configure the workbench"
referential_count:
@@ -33,4 +34,3 @@ en:
workbench:
import_compliance_control_set_id: Space data before import
merge_compliance_control_set_id: Space data before merge
-
diff --git a/config/locales/workbenches.fr.yml b/config/locales/workbenches.fr.yml
index 1d97ab623..e7e836169 100644
--- a/config/locales/workbenches.fr.yml
+++ b/config/locales/workbenches.fr.yml
@@ -4,6 +4,7 @@ fr:
title: "Offre de transport %{name}"
edit:
title: "Configurer l'espace de travail"
+ link: "Paramétrages"
update:
title: "Configurer l'espace de travail"
referential_count:
diff --git a/config/locales/workgroups.en.yml b/config/locales/workgroups.en.yml
new file mode 100644
index 000000000..935f1a5fa
--- /dev/null
+++ b/config/locales/workgroups.en.yml
@@ -0,0 +1,12 @@
+en:
+ workgroups:
+ edit:
+ title: "Paramétrages de l'application"
+ compliance_control_sets:
+ after_import: after import
+ after_import_by_workgroup: after import (group)
+ before_merge: before merge
+ before_merge_by_workgroup: before merge (group)
+ after_merge: after merge
+ after_merge_by_workgroup: after merge (group)
+ automatic_by_workgroup: automatic
diff --git a/config/locales/workgroups.fr.yml b/config/locales/workgroups.fr.yml
new file mode 100644
index 000000000..d209410e7
--- /dev/null
+++ b/config/locales/workgroups.fr.yml
@@ -0,0 +1,12 @@
+fr:
+ workgroups:
+ edit:
+ title: "Paramétrages de l'application"
+ compliance_control_sets:
+ after_import: après import
+ after_import_by_workgroup: après import (groupe)
+ before_merge: avant finalisation
+ before_merge_by_workgroup: avant finalisation (groupe)
+ after_merge: après finalisation
+ after_merge_by_workgroup: après finalisation (groupe)
+ automatic_by_workgroup: automatique
diff --git a/config/routes.rb b/config/routes.rb
index 41b345aa5..cde1701f8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -5,7 +5,7 @@ ChouetteIhm::Application.routes.draw do
delete :referentials, on: :member, action: :delete_referentials
resources :imports do
get :download, on: :member
- resources :import_resources, only: [:index] do
+ resources :import_resources, only: [:index, :show] do
resources :import_messages, only: [:index]
end
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-28 02:53:48 +0000