Skip to content

Commit fd7e27f

Browse files
TylerLeonhardtTylerLeonhardt
authored
onboard built-in debug extensions to l10n (microsoft#166300)
1 parent 0537f30 commit fd7e27f

File tree

6 files changed

+21
-57
lines changed

6 files changed

+21
-57
lines changed

‎extensions/debug-auto-launch/package.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
}
3333
]
3434
},
35-
"dependencies": {
36-
"vscode-nls": "^5.2.0"
37-
},
3835
"devDependencies": {
3936
"@types/node": "16.x"
4037
},

‎extensions/debug-auto-launch/src/extension.ts‎

Lines changed: 19 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,54 +6,37 @@
66
import { promises as fs } from 'fs';
77
import { createServer, Server } from 'net';
88
import * as vscode from 'vscode';
9-
import * as nls from 'vscode-nls';
109

1110
const enum State {
1211
Disabled = 'disabled',
1312
OnlyWithFlag = 'onlyWithFlag',
1413
Smart = 'smart',
1514
Always = 'always',
1615
}
17-
const localize = nls.loadMessageBundle();
1816
const TEXT_STATUSBAR_LABEL = {
19-
[State.Disabled]: localize('status.text.auto.attach.disabled', 'Auto Attach: Disabled'),
20-
[State.Always]: localize('status.text.auto.attach.always', 'Auto Attach: Always'),
21-
[State.Smart]: localize('status.text.auto.attach.smart', 'Auto Attach: Smart'),
22-
[State.OnlyWithFlag]: localize('status.text.auto.attach.withFlag', 'Auto Attach: With Flag'),
17+
[State.Disabled]: vscode.l10n.t('Auto Attach: Disabled'),
18+
[State.Always]: vscode.l10n.t('Auto Attach: Always'),
19+
[State.Smart]: vscode.l10n.t('Auto Attach: Smart'),
20+
[State.OnlyWithFlag]: vscode.l10n.t('Auto Attach: With Flag'),
2321
};
2422

2523
const TEXT_STATE_LABEL = {
26-
[State.Disabled]: localize('debug.javascript.autoAttach.disabled.label', 'Disabled'),
27-
[State.Always]: localize('debug.javascript.autoAttach.always.label', 'Always'),
28-
[State.Smart]: localize('debug.javascript.autoAttach.smart.label', 'Smart'),
29-
[State.OnlyWithFlag]: localize(
30-
'debug.javascript.autoAttach.onlyWithFlag.label',
31-
'Only With Flag',
32-
),
24+
[State.Disabled]: vscode.l10n.t('Disabled'),
25+
[State.Always]: vscode.l10n.t('Always'),
26+
[State.Smart]: vscode.l10n.t('Smart'),
27+
[State.OnlyWithFlag]: vscode.l10n.t('Only With Flag'),
3328
};
3429
const TEXT_STATE_DESCRIPTION = {
35-
[State.Disabled]: localize(
36-
'debug.javascript.autoAttach.disabled.description',
37-
'Auto attach is disabled and not shown in status bar',
38-
),
39-
[State.Always]: localize(
40-
'debug.javascript.autoAttach.always.description',
41-
'Auto attach to every Node.js process launched in the terminal',
42-
),
43-
[State.Smart]: localize(
44-
'debug.javascript.autoAttach.smart.description',
45-
"Auto attach when running scripts that aren't in a node_modules folder",
46-
),
47-
[State.OnlyWithFlag]: localize(
48-
'debug.javascript.autoAttach.onlyWithFlag.description',
49-
'Only auto attach when the `--inspect` flag is given',
50-
),
30+
[State.Disabled]: vscode.l10n.t('Auto attach is disabled and not shown in status bar'),
31+
[State.Always]: vscode.l10n.t('Auto attach to every Node.js process launched in the terminal'),
32+
[State.Smart]: vscode.l10n.t("Auto attach when running scripts that aren't in a node_modules folder"),
33+
[State.OnlyWithFlag]: vscode.l10n.t('Only auto attach when the `--inspect` flag is given')
5134
};
52-
const TEXT_TOGGLE_WORKSPACE = localize('scope.workspace', 'Toggle auto attach in this workspace');
53-
const TEXT_TOGGLE_GLOBAL = localize('scope.global', 'Toggle auto attach on this machine');
54-
const TEXT_TEMP_DISABLE = localize('tempDisable.disable', 'Temporarily disable auto attach in this session');
55-
const TEXT_TEMP_ENABLE = localize('tempDisable.enable', 'Re-enable auto attach');
56-
const TEXT_TEMP_DISABLE_LABEL = localize('tempDisable.suffix', 'Auto Attach: Disabled');
35+
const TEXT_TOGGLE_WORKSPACE = vscode.l10n.t('Toggle auto attach in this workspace');
36+
const TEXT_TOGGLE_GLOBAL = vscode.l10n.t('Toggle auto attach on this machine');
37+
const TEXT_TEMP_DISABLE = vscode.l10n.t('Temporarily disable auto attach in this session');
38+
const TEXT_TEMP_ENABLE = vscode.l10n.t('Re-enable auto attach');
39+
const TEXT_TEMP_DISABLE_LABEL = vscode.l10n.t('Auto Attach: Disabled');
5740

