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

patch: fixed mac sudo on other languages
balena-io · Jan 19, 2023 · 1a368f5 · 1a368f5
2 parents 407138c + 19d1e09
commit 1a368f5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/gui/app/i18n.ts b/lib/gui/app/i18n.ts
@@ -39,4 +39,6 @@ i18next.use(initReactI18next).init({
 	},
 });
 
+export const supportedLocales = ['en', 'zh'];
+
 export default i18next;
diff --git a/lib/shared/catalina-sudo/sudo.ts b/lib/shared/catalina-sudo/sudo.ts
@@ -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`,
 					),
 				},
 			},
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,4 +39,6 @@ i18next.use(initReactI18next).init({ @@
     	},
     });
+    export const supportedLocales = ['en', 'zh'];
     export default i18next;