Commit e8068a8c authored by Jacques Erasmus's avatar Jacques Erasmus

Merge branch 'msj-todo-alerts' into 'master'

Turn "To-Do" to "to do" in alert sidebar and error

See merge request gitlab-org/gitlab!53037
parents 83d210a9 635286d9
...@@ -27,7 +27,7 @@ export default { ...@@ -27,7 +27,7 @@ export default {
<template> <template>
<div class="block gl-display-flex gl-justify-content-space-between"> <div class="block gl-display-flex gl-justify-content-space-between">
<span class="issuable-header-text hide-collapsed"> <span class="issuable-header-text hide-collapsed">
{{ __('To-Do') }} {{ __('To Do') }}
</span> </span>
<sidebar-todo <sidebar-todo
v-if="!sidebarCollapsed" v-if="!sidebarCollapsed"
......
...@@ -9,7 +9,7 @@ import alertQuery from '../../graphql/queries/details.query.graphql'; ...@@ -9,7 +9,7 @@ import alertQuery from '../../graphql/queries/details.query.graphql';
export default { export default {
i18n: { i18n: {
UPDATE_ALERT_TODO_ERROR: s__( UPDATE_ALERT_TODO_ERROR: s__(
'AlertManagement|There was an error while updating the To-Do of the alert.', 'AlertManagement|There was an error while updating the to-do item of the alert.',
), ),
}, },
components: { components: {
......
---
title: Fix formatting of "to do" in alert sidebar and error
merge_request: 53037
author:
type: fixed
...@@ -2576,9 +2576,6 @@ msgstr "" ...@@ -2576,9 +2576,6 @@ msgstr ""
msgid "AlertManagement|There was an error displaying the alerts. Confirm your endpoint's configuration details to ensure alerts appear." msgid "AlertManagement|There was an error displaying the alerts. Confirm your endpoint's configuration details to ensure alerts appear."
msgstr "" msgstr ""
msgid "AlertManagement|There was an error while updating the To-Do of the alert."
msgstr ""
msgid "AlertManagement|There was an error while updating the assignee(s) list. Please try again." msgid "AlertManagement|There was an error while updating the assignee(s) list. Please try again."
msgstr "" msgstr ""
...@@ -2588,6 +2585,9 @@ msgstr "" ...@@ -2588,6 +2585,9 @@ msgstr ""
msgid "AlertManagement|There was an error while updating the status of the alert." msgid "AlertManagement|There was an error while updating the status of the alert."
msgstr "" msgstr ""
msgid "AlertManagement|There was an error while updating the to-do item of the alert."
msgstr ""
msgid "AlertManagement|This assignee cannot be assigned to this alert." msgid "AlertManagement|This assignee cannot be assigned to this alert."
msgstr "" msgstr ""
...@@ -30382,9 +30382,6 @@ msgstr "" ...@@ -30382,9 +30382,6 @@ msgstr ""
msgid "To widen your search, change or remove filters." msgid "To widen your search, change or remove filters."
msgstr "" msgstr ""
msgid "To-Do"
msgstr ""
msgid "To-Do List" msgid "To-Do List"
msgstr "" msgstr ""
......
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