Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

grab message from originalMessage as well as localized #154989

Merged
merged 1 commit into from
Jul 12, 2022
Merged

grab message from originalMessage as well as localized #154989

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/vs/platform/extensionManagement/common/extensionsScannerService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import { revive } from 'vs/base/common/marshalling';
import { IExtensionsProfileScannerService, IScannedProfileExtension } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
import { ILocalizedString } from 'vs/platform/action/common/action';

export type IScannedExtensionManifest = IRelaxedExtensionManifest & { __metadata?: Metadata };

Expand Down Expand Up @@ -793,13 +794,23 @@ class ExtensionsScanner extends Disposable {
if (translated === undefined && originalMessages) {
translated = originalMessages[messageKey];
}
let message: string | undefined = typeof translated === 'string' ? translated : (typeof translated?.message === 'string' ? translated.message : undefined);
let message: string | undefined = typeof translated === 'string' ? translated : translated.message;
if (message !== undefined) {
if (pseudo) {
// FF3B and FF3D is the Unicode zenkaku representation for [ and ]
message = '\uFF3B' + message.replace(/[aouei]/g, '$&$&') + '\uFF3D';
}
obj[key] = command && (key === 'title' || key === 'category') && originalMessages ? { value: message, original: originalMessages[messageKey] } : message;
// This branch returns ILocalizedString's instead of Strings so that the Command Palette can contain both the localized and the original value.
if (command && originalMessages && (key === 'title' || key === 'category')) {
const originalMessage = originalMessages[messageKey];
const localizedString: ILocalizedString = {
value: message,
original: typeof originalMessage === 'string' ? originalMessage : originalMessage?.message
};
obj[key] = localizedString;
} else {
obj[key] = message;
}
} else {
this.logService.warn(this.formatMessage(extensionLocation, localize('missingNLSKey', "Couldn't find message for key {0}.", messageKey)));
}
Expand Down