From 100d9f1a1c98713ea5ac503ec4081e9e3b85b4f4 Mon Sep 17 00:00:00 2001
From: Andrew n marshall <Anm@anm.me>
Date: Mon, 18 Jun 2018 11:45:36 -0700
Subject: [PATCH] Support %{..} in flyout_button (#1927) (#1929)

Expand %{..} references in toolbox <button> and <label>
---
 core/flyout_button.js | 2 +-
 core/variables.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/flyout_button.js b/core/flyout_button.js
index eedeceffe..290b76a0d 100644
--- a/core/flyout_button.js
+++ b/core/flyout_button.js
@@ -161,7 +161,7 @@ Blockly.FlyoutButton.prototype.createDom = function() {
         'text-anchor': 'middle'
       },
       this.svgGroup_);
-  svgText.textContent = this.text_;
+  svgText.textContent = Blockly.utils.replaceMessageReferences(this.text_);
 
   this.width = Blockly.Field.getCachedWidth(svgText);
   this.height = 20;  // Can't compute it :(
diff --git a/core/variables.js b/core/variables.js
index 5644ad179..b63925235 100644
--- a/core/variables.js
+++ b/core/variables.js
@@ -129,7 +129,7 @@ Blockly.Variables.allDeveloperVariables = function(workspace) {
 Blockly.Variables.flyoutCategory = function(workspace) {
   var xmlList = [];
   var button = goog.dom.createDom('button');
-  button.setAttribute('text', Blockly.Msg['NEW_VARIABLE']);
+  button.setAttribute('text', '%{BKY_NEW_VARIABLE}');
   button.setAttribute('callbackKey', 'CREATE_VARIABLE');
 
   workspace.registerButtonCallback('CREATE_VARIABLE', function(button) {