From 4c598f549605cd80c6e6ec7d53e1bcd4d2418e6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Guill=C3=A9n=20i=20Pelegay?= <jguille2@xtec.cat>
Date: Fri, 8 Nov 2019 14:39:04 +0100
Subject: [PATCH] Updating PR with last master changes to be directly mergeable

---
 HISTORY.md    | 1 -
 snap.html     | 2 +-
 src/blocks.js | 4 +---
 src/byob.js   | 5 ++---
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index ae4e6d16..bcd89bf7 100755
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -24,7 +24,6 @@
 * blocks: don't translate message names in drow-down menus
 * blocks: don't translate names in dropdowns
 * help: fixed size of MY help screen, thanks, Brian
-* byob: don't translate items in dropdowns
 * prepared release
 
 ## v5.3.1:
diff --git a/snap.html b/snap.html
index 5686f3a0..47f8a8f4 100755
--- a/snap.html
+++ b/snap.html
@@ -12,7 +12,7 @@
         <script type="text/javascript" src="src/gui.js?version=2019-11-06"></script>
         <script type="text/javascript" src="src/paint.js?version=2019-06-27"></script>
         <script type="text/javascript" src="src/lists.js?version=2019-10-23"></script>
-        <script type="text/javascript" src="src/byob.js?version=2019-11-06"></script>
+        <script type="text/javascript" src="src/byob.js?version=2019-07-24"></script>
         <script type="text/javascript" src="src/tables.js?version=2019-06-27"></script>
         <script type="text/javascript" src="src/symbols.js?version=2019-06-27"></script>
         <script type="text/javascript" src="src/sketch.js?version=2019-10-09"></script>
diff --git a/src/blocks.js b/src/blocks.js
index bae74c6e..fed1d17e 100644
--- a/src/blocks.js
+++ b/src/blocks.js
@@ -8644,9 +8644,7 @@ InputSlotMorph.prototype.setContents = function (data) {
       	dta = ''; // make sure the contents text emptied
     } else { // assume dta is a localizable choice if it's a key in my choices
         cnts.isItalic = false;
-        if (!isNil(this.choices) &&
-                this.choices[dta] instanceof Array &&
-                this.choices[dta].length === 1) {
+        if (!isNil(this.choices) && this.choices[dta] instanceof Array) {
             return this.setContents(this.choices[dta]);
         }
     }
diff --git a/src/byob.js b/src/byob.js
index 59fd13c2..901f226c 100644
--- a/src/byob.js
+++ b/src/byob.js
@@ -108,7 +108,7 @@ BooleanSlotMorph, XML_Serializer, SnapTranslator*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.byob = '2019-November-06';
+modules.byob = '2019-July-24';
 
 // Declarations
 
@@ -356,8 +356,7 @@ CustomBlockDefinition.prototype.parseChoices = function (string) {
             stack[stack.length - 1][pair[0]] = dict;
             stack.push(dict);
         } else {
-            // don't translate
-            dict[pair[0]] = [(isNil(pair[1]) ? pair[0] : pair[1]), false];
+            dict[pair[0]] = isNil(pair[1]) ? pair[0] : pair[1];
         }
     });
     return dict;