Merge pull request from cwillisf/setLocale-always-refreshBlocks

Make setLocale consistently refresh blocks
This commit is contained in:
Chris Willis-Ford 2018-11-27 19:19:41 -08:00 committed by GitHub
commit 05979e2e93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1036,10 +1036,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();
}