From f6dc992b0f73b524a0539fff9efc02abf6fb8eb2 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 26 Dec 2017 09:51:45 +0100
Subject: [PATCH] FIX: do not apply i18n if already done

---
 .../javascripts/discourse/templates/components/d-editor.hbs     | 2 +-
 .../select-kit/components/toolbar-popup-menu-options.js.es6     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
index 6029c6395b3..6133b28f8fc 100644
--- a/app/assets/javascripts/discourse/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
@@ -17,7 +17,7 @@
             {{toolbar-popup-menu-options
               onPopupMenuAction=onPopupMenuAction
               onExpand=(action b.action b)
-              title="composer.options"
+              title=b.title
               headerIcon=b.icon
               class=b.className
               content=popupMenuOptions}}
diff --git a/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6 b/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6
index 005d8dac7d9..d679b9421ee 100644
--- a/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6
+++ b/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6
@@ -10,7 +10,7 @@ export default DropdownSelectBoxComponent.extend({
 
   @computed("title")
   collectionHeader(title) {
-    return `<h3>${I18n.t(title)}</h3>`;
+    return `<h3>${title}</h3>`;
   },
 
   mutateValue(value) {