aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/controllers/compliance_check_tasks_controller.rb4
-rw-r--r--app/controllers/compliance_checks_controller.rb6
-rw-r--r--app/controllers/export_tasks_controller.rb4
-rw-r--r--app/controllers/exports_controller.rb8
-rw-r--r--app/controllers/imports_controller.rb12
-rw-r--r--config/locales/iev.en.yml25
-rw-r--r--lib/ievkit/error.rb8
7 files changed, 43 insertions, 24 deletions
diff --git a/app/controllers/compliance_check_tasks_controller.rb b/app/controllers/compliance_check_tasks_controller.rb
index 6c25d2d48..c2995c94d 100644
--- a/app/controllers/compliance_check_tasks_controller.rb
+++ b/app/controllers/compliance_check_tasks_controller.rb
@@ -11,7 +11,7 @@ class ComplianceCheckTasksController < ChouetteController
new!
rescue Ievkit::Error, Faraday::Error => error
logger.error("Iev failure : #{error.message}")
- flash[:error] = t('iev.exception.default')
+ flash[:error] = t(error.locale_for_error)
redirect_to referential_path(@referential)
end
end
@@ -23,7 +23,7 @@ class ComplianceCheckTasksController < ChouetteController
end
rescue Ievkit::Error, Faraday::Error => error
logger.error("Iev failure : #{error.message}")
- flash[:error] = t('iev.exception.default')
+ flash[:error] = t(error.locale_for_error)
redirect_to referential_path(@referential)
end
end
diff --git a/app/controllers/compliance_checks_controller.rb b/app/controllers/compliance_checks_controller.rb
index d8f8d17b2..2d67aae98 100644
--- a/app/controllers/compliance_checks_controller.rb
+++ b/app/controllers/compliance_checks_controller.rb
@@ -14,7 +14,7 @@ class ComplianceChecksController < ChouetteController
end
rescue Ievkit::Error, Faraday::Error => error
logger.error("Iev failure : #{error.message}")
- flash[:error] = t('iev.exception.default')
+ flash[:error] = t(error.locale_for_error)
redirect_to referential_path(@referential)
end
end
@@ -26,7 +26,7 @@ class ComplianceChecksController < ChouetteController
end
rescue Ievkit::Error, Faraday::Error => error
logger.error("Iev failure : #{error.message}")
- flash[:error] = t('iev.exception.default')
+ flash[:error] = t(error.locale_for_error)
redirect_to referential_path(@referential)
end
end
@@ -52,7 +52,7 @@ class ComplianceChecksController < ChouetteController
render "rule_parameter_sets/show"
rescue Ievkit::Error, Faraday::Error => error
logger.error("Iev failure : #{error.message}")
- flash[:error] = t('iev.exception.default')
+ flash[:error] = t(error.locale_for_error)
redirect_to referential_path(@referential)
end
end
diff --git a/app/controllers/export_tasks_controller.rb b/app/controllers/export_tasks_controller.rb
index 9eedd1b94..2b30a5605 100644
--- a/app/controllers/export_tasks_controller.rb
+++ b/app/controllers/export_tasks_controller.rb
@@ -11,7 +11,7 @@ class ExportTasksController < ChouetteController
new!
rescue Ievkit::Error, Faraday::Error => error
logger.error("Iev failure : #{error.message}")
- flash[:error] = t('iev.exception.default')
+ flash[:error] = t(error.locale_for_error)
redirect_to referential_path(@referential)
end
end
@@ -24,7 +24,7 @@ class ExportTasksController < ChouetteController
end
rescue Ievkit::Error, Faraday::Error => error
logger.error("Iev failure : #{error.message}")
- flash[:error] = t('iev.exception.default')
+ flash[:error] = t(error.locale_for_error)
redirect_to referential_path(@referential)
end
end
diff --git a/app/controllers/exports_controller.rb b/app/controllers/exports_controller.rb
index f91d84250..2cfa0b6fa 100644
--- a/app/controllers/exports_controller.rb
+++ b/app/controllers/exports_controller.rb
@@ -15,7 +15,7 @@ class ExportsController < ChouetteController
end
rescue Ievkit::Error, Faraday::Error => error
logger.error("Iev failure : #{error.message}")
- flash[:error] = t('iev.exception.default')
+ flash[:error] = t(error.locale_for_error)
redirect_to referential_path(@referential)
end
end
@@ -27,7 +27,7 @@ class ExportsController < ChouetteController
end
rescue Ievkit::Error, Faraday::Error => error
logger.error("Iev failure : #{error.message}")
- flash[:error] = t('iev.exception.default')
+ flash[:error] = t(error.locale_for_error)
redirect_to referential_path(@referential)
end
end
@@ -37,7 +37,7 @@ class ExportsController < ChouetteController
destroy!
rescue Ievkit::Error, Faraday::Error => error
logger.error("Iev failure : #{error.message}")
- flash[:error] = t('iev.exception.default')
+ flash[:error] = t(error.locale_for_error)
redirect_to referential_path(@referential)
end
end
@@ -51,7 +51,7 @@ class ExportsController < ChouetteController
send_file open(resource.file_path), { :type => "application/#{resource.filename_extension}", :disposition => "attachment", :filename => resource.filename }
rescue Ievkit::Error, Faraday::Error => error
logger.error("Iev failure : #{error.message}")
- flash[:error] = t('iev.exception.default')
+ flash[:error] = t(error.locale_for_error)
redirect_to referential_path(@referential)
end
end
diff --git a/app/controllers/imports_controller.rb b/app/controllers/imports_controller.rb
index ea91d8d8b..757e7f09e 100644
--- a/app/controllers/imports_controller.rb
+++ b/app/controllers/imports_controller.rb
@@ -16,7 +16,7 @@ class ImportsController < ChouetteController
end
rescue Ievkit::Error, Faraday::Error => error
logger.error("Iev failure : #{error.message}")
- flash[:error] = t('iev.exception.default')
+ flash[:error] = t(error.locale_for_error)
redirect_to referential_path(@referential)
end
end
@@ -28,7 +28,7 @@ class ImportsController < ChouetteController
end
rescue Ievkit::Error, Faraday::Error => error
logger.error("Iev failure : #{error.message}")
- flash[:error] = t('iev.exception.default')
+ flash[:error] = t(error.locale_for_error)
redirect_to referential_path(@referential)
end
end
@@ -38,7 +38,7 @@ class ImportsController < ChouetteController
destroy!
rescue Ievkit::Error, Faraday::Error => error
logger.error("Iev failure : #{error.message}")
- flash[:error] = t('iev.exception.default')
+ flash[:error] = t(error.locale_for_error)
redirect_to referential_path(@referential)
end
end
@@ -52,7 +52,7 @@ class ImportsController < ChouetteController
send_file open(resource.file_path), { :type => "application/#{resource.filename_extension}", :disposition => "attachment", :filename => resource.filename }
rescue Ievkit::Error, Faraday::Error => error
logger.error("Iev failure : #{error.message}")
- flash[:error] = t('iev.exception.default')
+ flash[:error] = t(error.locale_for_error)
redirect_to referential_path(@referential)
end
end
@@ -64,7 +64,7 @@ class ImportsController < ChouetteController
render "rule_parameter_sets/show"
rescue Ievkit::Error, Faraday::Error => error
logger.error("Iev failure : #{error.message}")
- flash[:error] = t('iev.exception.default')
+ flash[:error] = t(error.locale_for_error)
redirect_to referential_path(@referential)
end
end
@@ -82,7 +82,7 @@ class ImportsController < ChouetteController
render "compliance_checks/report"
rescue Ievkit::Error, Faraday::Error => error
logger.error("Iev failure : #{error.message}")
- flash[:error] = t('iev.exception.default')
+ flash[:error] = t(error.locale_for_error)
redirect_to referential_path(@referential)
end
end
diff --git a/config/locales/iev.en.yml b/config/locales/iev.en.yml
index 8e58196cb..eb1aaa10f 100644
--- a/config/locales/iev.en.yml
+++ b/config/locales/iev.en.yml
@@ -1,11 +1,22 @@
en:
iev:
failure:
- invalid_parameters: "Paramètres invalides"
- no_data_found: "Pas de données à traiter dans l'ensemble du traitement"
- no_data_proceeded: "Pas de données traitée dans l'ensemble du traitement"
- invalid_data: "Données invalides"
- internal_error: "Erreur interne"
+ invalid_parameters: "Invalid parameters"
+ no_data_found: "No data to be processed in the entire treatment"
+ no_data_proceeded: "No data processed in the overall treatment"
+ invalid_data: "Invalid data"
+ internal_error: "Internal Error"
exception:
- default: "Impossible d'accéder au service IEV"
- \ No newline at end of file
+ default: "Can not access IEV Service"
+ invalid_request: "Invalid request"
+ unknown_referential: "Unknown repository"
+ unknown_file: "Unknown file"
+ unknown_action: "Action or unknown type"
+ dupplicate_or_missing_data: "Missing data or duplicate"
+ dupplicate_parameters: "Parameters provided in double"
+ missing_parameters: "Missing action parameters"
+ invalid_parameters: "Incorrect action settings"
+ unreadable_parameters: "Unreadable parameters ( wrong format)"
+ unknown_job: "Unknown job number"
+ scheduled_job: "Prohibited Method on an unfinished job"
+ internal_error: "Internal Error"
diff --git a/lib/ievkit/error.rb b/lib/ievkit/error.rb
index c758ec71d..9550944ff 100644
--- a/lib/ievkit/error.rb
+++ b/lib/ievkit/error.rb
@@ -81,6 +81,14 @@ module Ievkit
end
end
+ def locale_for_error
+ if self.class.eql? Ievkit::NotFound
+ 'iev.exception.unknown_job'
+ else
+ 'iev.exception.default'
+ end
+ end
+
private
def data
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-01 04:10:09 +0000