Improve the recommender system

src/main.js

@@ -573,16 +573,24 @@ async function resolveNlsConfiguration() {
 		// The ternary and ts-ignore can both be removed once Electron
 		// officially adopts the getSystemLocale API.
 		// Ref https://github.com/electron/electron/pull/35697
+		/**
+		 * @type string
+		 */
 		let appLocale = (product.quality === 'insider' || product.quality === 'exploration') ?
 			// @ts-ignore API not yet available in the official Electron
 			app.getSystemLocale() : app.getLocale();
 		if (!appLocale) {
 			nlsConfiguration = { locale: 'en', availableLanguages: {} };
 		} else {
-
 			// See above the comment about the loader and case sensitiveness
 			appLocale = appLocale.toLowerCase();
 
+			if (!appLocale.startsWith('pt') && !appLocale.startsWith('zh')) {
+				// Trim off the country code to help with the recommender.
+				// If - isn't in the string, the following code leaves appLocale unchanged.
+				appLocale = appLocale.split('-')[0];
+			}
+
 			const { getNLSConfiguration } = require('./vs/base/node/languagePacks');
 			nlsConfiguration = await getNLSConfiguration(product.commit, userDataPath, metaDataFile, appLocale);
 			if (!nlsConfiguration) {

src/vs/workbench/contrib/localization/electron-sandbox/localization.contribution.ts

@@ -86,7 +86,6 @@ export class LocalizationWorkbenchContribution extends Disposable implements IWo
 	}
 
 	private checkAndInstall(): void {
-		// The locale can contain extraneous country codes, such as fr-CA
 		const language = platform.language;
 		const locale = platform.locale;
 		const languagePackSuggestionIgnoreList = <string[]>JSON.parse(this.storageService.get(LANGUAGEPACK_SUGGESTION_IGNORE_STORAGE_KEY, StorageScope.APPLICATION, '[]'));
@@ -97,7 +96,7 @@ export class LocalizationWorkbenchContribution extends Disposable implements IWo
 		if (!language || !locale || locale === 'en' || locale.indexOf('en-') === 0) {
 			return;
 		}
-		if (locale.startsWith(language) || languagePackSuggestionIgnoreList.includes(locale)) {
+		if (language === locale || languagePackSuggestionIgnoreList.includes(locale)) {
 			return;
 		}
 
@@ -112,16 +111,16 @@ export class LocalizationWorkbenchContribution extends Disposable implements IWo
 						return;
 					}
 
-					const extensionToInstall = tagResult.total === 1 ? tagResult.firstPage[0] : tagResult.firstPage.find(e => e.publisher === 'MS-CEINTL' && e.name.startsWith('vscode-language-pack'))!;
-					const extensionToFetchTranslationsFrom = extensionToInstall || tagResult.firstPage[0];
+					const extensionToInstall = tagResult.total === 1 ? tagResult.firstPage[0] : tagResult.firstPage.find(e => e.publisher === 'MS-CEINTL' && e.name.startsWith('vscode-language-pack'));
+					const extensionToFetchTranslationsFrom = extensionToInstall ?? tagResult.firstPage[0];
 
 					if (!extensionToFetchTranslationsFrom.assets.manifest) {
 						return;
 					}
 
 					Promise.all([this.galleryService.getManifest(extensionToFetchTranslationsFrom, CancellationToken.None), this.galleryService.getCoreTranslation(extensionToFetchTranslationsFrom, locale)])
 						.then(([manifest, translation]) => {
-							const loc = manifest && manifest.contributes && manifest.contributes.localizations && manifest.contributes.localizations.find(x => locale.startsWith(x.languageId.toLowerCase()));
+							const loc = manifest && manifest.contributes && manifest.contributes.localizations && manifest.contributes.localizations.find(x => x.languageId.toLowerCase() === locale);
 							const languageName = loc ? (loc.languageName || locale) : locale;
 							const languageDisplayName = loc ? (loc.localizedLanguageName || loc.languageName || locale) : locale;
 							const translationsFromPack: { [key: string]: string } = translation?.contents?.['vs/workbench/contrib/localization/electron-sandbox/minimalTranslations'] ?? {};
@@ -165,7 +164,7 @@ export class LocalizationWorkbenchContribution extends Disposable implements IWo
 								label: translations['installAndRestart'],
 								run: () => {
 									logUserReaction('installAndRestart');
-									this.installExtension(extensionToInstall).then(() => this.hostService.restart());
+									this.installExtension(extensionToInstall!).then(() => this.hostService.restart());
 								}
 							};