Commit d8fb8f3c authored by Marcin Sedlak-Jakubowski's avatar Marcin Sedlak-Jakubowski Committed by Kushal Pandya

Fix "Add a to do" spelling on issuables

parent 2c7a756b
......@@ -435,7 +435,7 @@ module IssuablesHelper
def issuable_todo_button_data(issuable, is_collapsed)
{
todo_text: _('Add a To Do'),
todo_text: _('Add a to do'),
mark_text: _('Mark as done'),
todo_icon: sprite_icon('todo-add'),
mark_icon: sprite_icon('todo-done', css_class: 'todo-undone'),
......
......@@ -57,5 +57,5 @@
- else
.todo-actions
= link_to restore_dashboard_todo_path(todo), method: :patch, class: 'btn btn-loading d-flex align-items-center js-add-todo', data: { href: restore_dashboard_todo_path(todo) } do
Add a To Do
Add a to do
%span.spinner.ml-1
......@@ -80,7 +80,7 @@ The button to do this has a different label depending on whether the issue is al
List or not. If the issue is:
- Already on your To-Do List: The button is labeled **Mark as done**. Click the button to remove the issue from your To-Do List.
- Not on your To-Do List: The button is labeled **Add a To Do**. Click the button to add the issue to your To-Do List.
- Not on your To-Do List: The button is labeled **Add a to do**. Click the button to add the issue to your To-Do List.
### Assignee
......
......@@ -93,8 +93,12 @@ for filtering purposes; otherwise, they appear as normal.
### Manually creating a to do
You can add an issue or merge request (or epic **(ULTIMATE)**) to your
To-Do List by clicking its **Add a To Do** button.
You can also add the following to your To-Do List by clicking the **Add a to do** button on an:
- [Issue](project/issues/index.md)
- [Merge Request](project/merge_requests/index.md)
- [Epic](group/epics/index.md) **(ULTIMATE)**
- [Design](project/issues/design_management.md)
![Adding a To Do from the issuable sidebar](img/todos_add_todo_sidebar.png)
......
......@@ -145,9 +145,9 @@ module Gitlab
run_label_command(labels: find_labels(labels_param), command: :relabel, updates_key: :label_ids)
end
desc _('Add a To Do')
explanation _('Adds a To Do.')
execution_message _('Added a To Do.')
desc _('Add a to do')
explanation _('Adds a to do.')
execution_message _('Added a to do.')
types Issuable
condition do
quick_action_target.persisted? &&
......@@ -157,9 +157,9 @@ module Gitlab
@updates[:todo_event] = 'add'
end
desc _('Mark To Do as done')
explanation _('Marks To Do as done.')
execution_message _('Marked To Do as done.')
desc _('Mark to do as done')
explanation _('Marks to do as done.')
execution_message _('Marked to do as done.')
types Issuable
condition do
quick_action_target.persisted? &&
......
......@@ -1604,6 +1604,9 @@ msgstr ""
msgid "Add a task list"
msgstr ""
msgid "Add a to do"
msgstr ""
msgid "Add additional text to appear in all email communications. %{character_limit} character limit"
msgstr ""
......@@ -1757,7 +1760,7 @@ msgstr ""
msgid "Added %{label_references} %{label_text}."
msgstr ""
msgid "Added a To Do."
msgid "Added a to do."
msgstr ""
msgid "Added an issue to an epic."
......@@ -1793,10 +1796,10 @@ msgstr ""
msgid "Adds %{labels} %{label_text}."
msgstr ""
msgid "Adds a To Do."
msgid "Adds a Zoom meeting"
msgstr ""
msgid "Adds a Zoom meeting"
msgid "Adds a to do."
msgstr ""
msgid "Adds an issue to an epic."
......@@ -15618,9 +15621,6 @@ msgstr ""
msgid "March"
msgstr ""
msgid "Mark To Do as done"
msgstr ""
msgid "Mark as done"
msgstr ""
......@@ -15639,6 +15639,9 @@ msgstr ""
msgid "Mark this issue as related to another issue"
msgstr ""
msgid "Mark to do as done"
msgstr ""
msgid "Markdown"
msgstr ""
......@@ -15672,9 +15675,6 @@ msgstr ""
msgid "Marked For Deletion At - %{deletion_time}"
msgstr ""
msgid "Marked To Do as done."
msgstr ""
msgid "Marked this %{noun} as Work In Progress."
msgstr ""
......@@ -15684,7 +15684,7 @@ msgstr ""
msgid "Marked this issue as related to %{issue_ref}."
msgstr ""
msgid "Marks To Do as done."
msgid "Marked to do as done."
msgstr ""
msgid "Marks this %{noun} as Work In Progress."
......@@ -15696,6 +15696,9 @@ msgstr ""
msgid "Marks this issue as related to %{issue_ref}."
msgstr ""
msgid "Marks to do as done."
msgstr ""
msgid "Mask variable"
msgstr ""
......
......@@ -228,7 +228,7 @@ RSpec.describe 'Dashboard Todos' do
describe 'restoring the todo' do
before do
within first('.todo') do
click_link 'Add a To Do'
click_link 'Add a to do'
end
end
......@@ -243,7 +243,7 @@ RSpec.describe 'Dashboard Todos' do
end
end
context 'User has Todos with labels spanning multiple projects' do
context 'User has to dos with labels spanning multiple projects' do
before do
label1 = create(:label, project: project)
note1 = create(:note_on_issue, note: "Hello #{label1.to_reference(format: :name)}", noteable_id: issue.id, noteable_type: 'Issue', project: issue.project)
......
......@@ -15,7 +15,7 @@ RSpec.describe 'Manually create a todo item from issue', :js do
it 'creates todo when clicking button' do
page.within '.issuable-sidebar' do
click_button 'Add a To Do'
click_button 'Add a to do'
expect(page).to have_content 'Mark as done'
end
......@@ -32,7 +32,7 @@ RSpec.describe 'Manually create a todo item from issue', :js do
it 'marks a todo as done' do
page.within '.issuable-sidebar' do
click_button 'Add a To Do'
click_button 'Add a to do'
click_button 'Mark as done'
end
......
......@@ -59,7 +59,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
it('sets default tooltip title', () => {
expect(
document.querySelector('.js-issuable-todo.sidebar-collapsed-icon').getAttribute('title'),
).toBe('Add a To Do');
).toBe('Add a to do');
});
it('toggle todo state', done => {
......@@ -125,7 +125,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
expect(
document.querySelector('.issuable-sidebar-header .js-issuable-todo').textContent.trim(),
).toBe('Add a To Do');
).toBe('Add a to do');
})
.then(done)
.catch(done.fail);
......@@ -164,7 +164,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
document
.querySelector('.js-issuable-todo.sidebar-collapsed-icon')
.getAttribute('aria-label'),
).toBe('Add a To Do');
).toBe('Add a to do');
})
.then(done)
.catch(done.fail);
......
......@@ -228,7 +228,7 @@ RSpec.describe QuickActions::InterpretService do
it 'returns the todo message' do
_, _, message = service.execute(content, issuable)
expect(message).to eq('Added a To Do.')
expect(message).to eq('Added a to do.')
end
end
......@@ -244,7 +244,7 @@ RSpec.describe QuickActions::InterpretService do
TodoService.new.mark_todo(issuable, developer)
_, _, message = service.execute(content, issuable)
expect(message).to eq('Marked To Do as done.')
expect(message).to eq('Marked to do as done.')
end
end
......
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