Commit dfdcd8b4 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'due-date-none' into 'master'

Replace `No due date` with `None`

See merge request gitlab-org/gitlab-ce!27437
parents 47005527 f4089e1e
......@@ -104,7 +104,7 @@ class DueDateSelect {
const dateObj = new Date(dateArray[0], dateArray[1] - 1, dateArray[2]);
this.displayedDate = dateFormat(dateObj, 'mmm d, yyyy');
} else {
this.displayedDate = 'No due date';
this.displayedDate = __('None');
}
}
......@@ -132,7 +132,7 @@ class DueDateSelect {
submitSelectedDate(isDropdown) {
const selectedDateValue = this.datePayload[this.abilityName].due_date;
const hasDueDate = this.displayedDate !== 'No due date';
const hasDueDate = this.displayedDate !== __('None');
const displayedDateStyle = hasDueDate ? 'bold' : 'no-value';
this.$loading.removeClass('hidden').fadeIn();
......
......@@ -7,7 +7,7 @@
.value
.value-content
%span.no-value{ "v-if" => "!issue.dueDate" }
= _("No due date")
= _("None")
%span.bold{ "v-if" => "issue.dueDate" }
{{ issue.dueDate | due-date }}
- if can_admin_issue?
......
......@@ -73,7 +73,7 @@
%span.bold= issuable_sidebar[:due_date].to_s(:medium)
- else
%span.no-value
= _('No due date')
= _('None')
- if can_edit_issuable
%span.no-value.js-remove-due-date-holder{ class: ("hidden" if issuable_sidebar[:due_date].nil?) }
\-
......
......@@ -5966,9 +5966,6 @@ msgstr ""
msgid "No details available"
msgstr ""
msgid "No due date"
msgstr ""
msgid "No errors to display."
msgstr ""
......
......@@ -775,10 +775,10 @@ describe 'Issues' do
wait_for_requests
expect(page).to have_no_content 'No due date'
expect(page).to have_no_content 'None'
click_link 'remove due date'
expect(page).to have_content 'No due date'
expect(page).to have_content 'None'
end
end
end
......
......@@ -11,7 +11,7 @@ shared_examples 'remove_due_date quick action' do
visit project_issue_path(project, issue)
page.within '.due_date' do
expect(page).to have_content 'No due date'
expect(page).to have_content 'None'
end
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