Commit 63a12161 authored by ngaskill's avatar ngaskill Committed by Jose Vargas

Edit to UI text for Incidents

parent 4f7e8687
...@@ -29,12 +29,12 @@ const units = { ...@@ -29,12 +29,12 @@ const units = {
export default { export default {
i18n: { i18n: {
description: s__( description: s__(
'IncidentSettings|You may choose to introduce a countdown timer in incident issues to better track Service Level Agreements (SLAs). The timer is automatically started when the incident is created, and sets a time limit for the incident to be resolved in. When activated, "time to SLA" countdown will appear on all new incidents.', 'IncidentSettings|Introduce a countdown timer in incident issues to better track Service Level Agreements (SLAs). The timer starts automatically when the incident is created, and sets a time limit for resolving the incident. When activated, the time to SLA countdown appears on all new incidents.',
), ),
checkboxDetail: s__( checkboxDetail: s__(
'IncidentSettings|When activated, this will apply to all new incidents within the project', 'IncidentSettings|When activated, this applies to all new incidents in the project.',
), ),
validFeedback: s__('IncidentSettings|Time limit must be a multiple of 15 minutes'), validFeedback: s__('IncidentSettings|Time limit must be a multiple of 15 minutes.'),
}, },
selectOptions: Object.values(units), selectOptions: Object.values(units),
units, units,
...@@ -71,17 +71,17 @@ export default { ...@@ -71,17 +71,17 @@ export default {
// This checks for empty and non-number values, because input elements of // This checks for empty and non-number values, because input elements of
// type 'number' automatically convert a non-number input to an empty string. // type 'number' automatically convert a non-number input to an empty string.
if (this.duration === '') { if (this.duration === '') {
return s__('IncidentSettings|Time limit must be a valid number'); return s__('IncidentSettings|Time limit must be a valid number.');
} }
if (this.duration <= 0) { if (this.duration <= 0) {
return s__('IncidentSettings|Time limit must be greater than 0'); return s__('IncidentSettings|Time limit must be greater than 0.');
} }
// We're looking for a minutes value provided in multiples of 15 // We're looking for a minutes value provided in multiples of 15
const minutes = this.duration * this.$options.units[this.unit].multiplier; const minutes = this.duration * this.$options.units[this.unit].multiplier;
if (minutes % 15 !== 0) { if (minutes % 15 !== 0) {
return s__('IncidentSettings|Time limit must be a multiple of 15 minutes'); return s__('IncidentSettings|Time limit must be a multiple of 15 minutes.');
} }
return ''; return '';
......
---
title: Updated UI text to match style guidelines
merge_request: 58509
author:
type: other
...@@ -12,7 +12,7 @@ exports[`Alert integration settings form should match the default snapshot 1`] = ...@@ -12,7 +12,7 @@ exports[`Alert integration settings form should match the default snapshot 1`] =
class="gl-line-height-20" class="gl-line-height-20"
> >
You may choose to introduce a countdown timer in incident issues to better track Service Level Agreements (SLAs). The timer is automatically started when the incident is created, and sets a time limit for the incident to be resolved in. When activated, "time to SLA" countdown will appear on all new incidents. Introduce a countdown timer in incident issues to better track Service Level Agreements (SLAs). The timer starts automatically when the incident is created, and sets a time limit for resolving the incident. When activated, the time to SLA countdown appears on all new incidents.
</p> </p>
...@@ -30,7 +30,7 @@ exports[`Alert integration settings form should match the default snapshot 1`] = ...@@ -30,7 +30,7 @@ exports[`Alert integration settings form should match the default snapshot 1`] =
textvariant="muted" textvariant="muted"
> >
When activated, this will apply to all new incidents within the project When activated, this applies to all new incidents in the project.
</gl-form-text-stub> </gl-form-text-stub>
</gl-form-checkbox-stub> </gl-form-checkbox-stub>
......
...@@ -16584,6 +16584,9 @@ msgstr "" ...@@ -16584,6 +16584,9 @@ msgstr ""
msgid "IncidentSettings|Incidents" msgid "IncidentSettings|Incidents"
msgstr "" msgstr ""
msgid "IncidentSettings|Introduce a countdown timer in incident issues to better track Service Level Agreements (SLAs). The timer starts automatically when the incident is created, and sets a time limit for resolving the incident. When activated, the time to SLA countdown appears on all new incidents."
msgstr ""
msgid "IncidentSettings|PagerDuty integration" msgid "IncidentSettings|PagerDuty integration"
msgstr "" msgstr ""
...@@ -16593,19 +16596,16 @@ msgstr "" ...@@ -16593,19 +16596,16 @@ msgstr ""
msgid "IncidentSettings|Time limit" msgid "IncidentSettings|Time limit"
msgstr "" msgstr ""
msgid "IncidentSettings|Time limit must be a multiple of 15 minutes" msgid "IncidentSettings|Time limit must be a multiple of 15 minutes."
msgstr ""
msgid "IncidentSettings|Time limit must be a valid number"
msgstr "" msgstr ""
msgid "IncidentSettings|Time limit must be greater than 0" msgid "IncidentSettings|Time limit must be a valid number."
msgstr "" msgstr ""
msgid "IncidentSettings|When activated, this will apply to all new incidents within the project" msgid "IncidentSettings|Time limit must be greater than 0."
msgstr "" msgstr ""
msgid "IncidentSettings|You may choose to introduce a countdown timer in incident issues to better track Service Level Agreements (SLAs). The timer is automatically started when the incident is created, and sets a time limit for the incident to be resolved in. When activated, \"time to SLA\" countdown will appear on all new incidents." msgid "IncidentSettings|When activated, this applies to all new incidents in the project."
msgstr "" msgstr ""
msgid "IncidentSettings|hours" msgid "IncidentSettings|hours"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment