From 86ec9456be29df46c6ae3f3c6c95ea362f696b17 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Fri, 4 Nov 2022 10:32:34 -0700 Subject: [PATCH] Adopt l10n for media-preview For #164438 --- extensions/media-preview/package.json | 3 +-- extensions/media-preview/src/audioPreview.ts | 7 ++----- .../media-preview/src/binarySizeStatusBarEntry.ts | 14 ++++++-------- extensions/media-preview/src/imagePreview/index.ts | 6 ++---- .../src/imagePreview/sizeStatusBarEntry.ts | 4 +--- .../src/imagePreview/zoomStatusBarEntry.ts | 8 +++----- extensions/media-preview/src/videoPreview.ts | 6 ++---- extensions/media-preview/yarn.lock | 5 ----- 8 files changed, 17 insertions(+), 36 deletions(-) diff --git a/extensions/media-preview/package.json b/extensions/media-preview/package.json index 384ab75f58b48..598c4ad135890 100644 --- a/extensions/media-preview/package.json +++ b/extensions/media-preview/package.json @@ -101,8 +101,7 @@ "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose" }, "dependencies": { - "@vscode/extension-telemetry": "0.6.2", - "vscode-nls": "^5.2.0" + "@vscode/extension-telemetry": "0.6.2" }, "repository": { "type": "git", diff --git a/extensions/media-preview/src/audioPreview.ts b/extensions/media-preview/src/audioPreview.ts index 2769ae3cbfb9e..9e2670cddad35 100644 --- a/extensions/media-preview/src/audioPreview.ts +++ b/extensions/media-preview/src/audioPreview.ts @@ -4,13 +4,10 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import * as nls from 'vscode-nls'; import { BinarySizeStatusBarEntry } from './binarySizeStatusBarEntry'; import { MediaPreview, reopenAsText } from './mediaPreview'; import { escapeAttribute, getNonce } from './util/dom'; -const localize = nls.loadMessageBundle(); - class AudioPreviewProvider implements vscode.CustomReadonlyEditorProvider { public static readonly viewType = 'vscode.audioPreview'; @@ -82,8 +79,8 @@ class AudioPreview extends MediaPreview {
-

${localize('preview.audioLoadError', "An error occurred while loading the audio file.")}

- ${localize('preview.audioLoadErrorLink', "Open file using VS Code's standard text/binary editor?")} +

${vscode.l10n.t("An error occurred while loading the audio file.")}

