Преглед изворни кода

fix(insider): test before using getPreferredSystemLanguages

closes #1335
Baptiste Augrain пре 2 година
родитељ
комит
25985ec81b
2 измењених фајлова са 21 додато и 1 уклоњено
  1. 18 0
      patches/insider/system-languages.patch
  2. 3 1
      product.json

+ 18 - 0
patches/insider/system-languages.patch

@@ -0,0 +1,18 @@
+diff --git a/src/main.js b/src/main.js
+index 63f8c56..a6b7d44 100644
+--- a/src/main.js
++++ b/src/main.js
+@@ -575,6 +575,10 @@ async function resolveNlsConfiguration() {
+ 		 */
+-		// @ts-ignore API not yet available in the official Electron
+-		let appLocale = ((product.quality === 'insider' || product.quality === 'exploration') && app?.getPreferredSystemLanguages()?.length) ?
++		let appLocale = app.getLocale();
++		if (product.quality === 'insider' || product.quality === 'exploration') {
+ 			// @ts-ignore API not yet available in the official Electron
+-			app.getPreferredSystemLanguages()[0] : app.getLocale();
++			if (app.getPreferredSystemLanguages && app?.getPreferredSystemLanguages()?.length) {
++				// @ts-ignore API not yet available in the official Electron
++				appLocale = app.getPreferredSystemLanguages()[0];
++			}
++		}
+ 		if (!appLocale) {

+ 3 - 1
product.json

@@ -157,11 +157,13 @@
       "documentFiltersExclusive"
       "documentFiltersExclusive"
     ],
     ],
     "GitHub.vscode-pull-request-github": [
     "GitHub.vscode-pull-request-github": [
+      "contribCommentThreadAdditionalMenu",
       "tokenInformation",
       "tokenInformation",
       "commentsResolvedState",
       "commentsResolvedState",
       "contribShareMenu",
       "contribShareMenu",
       "contribCommentPeekContext",
       "contribCommentPeekContext",
-      "treeItemCheckbox"
+      "treeItemCheckbox",
+      "codiconDecoration"
     ],
     ],
     "GitHub.copilot": [
     "GitHub.copilot": [
       "inlineCompletionsAdditions"
       "inlineCompletionsAdditions"