summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/projects/settings_service_desk/components
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/projects/settings_service_desk/components')
-rw-r--r--app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue6
-rw-r--r--app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue11
2 files changed, 7 insertions, 10 deletions
diff --git a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue
index a07c57c42cb..909f1afd9f6 100644
--- a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue
+++ b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue
@@ -108,11 +108,11 @@ export default {
.updateTemplate({ selectedTemplate, outgoingName, projectKey }, this.isEnabled)
.then(({ data }) => {
this.updatedCustomEmail = data?.service_desk_address;
- this.showAlert(__('Changes were successfully made.'), 'success');
+ this.showAlert(__('Changes saved.'), 'success');
})
- .catch(err => {
+ .catch((err) => {
this.showAlert(
- sprintf(__('An error occured while making the changes: %{error}'), {
+ sprintf(__('An error occured while saving changes: %{error}'), {
error: err?.response?.data?.message,
}),
);
diff --git a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
index 2896cb491b5..a850374fc88 100644
--- a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
+++ b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
@@ -103,7 +103,6 @@ export default {
id="service-desk-checkbox"
:value="isEnabled"
class="d-inline-block align-middle mr-1"
- label="Service desk"
label-position="left"
@change="onCheckboxToggle"
/>
@@ -113,7 +112,7 @@ export default {
<div v-if="isEnabled" class="row mt-3">
<div class="col-md-9 mb-0">
<strong id="incoming-email-describer" class="d-block mb-1">
- {{ __('Forward external support email address to') }}
+ {{ __('Email address to use for Support Desk') }}
</strong>
<template v-if="email">
<div class="input-group">
@@ -137,7 +136,7 @@ export default {
</div>
</div>
<span v-if="hasCustomEmail" class="form-text text-muted">
- <gl-sprintf :message="__('Emails sent to %{email} will still be supported')">
+ <gl-sprintf :message="__('Emails sent to %{email} are also supported.')">
<template #email>
<code>{{ incomingEmail }}</code>
</template>
@@ -156,9 +155,7 @@ export default {
<input id="service-desk-project-suffix" v-model.trim="projectKey" class="form-control" />
<span class="form-text text-muted">
{{
- __(
- 'Project name suffix is a user-defined string which will be appended to the project path, and will form the Service Desk email address.',
- )
+ __('A string appended to the project path to form the Service Desk email address.')
}}
</span>
</template>
@@ -176,7 +173,7 @@ export default {
</label>
<input id="service-desk-email-from-name" v-model.trim="outgoingName" class="form-control" />
<span class="form-text text-muted">
- {{ __('Emails sent from Service Desk will have this name') }}
+ {{ __('Emails sent from Service Desk have this name.') }}
</span>
<div class="gl-display-flex gl-justify-content-end">
<gl-button