+ ${vscode.l10n.t("Open file using VS Code's standard text/binary editor?")}
diff --git a/extensions/media-preview/src/binarySizeStatusBarEntry.ts b/extensions/media-preview/src/binarySizeStatusBarEntry.ts index da41ccfe5e595..af34bf8787ec0 100644 --- a/extensions/media-preview/src/binarySizeStatusBarEntry.ts +++ b/extensions/media-preview/src/binarySizeStatusBarEntry.ts @@ -4,10 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import * as nls from 'vscode-nls'; import { PreviewStatusBarEntry } from './ownedStatusBarEntry'; -const localize = nls.loadMessageBundle(); class BinarySize { static readonly KB = 1024; @@ -17,29 +15,29 @@ class BinarySize { static formatSize(size: number): string { if (size < BinarySize.KB) { - return localize('sizeB', "{0}B", size); + return vscode.l10n.t("{0}B", size); } if (size < BinarySize.MB) { - return localize('sizeKB', "{0}KB", (size / BinarySize.KB).toFixed(2)); + return vscode.l10n.t("{0}KB", (size / BinarySize.KB).toFixed(2)); } if (size < BinarySize.GB) { - return localize('sizeMB', "{0}MB", (size / BinarySize.MB).toFixed(2)); + return vscode.l10n.t("{0}MB", (size / BinarySize.MB).toFixed(2)); } if (size < BinarySize.TB) { - return localize('sizeGB', "{0}GB", (size / BinarySize.GB).toFixed(2)); + return vscode.l10n.t("{0}GB", (size / BinarySize.GB).toFixed(2)); } - return localize('sizeTB', "{0}TB", (size / BinarySize.TB).toFixed(2)); + return vscode.l10n.t("{0}TB", (size / BinarySize.TB).toFixed(2)); } } export class BinarySizeStatusBarEntry extends PreviewStatusBarEntry { constructor() { - super('status.imagePreview.binarySize', localize('sizeStatusBar.name', "Image Binary Size"), vscode.StatusBarAlignment.Right, 100); + super('status.imagePreview.binarySize', vscode.l10n.t("Image Binary Size"), vscode.StatusBarAlignment.Right, 100); } public show(owner: unknown, size: number | undefined) { diff --git a/extensions/media-preview/src/imagePreview/index.ts b/extensions/media-preview/src/imagePreview/index.ts index 5c0d56933ba18..f62f6699a2aaa 100644 --- a/extensions/media-preview/src/imagePreview/index.ts +++ b/extensions/media-preview/src/imagePreview/index.ts @@ -4,14 +4,12 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import * as nls from 'vscode-nls'; import { BinarySizeStatusBarEntry } from '../binarySizeStatusBarEntry'; import { MediaPreview, PreviewState, reopenAsText } from '../mediaPreview'; import { escapeAttribute, getNonce } from '../util/dom'; import { SizeStatusBarEntry } from './sizeStatusBarEntry'; import { Scale, ZoomStatusBarEntry } from './zoomStatusBarEntry'; -const localize = nls.loadMessageBundle(); export class PreviewManager implements vscode.CustomReadonlyEditorProvider { @@ -181,8 +179,8 @@ class ImagePreview extends MediaPreview {
-

${localize('preview.imageLoadError', "An error occurred while loading the image.")}

- ${localize('preview.imageLoadErrorLink', "Open file using VS Code's standard text/binary editor?")} +

${vscode.l10n.t("An error occurred while loading the image.")}

+ ${vscode.l10n.t("Open file using VS Code's standard text/binary editor?")}
diff --git a/extensions/media-preview/src/imagePreview/sizeStatusBarEntry.ts b/extensions/media-preview/src/imagePreview/sizeStatusBarEntry.ts index 397a2ffd97a18..cdd3b15c76eee 100644 --- a/extensions/media-preview/src/imagePreview/sizeStatusBarEntry.ts +++ b/extensions/media-preview/src/imagePreview/sizeStatusBarEntry.ts @@ -4,15 +4,13 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import * as nls from 'vscode-nls'; import { PreviewStatusBarEntry } from '../ownedStatusBarEntry'; -const localize = nls.loadMessageBundle(); export class SizeStatusBarEntry extends PreviewStatusBarEntry { constructor() { - super('status.imagePreview.size', localize('sizeStatusBar.name', "Image Size"), vscode.StatusBarAlignment.Right, 101 /* to the left of editor status (100) */); + super('status.imagePreview.size', vscode.l10n.t("Image Size"), vscode.StatusBarAlignment.Right, 101 /* to the left of editor status (100) */); } public show(owner: unknown, text: string) { diff --git a/extensions/media-preview/src/imagePreview/zoomStatusBarEntry.ts b/extensions/media-preview/src/imagePreview/zoomStatusBarEntry.ts index de0729bebf121..84c4f00c507e3 100644 --- a/extensions/media-preview/src/imagePreview/zoomStatusBarEntry.ts +++ b/extensions/media-preview/src/imagePreview/zoomStatusBarEntry.ts @@ -4,10 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import * as nls from 'vscode-nls'; import { PreviewStatusBarEntry as OwnedStatusBarEntry } from '../ownedStatusBarEntry'; -const localize = nls.loadMessageBundle(); const selectZoomLevelCommandId = '_imagePreview.selectZoomLevel'; @@ -19,7 +17,7 @@ export class ZoomStatusBarEntry extends OwnedStatusBarEntry { public readonly onDidChangeScale = this._onDidChangeScale.event; constructor() { - super('status.imagePreview.zoom', localize('zoomStatusBar.name', "Image Zoom"), vscode.StatusBarAlignment.Right, 102 /* to the left of editor size entry (101) */); + super('status.imagePreview.zoom', vscode.l10n.t("Image Zoom"), vscode.StatusBarAlignment.Right, 102 /* to the left of editor size entry (101) */); this._register(vscode.commands.registerCommand(selectZoomLevelCommandId, async () => { type MyPickItem = vscode.QuickPickItem & { scale: Scale }; @@ -31,7 +29,7 @@ export class ZoomStatusBarEntry extends OwnedStatusBarEntry { })); const pick = await vscode.window.showQuickPick(options, { - placeHolder: localize('zoomStatusBar.placeholder', "Select zoom level") + placeHolder: vscode.l10n.t("Select zoom level") }); if (pick) { this._onDidChangeScale.fire({ scale: pick.scale }); @@ -47,7 +45,7 @@ export class ZoomStatusBarEntry extends OwnedStatusBarEntry { private zoomLabel(scale: Scale): string { return scale === 'fit' - ? localize('zoomStatusBar.wholeImageLabel', "Whole Image") + ? vscode.l10n.t("Whole Image") : `${Math.round(scale * 100)}%`; } } diff --git a/extensions/media-preview/src/videoPreview.ts b/extensions/media-preview/src/videoPreview.ts index 8dae5ec7b67b9..092d9b967519d 100644 --- a/extensions/media-preview/src/videoPreview.ts +++ b/extensions/media-preview/src/videoPreview.ts @@ -4,12 +4,10 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import * as nls from 'vscode-nls'; import { BinarySizeStatusBarEntry } from './binarySizeStatusBarEntry'; import { MediaPreview, reopenAsText } from './mediaPreview'; import { escapeAttribute, getNonce } from './util/dom'; -const localize = nls.loadMessageBundle(); class VideoPreviewProvider implements vscode.CustomReadonlyEditorProvider { @@ -82,8 +80,8 @@ class VideoPreview extends MediaPreview {
-

${localize('preview.videoLoadError', "An error occurred while loading the video file.")}

- ${localize('preview.videoLoadErrorLink', "Open file using VS Code's standard text/binary editor?")} +

${vscode.l10n.t("An error occurred while loading the video file.")}

+ ${vscode.l10n.t("Open file using VS Code's standard text/binary editor?")}
diff --git a/extensions/media-preview/yarn.lock b/extensions/media-preview/yarn.lock index a9af1f07de404..fdc91f610709a 100644 --- a/extensions/media-preview/yarn.lock +++ b/extensions/media-preview/yarn.lock @@ -45,8 +45,3 @@ dependencies: "@microsoft/1ds-core-js" "^3.2.3" "@microsoft/1ds-post-js" "^3.2.3" - -vscode-nls@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f" - integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==