From e95c92cbbe84d8ec2075462b965c7bef3d3bd208 Mon Sep 17 00:00:00 2001
From: Ezekiel Kigbo <ekigbo@gitlab.com>
Date: Fri, 5 Jul 2019 23:15:00 +0000
Subject: Fix escaping in addMultipleToDiscussionWarning

Replace backticks with single quotes
---
 app/assets/javascripts/vue_shared/components/deprecated_modal.vue       | 2 +-
 .../javascripts/vue_shared/components/droplab_dropdown_button.vue       | 2 +-
 app/assets/javascripts/vue_shared/components/markdown/field.vue         | 1 +
 app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/vue_shared/components/deprecated_modal.vue b/app/assets/javascripts/vue_shared/components/deprecated_modal.vue
index f0bb81c1ede..d5558d93219 100644
--- a/app/assets/javascripts/vue_shared/components/deprecated_modal.vue
+++ b/app/assets/javascripts/vue_shared/components/deprecated_modal.vue
@@ -96,7 +96,7 @@ export default {
                 type="button"
                 class="close float-right"
                 data-dismiss="modal"
-                :aria-label="__(`Close`)"
+                :aria-label="__('Close')"
                 @click="emitCancel($event)"
               >
                 <span aria-hidden="true">&times;</span>
diff --git a/app/assets/javascripts/vue_shared/components/droplab_dropdown_button.vue b/app/assets/javascripts/vue_shared/components/droplab_dropdown_button.vue
index 82e18ec6531..c35fee84771 100644
--- a/app/assets/javascripts/vue_shared/components/droplab_dropdown_button.vue
+++ b/app/assets/javascripts/vue_shared/components/droplab_dropdown_button.vue
@@ -69,7 +69,7 @@ export default {
       data-display="static"
       data-toggle="dropdown"
     >
-      <icon name="arrow-down" :aria-label="__(`toggle dropdown`)" />
+      <icon name="arrow-down" :aria-label="__('toggle dropdown')" />
     </button>
     <ul :class="dropdownClass" class="dropdown-menu dropdown-open-top">
       <template v-for="(action, index) in actions">
diff --git a/app/assets/javascripts/vue_shared/components/markdown/field.vue b/app/assets/javascripts/vue_shared/components/markdown/field.vue
index 00396cbd574..b520d302407 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/field.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/field.vue
@@ -127,6 +127,7 @@ export default {
           icon: '<i class="fa fa-exclamation-triangle" aria-hidden="true"></i>',
           usersTag: `<strong><span class="js-referenced-users-count">${this.referencedUsers.length}</span></strong>`,
         },
+        false,
       );
     },
   },
diff --git a/app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue b/app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue
index 908ad974c1c..913c971a512 100644
--- a/app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue
+++ b/app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue
@@ -48,7 +48,7 @@ export default {
         'fa-angle-double-right': !collapsed,
         'fa-angle-double-left': collapsed,
       }"
-      :aria-label="__(`toggle collapse`)"
+      :aria-label="__('toggle collapse')"
       class="fa"
     >
     </i>
-- 
cgit v1.2.1