diff options
| author | Luc Donnet | 2015-03-03 18:00:35 +0100 |
|---|---|---|
| committer | Luc Donnet | 2015-03-03 18:00:35 +0100 |
| commit | 20a7080ea63d4887e578fea37751487d817b0695 (patch) | |
| tree | 33ba2ac865d037ecc77c1b5e87d6ecdfd48e60df /config | |
| parent | 1f5fe2715c6dd51fa04244085faa6027528a9fe5 (diff) | |
| download | chouette-core-20a7080ea63d4887e578fea37751487d817b0695.tar.bz2 | |
Initialize import show with iev api
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/apartment.rb | 2 | ||||
| -rw-r--r-- | config/locales/import_tasks.yml | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb index 03ae0ed0a..6d2eff31a 100644 --- a/config/initializers/apartment.rb +++ b/config/initializers/apartment.rb @@ -17,7 +17,7 @@ Apartment.configure do |config| # # config.excluded_models = %w{Tenant} # - config.excluded_models = ["Referential", "Organisation", "User", "ImportTask", "Export", "ExportLogMessage","ComplianceCheckTask", "ComplianceCheckResult", "Delayed::Backend::ActiveRecord::Job", "Api::V1::ApiKey", "RuleParameterSet"] + config.excluded_models = ["Referential", "Organisation", "User", "ImportTask", "ComplianceCheckTask", "ComplianceCheckResult", "Delayed::Backend::ActiveRecord::Job", "Api::V1::ApiKey", "RuleParameterSet"] # use postgres schemas? config.use_schemas = true diff --git a/config/locales/import_tasks.yml b/config/locales/import_tasks.yml index df81a28d1..d016d9664 100644 --- a/config/locales/import_tasks.yml +++ b/config/locales/import_tasks.yml @@ -40,10 +40,11 @@ en: vehicle_journeys_stats: "Vehicle Journeys" journey_patterns_stats: "Journey Patterns" statuses: - pending: "Pending" - processing: "Processing" - completed: "Completed" - failed: "Failed" + created: "Pending ..." + scheduled: "Processing ..." + terminated: "Completed" + canceled: "Canceled" + aborted: "Failed" compliance_check_task: "Validate Report" severities: info: "Information" @@ -150,10 +151,11 @@ fr: saved: "Sauvé" save_error: "Sauvegarde en erreur" statuses: - pending: "En attente ..." - processing: "En cours ..." - completed: "Achevé" - failed: "Echoué" + created: "En attente ..." + scheduled: "En cours ..." + terminated: "Achevé" + canceled: "Annulé" + aborted: "Echoué" compliance_check_task: "Validation" severities: info: "Information" |