summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Griffith <dyl.griffith@gmail.com>2019-04-30 14:49:26 +1000
committerStan Hu <stanhu@gmail.com>2019-04-29 22:55:13 -0700
commitd252b99a0eb739e277b7453c99ac78c592ed2e03 (patch)
tree1030a723d6afa3d724201c451ba887a46eae10e8
parentf84fae1386eec1b22c1405a8b87beb30d8f10519 (diff)
downloadgitlab-ce-d252b99a0eb739e277b7453c99ac78c592ed2e03.tar.gz
Internationalize errors CheckUninstallProgressService
-rw-r--r--app/services/clusters/applications/check_uninstall_progress_service.rb8
-rw-r--r--locale/gitlab.pot9
2 files changed, 13 insertions, 4 deletions
diff --git a/app/services/clusters/applications/check_uninstall_progress_service.rb b/app/services/clusters/applications/check_uninstall_progress_service.rb
index 022cc754af9..12245ec90c3 100644
--- a/app/services/clusters/applications/check_uninstall_progress_service.rb
+++ b/app/services/clusters/applications/check_uninstall_progress_service.rb
@@ -17,7 +17,7 @@ module Clusters
rescue Kubeclient::HttpError => e
log_error(e)
- app.make_errored!("Kubernetes error: #{e.error_code}")
+ app.make_errored!(_('Kubernetes error: %{error_code}') % { error_code: e.error_code })
end
private
@@ -25,18 +25,18 @@ module Clusters
def on_success
app.destroy!
rescue StandardError => e
- app.make_errored!("Application uninstalled but failed to destroy: #{e.message}")
+ app.make_errored!(_('Application uninstalled but failed to destroy: %{error_message}') % { error_message: e.message })
ensure
remove_installation_pod
end
def on_failed
- app.make_errored!("Operation failed. Check pod logs for #{pod_name} for more details.")
+ app.make_errored!(_('Operation failed. Check pod logs for %{pod_name} for more details.') % { pod_name: pod_name })
end
def check_timeout
if timed_out?
- app.make_errored!("Operation timed out. Check pod logs for #{pod_name} for more details.")
+ app.make_errored!(_('Operation timed out. Check pod logs for %{pod_name} for more details.') % { pod_name: pod_name })
else
WaitForUninstallAppWorker.perform_in(WaitForUninstallAppWorker::INTERVAL, app.name, app.id)
end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index c8b583575c8..3d56efa9834 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -942,6 +942,9 @@ msgstr ""
msgid "Application settings saved successfully"
msgstr ""
+msgid "Application uninstalled but failed to destroy: %{error_message}"
+msgstr ""
+
msgid "Application was successfully destroyed."
msgstr ""
@@ -6274,6 +6277,12 @@ msgstr ""
msgid "Opens in a new window"
msgstr ""
+msgid "Operation failed. Check pod logs for %{pod_name} for more details."
+msgstr ""
+
+msgid "Operation timed out. Check pod logs for %{pod_name} for more details."
+msgstr ""
+
msgid "Operations"
msgstr ""