Skip to content

Commit 6d95fac

Browse files
committed
Minor code style tweaks and update dependencies
1 parent c1dfe21 commit 6d95fac

File tree

2 files changed

+54
-57
lines changed

2 files changed

+54
-57
lines changed

index.js

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ const mem = require('mem');
66
const defaultOptions = {spawn: true};
77
const defaultLocale = 'en_US';
88

9-
function getEnvLocale(env) {
10-
env = env || process.env;
9+
function getEnvLocale(env = process.env) {
1110
return env.LC_ALL || env.LC_MESSAGES || env.LANG || env.LANGUAGE;
1211
}
1312

14-
function parseLocale(x) {
15-
const env = x.split('\n').reduce((env, def) => {
16-
def = def.split('=');
17-
env[def[0]] = def[1].replace(/^"|"$/g, '');
13+
function parseLocale(string) {
14+
const env = string.split('\n').reduce((env, def) => {
15+
const [key, value] = def.split('=');
16+
env[key] = value.replace(/^"|"$/g, '');
1817
return env;
1918
}, {});
19+
2020
return getEnvLocale(env);
2121
}
2222

@@ -25,11 +25,11 @@ function getLocale(string) {
2525
}
2626

2727
function getAppleLocale() {
28-
return execa.stdout('defaults', ['read', '-g', 'AppleLocale']);
28+
return execa.stdout('defaults', ['read', '-globalDomain', 'AppleLocale']);
2929
}
3030

3131
function getAppleLocaleSync() {
32-
return execa.sync('defaults', ['read', '-g', 'AppleLocale']).stdout;
32+
return execa.sync('defaults', ['read', '-globalDomain', 'AppleLocale']).stdout;
3333
}
3434

3535
function getUnixLocale() {
@@ -75,7 +75,8 @@ module.exports = mem((options = defaultOptions) => {
7575
thenable = getUnixLocale();
7676
}
7777

78-
return thenable.then(locale => locale || defaultLocale)
78+
return thenable
79+
.then(locale => locale || defaultLocale)
7980
.catch(() => defaultLocale);
8081
});
8182

@@ -87,11 +88,7 @@ module.exports.sync = mem((options = defaultOptions) => {
8788
res = getLocale(envLocale);
8889
} else {
8990
try {
90-
if (process.platform === 'win32') {
91-
res = getWinLocaleSync();
92-
} else {
93-
res = getUnixLocaleSync();
94-
}
91+
res = process.platform === 'win32' ? getWinLocaleSync() : getUnixLocaleSync();
9592
} catch (_) {}
9693
}
9794

package.json

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
{
2-
"name": "os-locale",
3-
"version": "3.0.1",
4-
"description": "Get the system locale",
5-
"license": "MIT",
6-
"repository": "sindresorhus/os-locale",
7-
"author": {
8-
"name": "Sindre Sorhus",
9-
"email": "[email protected]",
10-
"url": "sindresorhus.com"
11-
},
12-
"engines": {
13-
"node": ">=6"
14-
},
15-
"scripts": {
16-
"test": "xo && ava"
17-
},
18-
"files": [
19-
"index.js"
20-
],
21-
"keywords": [
22-
"locale",
23-
"lang",
24-
"language",
25-
"system",
26-
"os",
27-
"string",
28-
"str",
29-
"user",
30-
"country",
31-
"id",
32-
"identifier",
33-
"region"
34-
],
35-
"dependencies": {
36-
"execa": "^0.10.0",
37-
"lcid": "^2.0.0",
38-
"mem": "^4.0.0"
39-
},
40-
"devDependencies": {
41-
"ava": "*",
42-
"import-fresh": "^2.0.0",
43-
"xo": "*"
44-
}
2+
"name": "os-locale",
3+
"version": "3.0.1",
4+
"description": "Get the system locale",
5+
"license": "MIT",
6+
"repository": "sindresorhus/os-locale",
7+
"author": {
8+
"name": "Sindre Sorhus",
9+
"email": "[email protected]",
10+
"url": "sindresorhus.com"
11+
},
12+
"engines": {
13+
"node": ">=6"
14+
},
15+
"scripts": {
16+
"test": "xo && ava"
17+
},
18+
"files": [
19+
"index.js"
20+
],
21+
"keywords": [
22+
"locale",
23+
"lang",
24+
"language",
25+
"system",
26+
"os",
27+
"string",
28+
"str",
29+
"user",
30+
"country",
31+
"id",
32+
"identifier",
33+
"region"
34+
],
35+
"dependencies": {
36+
"execa": "^1.0.0",
37+
"lcid": "^2.0.0",
38+
"mem": "^4.0.0"
39+
},
40+
"devDependencies": {
41+
"ava": "^1.0.1",
42+
"import-fresh": "^3.0.0",
43+
"xo": "^0.23.0"
44+
}
4545
}

0 commit comments

Comments
 (0)