Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-14 12:11:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add more checks, fixes #166771 (#166884)

Browse Source
This commit is contained in:
Raymond Zhao
2022-11-21 11:28:55 -08:00
committed by GitHub
parent ad9e0692ed
commit ebb77a7dfd
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.js
+12 -8
View File
@@ -567,17 +567,21 @@ async function resolveNlsConfiguration() {
// valid after we have received the app ready event. This is why the
// code is here.
// The ternary and ts-ignore can both be removed once Electron
// officially adopts the getPreferredSystemLanguages API.
// Ref https://github.com/microsoft/vscode/issues/159813
// and https://github.com/electron/electron/pull/36035
/**
* @type string
*/
// @ts-ignore API not yet available in the official Electron
let appLocale = ((product.quality === 'insider' || product.quality === 'exploration') && app?.getPreferredSystemLanguages()?.length) ?
// @ts-ignore API not yet available in the official Electron
app.getPreferredSystemLanguages()[0] : app.getLocale();
let appLocale = app.getLocale();
// This if statement can be simplified once
// VS Code moves to Electron 22.
// Ref https://github.com/microsoft/vscode/issues/159813
// and https://github.com/electron/electron/pull/36035
if ((product.quality === 'insider' || product.quality === 'exploration')
&& 'getPreferredSystemLanguages' in app
&& typeof app.getPreferredSystemLanguages === 'function'
&& app.getPreferredSystemLanguages().length) {
appLocale = app.getPreferredSystemLanguages()[0];
}
if (!appLocale) {
nlsConfiguration = { locale: 'en', availableLanguages: {} };
} else {