Change 'Todo' to 'To Do'

Currently, we label items to be done as "Todo." This is grammatically
incorrect and (therefore) confusing—especially to our Spanish-speaking
users for whom "todo" has a specific and unrelated meaning.

We should use "To Do" and always use it as singular (not "To Dos").

Updates to wording in a few places per MR (ee) discussion

Updating locale/gitlab.pot

Updates to wording in a few places per MR (ee) discussion

Updating locale/gitlab.pot

6 files changed, 25 insertions, 25 deletions

diff --git a/spec/features/dashboard/shortcuts_spec.rb b/spec/features/dashboard/shortcuts_spec.rb
index 55f5ff04d01..254bb12573c 100644
--- a/spec/features/dashboard/shortcuts_spec.rb
+++ b/spec/features/dashboard/shortcuts_spec.rb
@@ -22,7 +22,7 @@ describe 'Dashboard shortcuts', :js do
 
       find('body').send_keys([:shift, 'T'])
 
-      check_page_title('Todos')
+      check_page_title('To-Do List')
 
       find('body').send_keys([:shift, 'P'])
 
diff --git a/spec/features/dashboard/todos/todos_spec.rb b/spec/features/dashboard/todos/todos_spec.rb
index d58e3b2841e..c48229fc0a0 100644
--- a/spec/features/dashboard/todos/todos_spec.rb
+++ b/spec/features/dashboard/todos/todos_spec.rb
@@ -13,7 +13,7 @@ describe 'Dashboard Todos' do
     end
 
     it 'shows "All done" message' do
-      expect(page).to have_content 'Todos let you see what you should do next'
+      expect(page).to have_content 'Your To-Do List shows what to work on next'
     end
   end
 
@@ -72,7 +72,7 @@ describe 'Dashboard Todos' do
       end
 
       it 'updates todo count' do
-        expect(page).to have_content 'Todos 0'
+        expect(page).to have_content 'To Do 0'
         expect(page).to have_content 'Done 1'
       end
 
@@ -101,7 +101,7 @@ describe 'Dashboard Todos' do
       end
 
       it 'updates todo count' do
-        expect(page).to have_content 'Todos 1'
+        expect(page).to have_content 'To Do 1'
         expect(page).to have_content 'Done 0'
       end
     end
@@ -211,7 +211,7 @@ describe 'Dashboard Todos' do
     describe 'restoring the todo' do
       before do
         within first('.todo') do
-          click_link 'Add todo'
+          click_link 'Add a To Do'
         end
       end
 
@@ -220,7 +220,7 @@ describe 'Dashboard Todos' do
       end
 
       it 'updates todo count' do
-        expect(page).to have_content 'Todos 1'
+        expect(page).to have_content 'To Do 1'
         expect(page).to have_content 'Done 0'
       end
     end
@@ -276,7 +276,7 @@ describe 'Dashboard Todos' do
       end
 
       it 'shows "All done" message!' do
-        expect(page).to have_content 'Todos 0'
+        expect(page).to have_content 'To Do 0'
         expect(page).to have_content "You're all done!"
         expect(page).not_to have_selector('.gl-pagination')
       end
@@ -303,7 +303,7 @@ describe 'Dashboard Todos' do
       it 'updates todo count' do
         mark_all_and_undo
 
-        expect(page).to have_content 'Todos 2'
+        expect(page).to have_content 'To Do 2'
         expect(page).to have_content 'Done 0'
       end
 
diff --git a/spec/features/issues/todo_spec.rb b/spec/features/issues/todo_spec.rb
index 0114178b9be..07ae159eef4 100644
--- a/spec/features/issues/todo_spec.rb
+++ b/spec/features/issues/todo_spec.rb
@@ -13,8 +13,8 @@ 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 todo'
-      expect(page).to have_content 'Mark todo as done'
+      click_button 'Add a To Do'
+      expect(page).to have_content 'Mark as done'
     end
 
     page.within '.header-content .todos-count' do
@@ -30,8 +30,8 @@ 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 todo'
-      click_button 'Mark todo as done'
+      click_button 'Add a To Do'
+      click_button 'Mark as done'
     end
 
     expect(page).to have_selector('.todos-count', visible: false)
diff --git a/spec/helpers/preferences_helper_spec.rb b/spec/helpers/preferences_helper_spec.rb
index db0d45c3692..554c08add2d 100644
--- a/spec/helpers/preferences_helper_spec.rb
+++ b/spec/helpers/preferences_helper_spec.rb
@@ -28,7 +28,7 @@ describe PreferencesHelper do
         ["Your Projects' Activity", 'project_activity'],
         ["Starred Projects' Activity", 'starred_project_activity'],
         ["Your Groups", 'groups'],
