development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 21:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use platform.language more (#171659)

Browse source 
Use platform.language in more places
This commit is contained in:
Raymond Zhao 2023-01-18 11:23:28 -08:00 committed by GitHub
parent b7275107cc
commit 7b1f598090
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main.js
View file

@ -575,11 +575,14 @@ async function resolveNlsConfiguration() {
// VS Code moves to Electron 22.
// Ref https://github.com/microsoft/vscode/issues/159813
// and https://github.com/electron/electron/pull/36035
// if ('getPreferredSystemLanguages' in app
// && typeof app.getPreferredSystemLanguages === 'function'
// && app.getPreferredSystemLanguages().length) {
// appLocale = app.getPreferredSystemLanguages()[0];
// }
if (process.platform === 'win32'
&& 'getPreferredSystemLanguages' in app
&& typeof app.getPreferredSystemLanguages === 'function'
&& app.getPreferredSystemLanguages().length) {
// Use the most preferred OS language for language recommendation.
appLocale = app.getPreferredSystemLanguages()[0];
}
if (!appLocale) {
nlsConfiguration = { locale: 'en', availableLanguages: {} };
} else {
@ -587,6 +590,12 @@ async function resolveNlsConfiguration() {
// See above the comment about the loader and case sensitiveness
appLocale = appLocale.toLowerCase();
if (appLocale.startsWith('zh-hans')) {
appLocale = 'zh-cn';
} else if (appLocale.startsWith('zh-hant')) {
appLocale = 'zh-tw';
}
const { getNLSConfiguration } = require('./vs/base/node/languagePacks');
nlsConfiguration = await getNLSConfiguration(product.commit, userDataPath, metaDataFile, appLocale);
if (!nlsConfiguration) {

3
src/vs/workbench/contrib/comments/browser/timestamp.ts
View file

@ -6,6 +6,7 @@
import * as dom from 'vs/base/browser/dom';
import { fromNow } from 'vs/base/common/date';
import { Disposable } from 'vs/base/common/lifecycle';
import { language } from 'vs/base/common/platform';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { COMMENTS_SECTION, ICommentsConfiguration } from 'vs/workbench/contrib/comments/common/commentsConfiguration';
@ -62,6 +63,6 @@ export class TimestampWidget extends Disposable {
}
private getDateString(date: Date): string {
return date.toLocaleString();
return date.toLocaleString(language);
}
}

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

@ -89,12 +89,7 @@ export class LocalizationWorkbenchContribution extends Disposable implements IWo
private checkAndInstall(): void {
const language = platform.language;
let locale = platform.locale ?? '';
if (locale.startsWith('zh-hans')) {
locale = 'zh-cn';
} else if (locale.startsWith('zh-hant')) {
locale = 'zh-tw';
}
const locale = platform.locale ?? '';
const languagePackSuggestionIgnoreList = <string[]>JSON.parse(this.storageService.get(LANGUAGEPACK_SUGGESTION_IGNORE_STORAGE_KEY, StorageScope.APPLICATION, '[]'));
if (!this.galleryService.isEnabled()) {

3
src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.ts
View file

@ -5,6 +5,7 @@
import { disposableTimeout, RunOnceScheduler } from 'vs/base/common/async';
import { Disposable, dispose, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
import { language } from 'vs/base/common/platform';
import { localize } from 'vs/nls';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { themeColorFromId } from 'vs/platform/theme/common/themeService';
@ -273,7 +274,7 @@ class TimerCellStatusBarItem extends Disposable {
text: formatCellDuration(duration),
alignment: CellStatusbarAlignment.Left,
priority: Number.MAX_SAFE_INTEGER - 1,
tooltip: isDone ? new Date(endTime).toLocaleString() : undefined
tooltip: isDone ? new Date(endTime).toLocaleString(language) : undefined
};
}

4
src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
View file

@ -14,7 +14,7 @@ import { IConfigurationResolverService } from 'vs/workbench/services/configurati
import { sanitizeProcessEnvironment } from 'vs/base/common/processes';
import { ILogService } from 'vs/platform/log/common/log';
import { IShellLaunchConfig, ITerminalEnvironment, TerminalSettingId, TerminalSettingPrefix, TerminalShellType, WindowsShellType } from 'vs/platform/terminal/common/terminal';
import { IProcessEnvironment, isWindows, locale, OperatingSystem, platform, Platform } from 'vs/base/common/platform';
import { IProcessEnvironment, isWindows, language, OperatingSystem, platform, Platform } from 'vs/base/common/platform';
import { escapeNonWindowsPath, sanitizeCwd } from 'vs/platform/terminal/common/terminalEnvironment';
import { isString } from 'vs/base/common/types';
import { ITerminalBackend } from 'vs/workbench/contrib/terminal/common/terminal';
@ -390,7 +390,7 @@ export async function createTerminalEnvironment(
mergeEnvironments(env, shellLaunchConfig.env);
// Adding other env keys necessary to create the process
addTerminalEnvironmentKeys(env, version, locale, detectLocale);
addTerminalEnvironmentKeys(env, version, language, detectLocale);
}
return env;
}

3
src/vs/workbench/contrib/testing/browser/testingOutputTerminalService.ts
View file

@ -6,6 +6,7 @@
import { DeferredPromise } from 'vs/base/common/async';
import { Emitter, Event } from 'vs/base/common/event';
import { Disposable } from 'vs/base/common/lifecycle';
import { language } from 'vs/base/common/platform';
import { listenStream } from 'vs/base/common/stream';
import { isDefined } from 'vs/base/common/types';
import { localize } from 'vs/nls';
@ -152,7 +153,7 @@ export class TestingOutputTerminalService implements ITestingOutputTerminalServi
}
const completedAt = result.completedAt ? new Date(result.completedAt) : new Date();
const text = localize('runFinished', 'Test run finished at {0}', completedAt.toLocaleString());
const text = localize('runFinished', 'Test run finished at {0}', completedAt.toLocaleString(language));
output.pushData(`\r\n\r\n\x1b[1m> ${text} <\x1b[0m\r\n\r\n`);
output.ended = true;
this.revealMarker(terminal, thenSelectMarker);

3
src/vs/workbench/contrib/testing/common/testResult.ts
View file

@ -15,6 +15,7 @@ import { TestCoverage } from 'vs/workbench/contrib/testing/common/testCoverage';
import { maxPriority, statesInOrder, terminalStatePriorities } from 'vs/workbench/contrib/testing/common/testingStates';
import { removeAnsiEscapeCodes } from 'vs/base/common/strings';
import { TestId } from 'vs/workbench/contrib/testing/common/testId';
import { language } from 'vs/base/common/platform';
export interface ITestRunTaskResults extends ITestRunTask {
/**
@ -286,7 +287,7 @@ export class LiveTestResult implements ITestResult {
public readonly onChange = this.changeEmitter.event;
public readonly onComplete = this.completeEmitter.event;
public readonly tasks: ITestRunTaskResults[] = [];
public readonly name = localize('runFinished', 'Test run at {0}', new Date().toLocaleString());
public readonly name = localize('runFinished', 'Test run at {0}', new Date().toLocaleString(language));
/**
* @inheritdoc