development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-07-05 01:08:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Have English language return default result (#175157)

Browse Source 
Fixes #174848
This commit is contained in:
Tyler James Leonhardt 2023-02-22 11:01:44 -08:00 committed by GitHub
parent 87d5346c17
commit 3c9f409888
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/vs/base/node/languagePacks.js
View File

@ -112,33 +112,32 @@
* @param {string | undefined} language
*/
function getNLSConfiguration(commit, userDataPath, metaDataFile, locale, language) {
if (process.env['VSCODE_DEV']) {
const defaultResult = function (locale) {
perf.mark('code/didGenerateNls');
return Promise.resolve({ locale, availableLanguages: {} });
};
perf.mark('code/willGenerateNls');
// We are in development mode. So we don't have a built version
if (process.env['VSCODE_DEV']) {
return defaultResult(locale);
}
// Also in development mode if we don't have a commit
if (!commit) {
return defaultResult(locale);
}
// We have a built version so we have extracted nls file. Try to find
// the right file to use.
// If we didn't specify a language, use the default
if (!language) {
return Promise.resolve({ locale, availableLanguages: {} });
// If we didn't specify a language, or if we specified English or English US,
// use the default.
if (!language || language === 'en' || language === 'en-us') {
return defaultResult(locale);
}
// If we specified English or English US, return that as the available language.
if (language === 'en' || language === 'en-us') {
return Promise.resolve({ locale, availableLanguages: { '*': 'en' } });
}
perf.mark('code/willGenerateNls');
const defaultResult = function (locale) {
perf.mark('code/didGenerateNls');
return Promise.resolve({ locale, availableLanguages: {} });
};
try {
if (!commit) {
return defaultResult(locale);
}
return getLanguagePackConfigurations(userDataPath).then(configs => {
if (!configs) {
return defaultResult(locale);