-        ["Your Todos", 'todos'],
+        ["Your To-Do List", 'todos'],
         ["Assigned Issues", 'issues'],
         ["Assigned Merge Requests", 'merge_requests']
       ]
diff --git a/spec/javascripts/collapsed_sidebar_todo_spec.js b/spec/javascripts/collapsed_sidebar_todo_spec.js
index bb90e53e525..f75d63c8f57 100644
--- a/spec/javascripts/collapsed_sidebar_todo_spec.js
+++ b/spec/javascripts/collapsed_sidebar_todo_spec.js
@@ -58,7 +58,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 todo');
+    ).toBe('Add a To Do');
   });
 
   it('toggle todo state', done => {
@@ -85,7 +85,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
     setTimeout(() => {
       expect(
         document.querySelector('.issuable-sidebar-header .js-issuable-todo').textContent.trim(),
-      ).toBe('Mark todo as done');
+      ).toBe('Mark as done');
 
       done();
     });
@@ -99,7 +99,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
         document
           .querySelector('.js-issuable-todo.sidebar-collapsed-icon')
           .getAttribute('data-original-title'),
-      ).toBe('Mark todo as done');
+      ).toBe('Mark as done');
 
       done();
     });
@@ -124,13 +124,13 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
 
         expect(
           document.querySelector('.issuable-sidebar-header .js-issuable-todo').textContent.trim(),
-        ).toBe('Add todo');
+        ).toBe('Add a To Do');
       })
       .then(done)
       .catch(done.fail);
   });
 
-  it('updates aria-label to mark todo as done', done => {
+  it('updates aria-label to Mark as done', done => {
     document.querySelector('.js-issuable-todo.sidebar-collapsed-icon').click();
 
     setTimeout(() => {
@@ -138,7 +138,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
         document
           .querySelector('.js-issuable-todo.sidebar-collapsed-icon')
           .getAttribute('aria-label'),
-      ).toBe('Mark todo as done');
+      ).toBe('Mark as done');
 
       done();
     });
@@ -153,7 +153,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
           document
             .querySelector('.js-issuable-todo.sidebar-collapsed-icon')
             .getAttribute('aria-label'),
-        ).toBe('Mark todo as done');
+        ).toBe('Mark as done');
 
         document.querySelector('.js-issuable-todo.sidebar-collapsed-icon').click();
       })
@@ -163,7 +163,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
           document
             .querySelector('.js-issuable-todo.sidebar-collapsed-icon')
             .getAttribute('aria-label'),
-        ).toBe('Add todo');
+        ).toBe('Add a To Do');
       })
       .then(done)
       .catch(done.fail);
diff --git a/spec/javascripts/sidebar/todo_spec.js b/spec/javascripts/sidebar/todo_spec.js
index f46ea5a0499..e7abd19c865 100644
--- a/spec/javascripts/sidebar/todo_spec.js
+++ b/spec/javascripts/sidebar/todo_spec.js
@@ -53,14 +53,14 @@ describe('SidebarTodo', () => {
 
     describe('buttonLabel', () => {
       it('returns todo button text for marking todo as done when `isTodo` prop is `true`', () => {
-        expect(vm.buttonLabel).toBe('Mark todo as done');
+        expect(vm.buttonLabel).toBe('Mark as done');
       });
 
       it('returns todo button text for add todo when `isTodo` prop is `false`', done => {
         vm.isTodo = false;
         Vue.nextTick()
           .then(() => {
-            expect(vm.buttonLabel).toBe('Add todo');
+            expect(vm.buttonLabel).toBe('Add a To Do');
           })
           .then(done)
           .catch(done.fail);
@@ -131,14 +131,14 @@ describe('SidebarTodo', () => {
     });
 
     it('check button label computed property', () => {
-      expect(vm.buttonLabel).toEqual('Mark todo as done');
+      expect(vm.buttonLabel).toEqual('Mark as done');
     });
 
     it('renders button label element when `collapsed` prop is `false`', () => {
       const buttonLabelEl = vm.$el.querySelector('span.issuable-todo-inner');
 
       expect(buttonLabelEl).not.toBeNull();
-      expect(buttonLabelEl.innerText.trim()).toBe('Mark todo as done');
+      expect(buttonLabelEl.innerText.trim()).toBe('Mark as done');
     });
 
     it('renders button icon when `collapsed` prop is `true`', done => {