jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-04-24 15:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3982 from balena-io/i18n-sudo-en-fallback

Browse Source 
patch: fixed mac sudo on other languages
This commit is contained in:
Balena CI 2023-01-19 14:19:34 +02:00 committed by GitHub
commit 1a368f55fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gui/app/i18n.ts
View File

@ -39,4 +39,6 @@ i18next.use(initReactI18next).init({
},
});
export const supportedLocales = ['en', 'zh'];
export default i18next;

9
lib/shared/catalina-sudo/sudo.ts
View File

@ -20,6 +20,7 @@ import { env } from 'process';
import { promisify } from 'util';
import { getAppPath } from '../utils';
import { supportedLocales } from '../../gui/app/i18n';
const execFileAsync = promisify(execFile);
@ -32,6 +33,12 @@ export async function sudo(
try {
let lang = Intl.DateTimeFormat().resolvedOptions().locale;
lang = lang.substr(0, 2);
if (supportedLocales.indexOf(lang) > -1) {
// language should be present
} else {
// fallback to eng
lang = 'en';
}
const { stdout, stderr } = await execFileAsync(
'sudo',
@ -43,7 +50,7 @@ export async function sudo(
SUDO_ASKPASS: join(
getAppPath(),
__dirname,
'sudo-askpass.osascript-' + lang + '.js',
`sudo-askpass.osascript-${lang}.js`,
),
},
},