Commit 34dae29b authored by Phil Hughes's avatar Phil Hughes

Merge branch '7450-fix-epic-sidebar-date-tooltip-typo' into 'master'

Fix tooltip string to support dynamic date type in Epic sidebar

Closes #7450

See merge request gitlab-org/gitlab-ee!7243
parents fc200504 65018fff
...@@ -234,7 +234,7 @@ export default { ...@@ -234,7 +234,7 @@ export default {
return dateSourcingMilestoneTitle; return dateSourcingMilestoneTitle;
} }
return sprintf(s__('Epics|To schedule your epic\'s %{epicDateType} date based on milestones, assign a milestone with a due date to any issue in the epic.'), { return sprintf(s__('Epics|To schedule your epic\'s %{epicDateType} date based on milestones, assign a milestone with a %{epicDateType} date to any issue in the epic.'), {
epicDateType: this.getDateTypeString(dateType), epicDateType: this.getDateTypeString(dateType),
}); });
}, },
......
---
title: Fix tooltip string to support dynamic date type in Epic sidebar
merge_request: 7243
author:
type: fixed
...@@ -161,7 +161,7 @@ describe('epicSidebar', () => { ...@@ -161,7 +161,7 @@ describe('epicSidebar', () => {
describe('getDateFromMilestonesTooltip', () => { describe('getDateFromMilestonesTooltip', () => {
it('returns tooltip string for milestone', () => { it('returns tooltip string for milestone', () => {
expect(vm.getDateFromMilestonesTooltip('start')).toBe('To schedule your epic\'s start date based on milestones, assign a milestone with a due date to any issue in the epic.'); expect(vm.getDateFromMilestonesTooltip('start')).toBe('To schedule your epic\'s start date based on milestones, assign a milestone with a start date to any issue in the epic.');
}); });
}); });
......
...@@ -2945,7 +2945,7 @@ msgstr "" ...@@ -2945,7 +2945,7 @@ msgstr ""
msgid "Epics|These dates affect how your epics appear in the roadmap. Dates from milestones come from the milestones assigned to issues in the epic. You can also set fixed dates or remove them entirely." msgid "Epics|These dates affect how your epics appear in the roadmap. Dates from milestones come from the milestones assigned to issues in the epic. You can also set fixed dates or remove them entirely."
msgstr "" msgstr ""
msgid "Epics|To schedule your epic's %{epicDateType} date based on milestones, assign a milestone with a due date to any issue in the epic." msgid "Epics|To schedule your epic's %{epicDateType} date based on milestones, assign a milestone with a %{epicDateType} date to any issue in the epic."
msgstr "" msgstr ""
msgid "Epics|finish" msgid "Epics|finish"
......
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