kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Resolved EE differences in promote milestone modal vue component

Browse source 
Created shared mixins for modal content
This commit is contained in:
Constance Okoghenun 2019-05-21 09:58:22 +00:00 committed by Filipa Lacerda
parent 5ae293e33c
commit 05e518a469
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/pages/milestones/shared/components/promote_milestone_modal.vue
View file

@ -33,8 +33,7 @@ export default {
text() {
return sprintf(
s__(`Milestones|Promoting %{milestoneTitle} will make it available for all projects inside %{groupName}.
Existing project milestones with the same title will be merged.
This action cannot be reversed.`),
Existing project milestones with the same title will be merged.`),
{ milestoneTitle: this.milestoneTitle, groupName: this.groupName },
);
},
@ -72,6 +71,9 @@ export default {
<template slot="title">
{{ title }}
</template>
{{ text }}
<div>
<p>{{ text }}</p>
<p>{{ s__('Milestones|This action cannot be reversed.') }}</p>
</div>
</gl-modal>
</template>

5
locale/gitlab.pot
View file

@ -6040,7 +6040,10 @@ msgstr ""
msgid "Milestones|Promote Milestone"
msgstr ""
msgid "Milestones|Promoting %{milestoneTitle} will make it available for all projects inside %{groupName}. Existing project milestones with the same title will be merged. This action cannot be reversed."
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."
msgstr ""
msgid "Mirror a repository"