From 61bae7696e4af8e2e7121a0ecd5e2d7ef9c82e83 Mon Sep 17 00:00:00 2001
From: Ventsislav Dimitrov <4097884+vdmtrv@users.noreply.github.com>
Date: Fri, 25 Oct 2019 18:29:17 +0100
Subject: [PATCH 1/2] [locale] fix: importing locales using path.resolve

---
 src/lib/locale/locales.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/locale/locales.js b/src/lib/locale/locales.js
index b0e030dba8..a689c97e94 100644
--- a/src/lib/locale/locales.js
+++ b/src/lib/locale/locales.js
@@ -53,7 +53,8 @@ function loadLocale(name) {
         try {
             oldLocale = globalLocale._abbr;
             var aliasedRequire = require;
-            aliasedRequire('./locale/' + name);
+            var path = aliasedRequire('path');
+            aliasedRequire(path.resolve(__dirname, './locale/' + name));
             getSetGlobalLocale(oldLocale);
         } catch (e) {}
     }

From e140f47778c7c93764a1c54dcda91c548826bfb0 Mon Sep 17 00:00:00 2001
From: Ventsislav Dimitrov <4097884+vdmtrv@users.noreply.github.com>
Date: Wed, 20 Nov 2019 16:53:39 +0000
Subject: [PATCH 2/2] fix: removing 'path' require

---
 src/lib/locale/locales.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib/locale/locales.js b/src/lib/locale/locales.js
index a689c97e94..64be621689 100644
--- a/src/lib/locale/locales.js
+++ b/src/lib/locale/locales.js
@@ -53,8 +53,7 @@ function loadLocale(name) {
         try {
             oldLocale = globalLocale._abbr;
             var aliasedRequire = require;
-            var path = aliasedRequire('path');
-            aliasedRequire(path.resolve(__dirname, './locale/' + name));
+            aliasedRequire(__dirname + '/locale/' + name);
             getSetGlobalLocale(oldLocale);
         } catch (e) {}
     }