diff options
| author | Luc Donnet | 2017-09-13 16:56:23 +0200 |
|---|---|---|
| committer | Luc Donnet | 2017-09-13 16:56:23 +0200 |
| commit | 3b7bbba3ce2f0a532ac7a8e7d1116e563526f112 (patch) | |
| tree | b49075ec37573ca7174794e3db6b7da12d92d583 /config | |
| parent | 5ee3a180de710d23ceb7660b1bcc454701b42d87 (diff) | |
| parent | 4804a4886c5267c1be1c367caaf35c17c681d179 (diff) | |
| download | chouette-core-3b7bbba3ce2f0a532ac7a8e7d1116e563526f112.tar.bz2 | |
Merge branch 'master' of github.com:AF83/stif-boiv
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/apartment.rb | 9 | ||||
| -rw-r--r-- | config/locales/imports.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/imports.fr.yml | 1 | ||||
| -rw-r--r-- | config/locales/routes.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/routes.fr.yml | 2 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
6 files changed, 15 insertions, 1 deletions
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb index e1e86449c..0d65c3505 100644 --- a/config/initializers/apartment.rb +++ b/config/initializers/apartment.rb @@ -46,7 +46,14 @@ Apartment.configure do |config| 'NetexImport', 'WorkbenchImport', 'ImportMessage', - 'ImportResource' + 'ImportResource', + 'ComplianceControl', + 'ComplianceControlSet', + 'ComplianceControlBlock', + 'ComplianceCheck', + 'ComplianceCheckSet', + 'ComplianceCheckBlock', + 'ComplianceCheckResource', ] # use postgres schemas? diff --git a/config/locales/imports.en.yml b/config/locales/imports.en.yml index b92b8843f..9bf877c86 100644 --- a/config/locales/imports.en.yml +++ b/config/locales/imports.en.yml @@ -4,6 +4,7 @@ en: filters: referential: "Select data space..." name_or_creator_cont: "Select an import or creator name..." + error_period_filter: "End date must be greater or equal than begin date" actions: new: "New import" show: "Import report" diff --git a/config/locales/imports.fr.yml b/config/locales/imports.fr.yml index f7bf8c178..6998c89d2 100644 --- a/config/locales/imports.fr.yml +++ b/config/locales/imports.fr.yml @@ -4,6 +4,7 @@ fr: filters: referential: "Sélectionnez un jeu de données..." name_or_creator_cont: "Indiquez un nom d'import ou d'opérateur..." + error_period_filter: "La date de fin doit être supérieure ou égale à la date de début" actions: new: "Nouvel import" show: "Rapport d'import" diff --git a/config/locales/routes.en.yml b/config/locales/routes.en.yml index 3099d4ab1..e94adf490 100644 --- a/config/locales/routes.en.yml +++ b/config/locales/routes.en.yml @@ -32,6 +32,8 @@ en: stop_area_name: "Stop area name" for_boarding: "Boarding" for_alighting: "Alighting" + duplicate: + title: "Duplicate route" route: no_journey_pattern: "No Journey pattern" wayback: diff --git a/config/locales/routes.fr.yml b/config/locales/routes.fr.yml index 0af2832a2..a494e60ec 100644 --- a/config/locales/routes.fr.yml +++ b/config/locales/routes.fr.yml @@ -32,6 +32,8 @@ fr: stop_area_name: "Nom de l'arrêt" for_boarding: "Montée" for_alighting: "Descente" + duplicate: + title: "Dupliquer l'itinéraire" route: no_journey_pattern: "Pas de mission" wayback: diff --git a/config/routes.rb b/config/routes.rb index 4fcd649a7..0f1b22e44 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -118,6 +118,7 @@ ChouetteIhm::Application.routes.draw do member do get 'edit_boarding_alighting' put 'save_boarding_alighting' + post 'duplicate', to: 'routes#duplicate' end resource :journey_patterns_collection, :only => [:show, :update] resources :journey_patterns do |