Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 18:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Finalize localization API (#163344)

Browse Source
This commit is contained in:
Tyler James Leonhardt
2022-10-11 12:39:39 -07:00
committed by GitHub
parent 864b8b2b6c
commit 53785ee45d
6 changed files with 77 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/workbench/api/common/extHost.api.impl.ts
View File

@@ -1171,14 +1171,12 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
// namespace: l10n
const l10n: typeof vscode.l10n = {
t(...params: [message: string, ...args: Array<string | number>] | [message: string, args: Record<string, any>] | [{ message: string; args?: Array<string | number> | Record<string, any>; comment: string[] }]): string {
checkProposedApiEnabled(extension, 'localization');
t(...params: [message: string, ...args: Array<string | number | boolean>] | [message: string, args: Record<string, any>] | [{ message: string; args?: Array<string | number | boolean> | Record<string, any>; comment: string | string[] }]): string {
if (typeof params[0] === 'string') {
const key = params.shift() as string;
// We have either rest args which are Array<string | number> or an array with a single Record<string, any>. This ensures we get a
// Record<string | number> which will be formatted correctly.
// We have either rest args which are Array<string | number | boolean> or an array with a single Record<string, any>.
// This ensures we get a Record<string | number, any> which will be formatted correctly.
const argsFormatted = !params || typeof params[0] !== 'object' ? params : params[0];
return extHostLocalization.getMessage(extension.identifier.value, { message: key, args: argsFormatted as Record<string | number, any> | undefined });
}
@@ -1186,11 +1184,9 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
return extHostLocalization.getMessage(extension.identifier.value, params[0]);
},
get bundle() {
checkProposedApiEnabled(extension, 'localization');
return extHostLocalization.getBundle(extension.identifier.value);
},
get uri() {
checkProposedApiEnabled(extension, 'localization');
return extHostLocalization.getBundleUri(extension.identifier.value);
}
};

2
src/vs/workbench/api/common/extHost.protocol.ts
View File

@@ -2209,7 +2209,7 @@ export interface ExtHostLocalizationShape {
export interface IStringDetails {
message: string;
args?: Record<string | number, any>;
comment?: string[];
comment?: string | string[];
}
export interface ITestControllerPatch {

2
src/vs/workbench/api/common/extHostLocalizationService.ts
View File

@@ -40,7 +40,7 @@ export class ExtHostLocalizationService implements ExtHostLocalizationShape {
let key = message;
if (comment && comment.length > 0) {
key += `/${comment.join()}`;
key += `/${Array.isArray(comment) ? comment.join() : comment}`;
}
const str = this.bundleCache.get(extensionId)?.contents[key];
if (!str) {