From e8fa3e41f011f35c9e2f0743d1eb7ab2213cc14e Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Fri, 4 Nov 2022 12:21:19 -0700 Subject: [PATCH] Adopt l10n for jake (#165541) For #164438 --- extensions/jake/package.json | 4 +--- extensions/jake/src/main.ts | 8 +++----- extensions/jake/yarn.lock | 5 ----- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/extensions/jake/package.json b/extensions/jake/package.json index 4e6a94a8b24..e34118ca7a3 100644 --- a/extensions/jake/package.json +++ b/extensions/jake/package.json @@ -16,9 +16,7 @@ "compile": "gulp compile-extension:jake", "watch": "gulp watch-extension:jake" }, - "dependencies": { - "vscode-nls": "^5.2.0" - }, + "dependencies": {}, "devDependencies": { "@types/node": "16.x" }, diff --git a/extensions/jake/src/main.ts b/extensions/jake/src/main.ts index eba135e1530..33d39e288a4 100644 --- a/extensions/jake/src/main.ts +++ b/extensions/jake/src/main.ts @@ -7,8 +7,6 @@ import * as path from 'path'; import * as fs from 'fs'; import * as cp from 'child_process'; import * as vscode from 'vscode'; -import * as nls from 'vscode-nls'; -const localize = nls.loadMessageBundle(); type AutoDetect = 'on' | 'off'; @@ -60,8 +58,8 @@ function getOutputChannel(): vscode.OutputChannel { } function showError() { - vscode.window.showWarningMessage(localize('jakeTaskDetectError', 'Problem finding jake tasks. See the output for more information.'), - localize('jakeShowOutput', 'Go to output')).then(() => { + vscode.window.showWarningMessage(vscode.l10n.t("Problem finding jake tasks. See the output for more information."), + vscode.l10n.t("Go to output")).then(() => { getOutputChannel().show(true); }); } @@ -189,7 +187,7 @@ class FolderDetector { if (err.stdout) { channel.appendLine(err.stdout); } - channel.appendLine(localize('execFailed', 'Auto detecting Jake for folder {0} failed with error: {1}', this.workspaceFolder.name, err.error ? err.error.toString() : 'unknown')); + channel.appendLine(vscode.l10n.t("Auto detecting Jake for folder {0} failed with error: {1}', this.workspaceFolder.name, err.error ? err.error.toString() : 'unknown")); showError(); return emptyTasks; } diff --git a/extensions/jake/yarn.lock b/extensions/jake/yarn.lock index 8b8c7a6c15b..e724e7fffa3 100644 --- a/extensions/jake/yarn.lock +++ b/extensions/jake/yarn.lock @@ -6,8 +6,3 @@ version "16.11.6" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== - -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==