Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
d252b99a
Commit
d252b99a
authored
Apr 30, 2019
by
Dylan Griffith
Committed by
Stan Hu
Apr 29, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Internationalize errors CheckUninstallProgressService
parent
f84fae13
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
4 deletions
+13
-4
app/services/clusters/applications/check_uninstall_progress_service.rb
...clusters/applications/check_uninstall_progress_service.rb
+4
-4
locale/gitlab.pot
locale/gitlab.pot
+9
-0
No files found.
app/services/clusters/applications/check_uninstall_progress_service.rb
View file @
d252b99a
...
@@ -17,7 +17,7 @@ module Clusters
...
@@ -17,7 +17,7 @@ module Clusters
rescue
Kubeclient
::
HttpError
=>
e
rescue
Kubeclient
::
HttpError
=>
e
log_error
(
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
end
private
private
...
@@ -25,18 +25,18 @@ module Clusters
...
@@ -25,18 +25,18 @@ module Clusters
def
on_success
def
on_success
app
.
destroy!
app
.
destroy!
rescue
StandardError
=>
e
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
ensure
remove_installation_pod
remove_installation_pod
end
end
def
on_failed
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
end
def
check_timeout
def
check_timeout
if
timed_out?
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
else
WaitForUninstallAppWorker
.
perform_in
(
WaitForUninstallAppWorker
::
INTERVAL
,
app
.
name
,
app
.
id
)
WaitForUninstallAppWorker
.
perform_in
(
WaitForUninstallAppWorker
::
INTERVAL
,
app
.
name
,
app
.
id
)
end
end
...
...
locale/gitlab.pot
View file @
d252b99a
...
@@ -942,6 +942,9 @@ msgstr ""
...
@@ -942,6 +942,9 @@ msgstr ""
msgid "Application settings saved successfully"
msgid "Application settings saved successfully"
msgstr ""
msgstr ""
msgid "Application uninstalled but failed to destroy: %{error_message}"
msgstr ""
msgid "Application was successfully destroyed."
msgid "Application was successfully destroyed."
msgstr ""
msgstr ""
...
@@ -6274,6 +6277,12 @@ msgstr ""
...
@@ -6274,6 +6277,12 @@ msgstr ""
msgid "Opens in a new window"
msgid "Opens in a new window"
msgstr ""
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"
msgid "Operations"
msgstr ""
msgstr ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment