diff options
author | Fatih Acet <acetfatih@gmail.com> | 2019-01-29 01:36:31 +0100 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2019-01-30 23:18:20 +0100 |
commit | c352e7e1621dfb3de97518eb46ca513503995ccf (patch) | |
tree | 21c79f7e55e928dc538cef4d92db3c38a70903ec /app/assets/javascripts/issue_show/components/app.vue | |
parent | 992fcf6c87721405be59d2a22da7d21157e17f45 (diff) | |
download | gitlab-ce-c352e7e1621dfb3de97518eb46ca513503995ccf.tar.gz |
Some cleanup and improvements on frontent logic
Diffstat (limited to 'app/assets/javascripts/issue_show/components/app.vue')
-rw-r--r-- | app/assets/javascripts/issue_show/components/app.vue | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/assets/javascripts/issue_show/components/app.vue b/app/assets/javascripts/issue_show/components/app.vue index c2c80218a87..5dbe206c6f9 100644 --- a/app/assets/javascripts/issue_show/components/app.vue +++ b/app/assets/javascripts/issue_show/components/app.vue @@ -1,5 +1,6 @@ <script> import Visibility from 'visibilityjs'; +import { s__, sprintf } from '~/locale'; import { visitUrl } from '../../lib/utils/url_utility'; import Poll from '../../lib/utils/poll'; import eventHub from '../event_hub'; @@ -166,6 +167,9 @@ export default { const titleChanged = this.initialTitleText !== this.store.formState.title; return descriptionChanged || titleChanged; }, + defaultErrorMessage() { + return sprintf(s__('Error updating %{issuableType}.'), { issuableType: this.issuableType }); + }, }, created() { this.service = new Service(this.endpoint); @@ -220,9 +224,7 @@ export default { this.store.updateState(data); }) .catch(() => { - const errMsg = `Error updating ${this.issuableType}`; - - window.Flash(errMsg); + window.Flash(this.defaultErrorMessage); }); }, @@ -260,10 +262,10 @@ export default { if (error && error.name === 'SpamError') { this.openRecaptcha(); } else { - let errMsg = `Error updating ${this.issuableType}`; + let errMsg = this.defaultErrorMessage; if (error && error.response && error.response.data && error.response.data.errors) { - errMsg = error.response.data.errors; + errMsg += error.response.data.errors.join(' '); } eventHub.$emit('close.form'); |