1 files changed, 17 insertions, 24 deletions
diff --git a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
index 21c44b59520..8ce5b615795 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
@@ -1,6 +1,5 @@
 <script>
 import { GlLink } from '@gitlab/ui';
-import { s__, sprintf } from '~/locale';
 
 export default {
   components: {
@@ -23,28 +22,8 @@ export default {
     },
   },
   computed: {
-    toolbarHelpHtml() {
-      const mdLinkStart = `<a href="${this.markdownDocsPath}" target="_blank" rel="noopener noreferrer" tabindex="-1">`;
-      const actionsLinkStart = `<a href="${this.quickActionsDocsPath}" target="_blank" rel="noopener noreferrer" tabindex="-1">`;
-      const linkEnd = '</a>';
-
-      if (this.markdownDocsPath && !this.quickActionsDocsPath) {
-        return sprintf(
-          s__('Editor|%{mdLinkStart}Markdown is supported%{mdLinkEnd}'),
-          { mdLinkStart, mdLinkEnd: linkEnd },
-          false,
-        );
-      } else if (this.markdownDocsPath && this.quickActionsDocsPath) {
-        return sprintf(
-          s__(
-            'Editor|%{mdLinkStart}Markdown%{mdLinkEnd} and %{actionsLinkStart}quick actions%{actionsLinkEnd} are supported',
-          ),
-          { mdLinkStart, mdLinkEnd: linkEnd, actionsLinkStart, actionsLinkEnd: linkEnd },
-          false,
-        );
-      }
-
-      return null;
+    hasQuickActionsDocsPath() {
+      return this.quickActionsDocsPath !== '';
     },
   },
 };
@@ -53,7 +32,21 @@ export default {
 <template>
   <div class="comment-toolbar clearfix">
     <div class="toolbar-text">
-      <span v-html="toolbarHelpHtml"></span>
+      <template v-if="!hasQuickActionsDocsPath && markdownDocsPath">
+        <gl-link :href="markdownDocsPath" target="_blank" tabindex="-1">{{
+          __('Markdown is supported')
+        }}</gl-link>
+      </template>
+      <template v-if="hasQuickActionsDocsPath && markdownDocsPath">
+        <gl-link :href="markdownDocsPath" target="_blank" tabindex="-1">{{
+          __('Markdown')
+        }}</gl-link>
+        and
+        <gl-link :href="quickActionsDocsPath" target="_blank" tabindex="-1">{{
+          __('quick actions')
+        }}</gl-link>
+        are supported
+      </template>
     </div>
     <span v-if="canAttachFile" class="uploading-container">
       <span class="uploading-progress-container hide">