Merge branch...

Merge branch '10091-move-ee-differences-for-app-assets-javascripts-pages-milestones-shared-components-promote_milestone_modal-vue' into 'master'

Resolve "Move EE differences for `app/assets/javascripts/pages/milestones/shared/components/promote_milestone_modal.vue`"

Closes #10091

See merge request gitlab-org/gitlab-ee!12299

app/assets/javascripts/pages/milestones/shared/components/promote_milestone_modal.vue

@@ -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>

locale/gitlab.pot

@@ -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."