Commit dc9702e8 authored by Constance Okoghenun's avatar Constance Okoghenun Committed by Filipa Lacerda

Resolved CE differences in promote milestone modal vue component

Created shared mixins for modal content
parent 3bff3dc3
......@@ -31,26 +31,10 @@ export default {
});
},
text() {
const milestonePromotion = sprintf(
s__(`Milestones|Promoting %{milestone} will make it available for all projects inside %{groupName}.
Existing project milestones with the same name will be merged. `),
{
milestone: this.milestoneTitle,
groupName: this.groupName,
},
);
const finalWarning = s__('Milestones|This action cannot be reversed.');
return sprintf(
s__(
`Milestones|<p>%{milestonePromotion}</p>
%{finalWarning}`,
),
{
milestonePromotion,
finalWarning,
},
false,
s__(`Milestones|Promoting %{milestoneTitle} will make it available for all projects inside %{groupName}.
Existing project milestones with the same title will be merged.`),
{ milestoneTitle: this.milestoneTitle, groupName: this.groupName },
);
},
},
......@@ -87,6 +71,9 @@ export default {
<template slot="title">
{{ title }}
</template>
<div v-html="text"></div>
<div>
<p>{{ text }}</p>
<p>{{ s__('Milestones|This action cannot be reversed.') }}</p>
</div>
</gl-modal>
</template>
......@@ -8001,9 +8001,6 @@ msgstr ""
msgid "Milestones| You’re about to permanently delete the milestone %{milestoneTitle}. This milestone is not currently used in any issues or merge requests."
msgstr ""
msgid "Milestones|<p>%{milestonePromotion}</p> %{finalWarning}"
msgstr ""
msgid "Milestones|Delete milestone"
msgstr ""
......@@ -8022,7 +8019,7 @@ msgstr ""
msgid "Milestones|Promote Milestone"
msgstr ""
msgid "Milestones|Promoting %{milestone} will make it available for all projects inside %{groupName}. Existing project milestones with the same name will be merged. "
msgid "Milestones|Promoting %{milestoneTitle} will make it available for all projects inside %{groupName}. Existing project milestones with the same title will be merged."
msgstr ""
msgid "Milestones|This action cannot be reversed."
......
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