From 4256f86ac307a228d46375c96316cf8066b827e3 Mon Sep 17 00:00:00 2001
From: Christopher Willis-Ford <cwillisf@media.mit.edu>
Date: Tue, 27 Nov 2018 10:25:55 -0800
Subject: [PATCH] Make setLocale consistently refresh blocks

This change makes the VM's `setLocale` method call `refreshBlocks` even
when not changing the language, though it still skips an unnecessary
call to `formatMessage.setup` in this case.
---
 src/virtual-machine.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/virtual-machine.js b/src/virtual-machine.js
index 6f15c43d..075a2930 100644
--- a/src/virtual-machine.js
+++ b/src/virtual-machine.js
@@ -1030,10 +1030,9 @@ class VirtualMachine extends EventEmitter {
      *     updated for a new locale (or empty if locale hasn't changed.)
      */
     setLocale (locale, messages) {
-        if (locale === formatMessage.setup().locale) {
-            return Promise.resolve();
+        if (locale !== formatMessage.setup().locale) {
+            formatMessage.setup({locale: locale, translations: {[locale]: messages}});
         }
-        formatMessage.setup({locale: locale, translations: {[locale]: messages}});
         return this.extensionManager.refreshBlocks();
     }