Skip to content
Permalink
Browse files

os-locale: Include 'preferLocal: false' option when using execa

Thanks to Rich Mirch for pointing this out.
  • Loading branch information
scottnonnenberg-signal committed Dec 16, 2019
1 parent 991d7f9 commit 2da39cca673cc11be3c6d70d4fb95889f9ab6688
Showing with 46 additions and 0 deletions.
  1. +46 −0 patches/os-locale+2.1.0.patch
@@ -0,0 +1,46 @@
diff --git a/node_modules/os-locale/index.js b/node_modules/os-locale/index.js
index 1ada7a4..1304aa1 100644
--- a/node_modules/os-locale/index.js
+++ b/node_modules/os-locale/index.js
@@ -25,11 +25,11 @@ function getLocale(str) {
}

function getAppleLocale() {
- return execa.stdout('defaults', ['read', '-g', 'AppleLocale']);
+ return execa.stdout('defaults', ['read', '-g', 'AppleLocale'], { preferLocal: false });
}

function getAppleLocaleSync() {
- return execa.sync('defaults', ['read', '-g', 'AppleLocale']).stdout;
+ return execa.sync('defaults', ['read', '-g', 'AppleLocale'], { preferLocal: false }).stdout;
}

function getUnixLocale() {
@@ -37,7 +37,8 @@ function getUnixLocale() {
return getAppleLocale();
}

- return execa.stdout('locale')
+ const args = null;
+ return execa.stdout('locale', args, { preferLocal: false })
.then(stdout => getLocale(parseLocale(stdout)));
}

@@ -50,7 +51,7 @@ function getUnixLocaleSync() {
}

function getWinLocale() {
- return execa.stdout('wmic', ['os', 'get', 'locale'])
+ return execa.stdout('wmic', ['os', 'get', 'locale'], { preferLocal: false })
.then(stdout => {
const lcidCode = parseInt(stdout.replace('Locale', ''), 16);
return lcid.from(lcidCode);
@@ -58,7 +59,7 @@ function getWinLocale() {
}

function getWinLocaleSync() {
- const stdout = execa.sync('wmic', ['os', 'get', 'locale']).stdout;
+ const stdout = execa.sync('wmic', ['os', 'get', 'locale'], { preferLocal: false }).stdout;
const lcidCode = parseInt(stdout.replace('Locale', ''), 16);
return lcid.from(lcidCode);
}

0 comments on commit 2da39cc

Please sign in to comment.
You can’t perform that action at this time.