From 4f175fc93ebc22067ee016d4f5edc3689ddafaf8 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 25 Oct 2021 15:58:07 +0100
Subject: [PATCH] Fix loading non-default language files leaving runtime in
 wrong locale

---
 .../@node-red/editor-api/lib/editor/locales.js             | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/locales.js b/packages/node_modules/@node-red/editor-api/lib/editor/locales.js
index 3d55f98bc..568f5837b 100644
--- a/packages/node_modules/@node-red/editor-api/lib/editor/locales.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/locales.js
@@ -48,9 +48,10 @@ module.exports = {
         var prevLang = i18n.i.language;
         // Trigger a load from disk of the language if it is not the default
         i18n.i.changeLanguage(lang, function(){
-            var catalog = loadResource(lang, namespace);
-            res.json(catalog||{});
+            i18n.i.changeLanguage(prevLang, function() {
+                var catalog = loadResource(lang, namespace);
+                res.json(catalog||{});
+            });
         });
-        i18n.i.changeLanguage(prevLang);
     }
 }