Commit 57a1150a authored by Savas Vedova's avatar Savas Vedova

Merge branch 'msj-todo-design-errors' into 'master'

Change "to-do" formatting in Design error messages and sidebar

See merge request gitlab-org/gitlab!53040
parents 88fe0666 e34e0351
...@@ -44,13 +44,13 @@ export const MOVE_DESIGN_ERROR = __( ...@@ -44,13 +44,13 @@ export const MOVE_DESIGN_ERROR = __(
'Something went wrong when reordering designs. Please try again', 'Something went wrong when reordering designs. Please try again',
); );
export const CREATE_DESIGN_TODO_ERROR = __('Failed to create To-Do for the design.'); export const CREATE_DESIGN_TODO_ERROR = __('Failed to create a to-do item for the design.');
export const CREATE_DESIGN_TODO_EXISTS_ERROR = __('There is already a To-Do for this design.'); export const CREATE_DESIGN_TODO_EXISTS_ERROR = __('There is already a to-do item for this design.');
export const DELETE_DESIGN_TODO_ERROR = __('Failed to remove To-Do for the design.'); export const DELETE_DESIGN_TODO_ERROR = __('Failed to remove a to-do item for the design.');
export const TOGGLE_TODO_ERROR = __('Failed to toggle To-Do for the design.'); export const TOGGLE_TODO_ERROR = __('Failed to toggle the to-do status for the design.');
const MAX_SKIPPED_FILES_LISTINGS = 5; const MAX_SKIPPED_FILES_LISTINGS = 5;
......
...@@ -15,7 +15,7 @@ export default { ...@@ -15,7 +15,7 @@ export default {
}, },
computed: { computed: {
buttonLabel() { buttonLabel() {
return this.isTodo ? __('Mark as done') : __('Add a To Do'); return this.isTodo ? __('Mark as done') : __('Add a to do');
}, },
}, },
}; };
......
---
title: Change to-do formatting in Design error messages and sidebar
merge_request: 53040
author:
type: fixed
...@@ -1635,9 +1635,6 @@ msgstr "" ...@@ -1635,9 +1635,6 @@ msgstr ""
msgid "Add a Grafana button in the admin sidebar, monitoring section, to access a variety of statistics on the health and performance of GitLab." msgid "Add a Grafana button in the admin sidebar, monitoring section, to access a variety of statistics on the health and performance of GitLab."
msgstr "" msgstr ""
msgid "Add a To Do"
msgstr ""
msgid "Add a bullet list" msgid "Add a bullet list"
msgstr "" msgstr ""
...@@ -12035,10 +12032,10 @@ msgstr "" ...@@ -12035,10 +12032,10 @@ msgstr ""
msgid "Failed to create Merge Request. Please try again." msgid "Failed to create Merge Request. Please try again."
msgstr "" msgstr ""
msgid "Failed to create To-Do for the design." msgid "Failed to create a branch for this issue. Please try again."
msgstr "" msgstr ""
msgid "Failed to create a branch for this issue. Please try again." msgid "Failed to create a to-do item for the design."
msgstr "" msgstr ""
msgid "Failed to create framework" msgid "Failed to create framework"
...@@ -12155,10 +12152,10 @@ msgstr "" ...@@ -12155,10 +12152,10 @@ msgstr ""
msgid "Failed to publish issue on status page." msgid "Failed to publish issue on status page."
msgstr "" msgstr ""
msgid "Failed to remove To-Do for the design." msgid "Failed to remove a Zoom meeting"
msgstr "" msgstr ""
msgid "Failed to remove a Zoom meeting" msgid "Failed to remove a to-do item for the design."
msgstr "" msgstr ""
msgid "Failed to remove issue from board, please try again." msgid "Failed to remove issue from board, please try again."
...@@ -12203,7 +12200,7 @@ msgstr "" ...@@ -12203,7 +12200,7 @@ msgstr ""
msgid "Failed to signing using smartcard authentication" msgid "Failed to signing using smartcard authentication"
msgstr "" msgstr ""
msgid "Failed to toggle To-Do for the design." msgid "Failed to toggle the to-do status for the design."
msgstr "" msgstr ""
msgid "Failed to update branch!" msgid "Failed to update branch!"
...@@ -29106,10 +29103,10 @@ msgstr "" ...@@ -29106,10 +29103,10 @@ msgstr ""
msgid "There is a halted Elasticsearch migration" msgid "There is a halted Elasticsearch migration"
msgstr "" msgstr ""
msgid "There is already a To-Do for this design." msgid "There is already a repository with that name on disk"
msgstr "" msgstr ""
msgid "There is already a repository with that name on disk" msgid "There is already a to-do item for this design."
msgstr "" msgstr ""
msgid "There is no chart data available." msgid "There is no chart data available."
......
...@@ -111,7 +111,7 @@ describe('Design management design todo button', () => { ...@@ -111,7 +111,7 @@ describe('Design management design todo button', () => {
}); });
it('renders correct button text', () => { it('renders correct button text', () => {
expect(wrapper.text()).toBe('Add a To Do'); expect(wrapper.text()).toBe('Add a to do');
}); });
describe('when clicked', () => { describe('when clicked', () => {
......
...@@ -33,7 +33,7 @@ describe('Todo Button', () => { ...@@ -33,7 +33,7 @@ describe('Todo Button', () => {
it.each` it.each`
label | isTodo label | isTodo
${'Mark as done'} | ${true} ${'Mark as done'} | ${true}
${'Add a To Do'} | ${false} ${'Add a to do'} | ${false}
`('sets correct label when isTodo is $isTodo', ({ label, isTodo }) => { `('sets correct label when isTodo is $isTodo', ({ label, isTodo }) => {
createComponent({ isTodo }); createComponent({ isTodo });
......
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