5841
const TOGGLE_COMMAND = 'extension.node-debug.toggleAutoAttach';
5942
const STORAGE_IPC = 'jsDebugIpcState';
@@ -318,9 +301,9 @@ function updateStatusBar(context: vscode.ExtensionContext, state: State, busy =
318301

319302
if (!statusItem) {
320303
statusItem = vscode.window.createStatusBarItem('status.debug.autoAttach', vscode.StatusBarAlignment.Left);
321-
statusItem.name = localize('status.name.auto.attach', "Debug Auto Attach");
304+
statusItem.name = vscode.l10n.t("Debug Auto Attach");
322305
statusItem.command = TOGGLE_COMMAND;
323-
statusItem.tooltip = localize('status.tooltip.auto.attach', "Automatically attach to node.js processes in debug mode");
306+
statusItem.tooltip = vscode.l10n.t("Automatically attach to node.js processes in debug mode");
324307
context.subscriptions.push(statusItem);
325308
}
326309

‎extensions/debug-auto-launch/yarn.lock‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,3 @@
66
version "16.11.6"
77
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae"
88
integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==
9-
10-
vscode-nls@^5.2.0:
11-
version "5.2.0"
12-
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f"
13-
integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==

‎extensions/debug-server-ready/package.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,6 @@
149149
}
150150
]
151151
},
152-
"dependencies": {
153-
"vscode-nls": "^5.2.0"
154-
},
155152
"devDependencies": {
156153
"@types/node": "16.x"
157154
},

‎extensions/debug-server-ready/src/extension.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55

66
import * as vscode from 'vscode';
77
import * as util from 'util';
8-
import * as nls from 'vscode-nls';
9-
10-
const localize = nls.loadMessageBundle();
118

129
const PATTERN = 'listening on.* (https?://\\S+|[0-9]+)'; // matches "listening on port 3000" or "Now listening on: https://localhost:5001"
1310
const URI_PORT_FORMAT = 'http://localhost:%s';
@@ -135,7 +132,7 @@ class ServerReadyDetector extends vscode.Disposable {
135132
// verify that format does not contain '%s'
136133
const format = args.uriFormat || '';
137134
if (format.indexOf('%s') >= 0) {
138-
const errMsg = localize('server.ready.nocapture.error', "Format uri ('{0}') uses a substitution placeholder but pattern did not capture anything.", format);
135+
const errMsg = vscode.l10n.t("Format uri ('{0}') uses a substitution placeholder but pattern did not capture anything.", format);
139136
vscode.window.showErrorMessage(errMsg, { modal: true }).then(_ => undefined);
140137
return;
141138
}
@@ -146,7 +143,7 @@ class ServerReadyDetector extends vscode.Disposable {
146143
// verify that format only contains a single '%s'
147144
const s = format.split('%s');
148145
if (s.length !== 2) {
149-
const errMsg = localize('server.ready.placeholder.error', "Format uri ('{0}') must contain exactly one substitution placeholder.", format);
146+
const errMsg = vscode.l10n.t("Format uri ('{0}') must contain exactly one substitution placeholder.", format);
150147
vscode.window.showErrorMessage(errMsg, { modal: true }).then(_ => undefined);
151148
return;
152149
}

‎extensions/debug-server-ready/yarn.lock‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,3 @@
66
version "16.11.6"
77
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae"
88
integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==
9-
10-
vscode-nls@^5.2.0:
11-
version "5.2.0"
12-
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f"
13-
integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==

0 commit comments

Comments
 (0)