Skip to content

Commit 777ea45

Browse files
mjbvzmjbvz
authored
Adopt localize2 in more places (#203842)
Switches many callers to use `localize2` instead of duplicating strings
1 parent 8c39690 commit 777ea45

File tree

91 files changed

+406
-1087
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+406
-1087
lines changed

‎src/vs/editor/browser/widget/diffEditor/diffEditor.contribution.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
110110
when: ContextKeyExpr.has('isInDiffEditor'),
111111
});
112112

113-
const diffEditorCategory: ILocalizedString = {
114-
value: localize('diffEditor', 'Diff Editor'),
115-
original: 'Diff Editor',
116-
};
113+
const diffEditorCategory: ILocalizedString = localize2('diffEditor', "Diff Editor");
117114

118115
export class SwitchSide extends EditorAction2 {
119116
constructor() {
@@ -212,10 +209,7 @@ export class ShowAllUnchangedRegions extends EditorAction2 {
212209

213210
registerAction2(ShowAllUnchangedRegions);
214211

215-
const accessibleDiffViewerCategory: ILocalizedString = {
216-
value: localize('accessibleDiffViewer', 'Accessible Diff Viewer'),
217-
original: 'Accessible Diff Viewer',
218-
};
212+
const accessibleDiffViewerCategory: ILocalizedString = localize2('accessibleDiffViewer', "Accessible Diff Viewer");
219213

220214
export class AccessibleDiffViewerNext extends Action2 {
221215
public static id = 'editor.action.accessibleDiffViewer.next';

‎src/vs/editor/contrib/clipboard/browser/clipboard.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,11 @@ export const CopyAction = supportsCopy ? registerCommand(new MultiCommand({
108108
}]
109109
})) : undefined;
110110

111-
MenuRegistry.appendMenuItem(MenuId.MenubarEditMenu, { submenu: MenuId.MenubarCopy, title: { value: nls.localize('copy as', "Copy As"), original: 'Copy As', }, group: '2_ccp', order: 3 });
112-
MenuRegistry.appendMenuItem(MenuId.EditorContext, { submenu: MenuId.EditorContextCopy, title: { value: nls.localize('copy as', "Copy As"), original: 'Copy As', }, group: CLIPBOARD_CONTEXT_MENU_GROUP, order: 3 });
113-
MenuRegistry.appendMenuItem(MenuId.EditorContext, { submenu: MenuId.EditorContextShare, title: { value: nls.localize('share', "Share"), original: 'Share', }, group: '11_share', order: -1, when: ContextKeyExpr.and(ContextKeyExpr.notEquals('resourceScheme', 'output'), EditorContextKeys.editorTextFocus) });
114-
MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { submenu: MenuId.EditorTitleContextShare, title: { value: nls.localize('share', "Share"), original: 'Share', }, group: '11_share', order: -1 });
115-
MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { submenu: MenuId.ExplorerContextShare, title: { value: nls.localize('share', "Share"), original: 'Share', }, group: '11_share', order: -1 });
111+
MenuRegistry.appendMenuItem(MenuId.MenubarEditMenu, { submenu: MenuId.MenubarCopy, title: nls.localize2('copy as', "Copy As"), group: '2_ccp', order: 3 });
112+
MenuRegistry.appendMenuItem(MenuId.EditorContext, { submenu: MenuId.EditorContextCopy, title: nls.localize2('copy as', "Copy As"), group: CLIPBOARD_CONTEXT_MENU_GROUP, order: 3 });
113+
MenuRegistry.appendMenuItem(MenuId.EditorContext, { submenu: MenuId.EditorContextShare, title: nls.localize2('share', "Share"), group: '11_share', order: -1, when: ContextKeyExpr.and(ContextKeyExpr.notEquals('resourceScheme', 'output'), EditorContextKeys.editorTextFocus) });
114+
MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { submenu: MenuId.EditorTitleContextShare, title: nls.localize2('share', "Share"), group: '11_share', order: -1 });
115+
MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { submenu: MenuId.ExplorerContextShare, title: nls.localize2('share', "Share"), group: '11_share', order: -1 });
116116

117117
export const PasteAction = supportsPaste ? registerCommand(new MultiCommand({
118118
id: 'editor.action.clipboardPasteAction',

‎src/vs/editor/contrib/gotoSymbol/browser/goToCommands.ts

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -325,10 +325,7 @@ registerAction2(class OpenDefinitionToSideAction extends DefinitionAction {
325325
muteMessage: false
326326
}, {
327327
id: OpenDefinitionToSideAction.id,
328-
title: {
329-
value: nls.localize('actions.goToDeclToSide.label', "Open Definition to the Side"),
330-
original: 'Open Definition to the Side'
331-
},
328+
title: nls.localize2('actions.goToDeclToSide.label', "Open Definition to the Side"),
332329
precondition: ContextKeyExpr.and(
333330
EditorContextKeys.hasDefinitionProvider,
334331
EditorContextKeys.isInWalkThroughSnippet.toNegated()),
@@ -357,10 +354,7 @@ registerAction2(class PeekDefinitionAction extends DefinitionAction {
357354
muteMessage: false
358355
}, {
359356
id: PeekDefinitionAction.id,
360-
title: {
361-
value: nls.localize('actions.previewDecl.label', "Peek Definition"),
362-
original: 'Peek Definition'
363-
},
357+
title: nls.localize2('actions.previewDecl.label', "Peek Definition"),
364358
precondition: ContextKeyExpr.and(
365359
EditorContextKeys.hasDefinitionProvider,
366360
PeekContext.notInPeekEditor,
@@ -455,10 +449,7 @@ registerAction2(class PeekDeclarationAction extends DeclarationAction {
455449
muteMessage: false
456450
}, {
457451
id: 'editor.action.peekDeclaration',
458-
title: {
459-
value: nls.localize('actions.peekDecl.label', "Peek Declaration"),
460-
original: 'Peek Declaration'
461-
},
452+
title: nls.localize2('actions.peekDecl.label', "Peek Declaration"),
462453
precondition: ContextKeyExpr.and(
463454
EditorContextKeys.hasDeclarationProvider,
464455
PeekContext.notInPeekEditor,
@@ -547,10 +538,7 @@ registerAction2(class PeekTypeDefinitionAction extends TypeDefinitionAction {
547538
muteMessage: false
548539
}, {
549540
id: PeekTypeDefinitionAction.ID,
550-
title: {
551-
value: nls.localize('actions.peekTypeDefinition.label', "Peek Type Definition"),
552-
original: 'Peek Type Definition'
553-
},
541+
title: nls.localize2('actions.peekTypeDefinition.label', "Peek Type Definition"),
554542
precondition: ContextKeyExpr.and(
555543
EditorContextKeys.hasTypeDefinitionProvider,
556544
PeekContext.notInPeekEditor,
@@ -639,10 +627,7 @@ registerAction2(class PeekImplementationAction extends ImplementationAction {
639627
muteMessage: false
640628
}, {
641629
id: PeekImplementationAction.ID,
642-
title: {
643-
value: nls.localize('actions.peekImplementation.label', "Peek Implementations"),
644-
original: 'Peek Implementations'
645-
},
630+
title: nls.localize2('actions.peekImplementation.label', "Peek Implementations"),
646631
precondition: ContextKeyExpr.and(
647632
EditorContextKeys.hasImplementationProvider,
648633
PeekContext.notInPeekEditor,
@@ -734,10 +719,7 @@ registerAction2(class PeekReferencesAction extends ReferencesAction {
734719
muteMessage: false
735720
}, {
736721
id: 'editor.action.referenceSearch.trigger',
737-
title: {
738-
value: nls.localize('references.action.label', "Peek References"),
739-
original: 'Peek References'
740-
},
722+
title: nls.localize2('references.action.label', "Peek References"),
741723
precondition: ContextKeyExpr.and(
742724
EditorContextKeys.hasReferenceProvider,
743725
PeekContext.notInPeekEditor,
@@ -770,10 +752,7 @@ class GenericGoToLocationAction extends SymbolNavigationAction {
770752
) {
771753
super(config, {
772754
id: 'editor.action.goToLocation',
773-
title: {
774-
value: nls.localize('label.generic', "Go to Any Symbol"),
775-
original: 'Go to Any Symbol'
776-
},
755+
title: nls.localize2('label.generic', "Go to Any Symbol"),
777756
precondition: ContextKeyExpr.and(
778757
PeekContext.notInPeekEditor,
779758
EditorContextKeys.isInWalkThroughSnippet.toNegated()

‎src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.ts

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import { KeyCode } from 'vs/base/common/keyCodes';
77
import { EditorAction2, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
8-
import { localize } from 'vs/nls';
8+
import { localize, localize2 } from 'vs/nls';
99
import { Categories } from 'vs/platform/action/common/actionCommonCategories';
1010
import { Action2, MenuId } from 'vs/platform/actions/common/actions';
1111
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -74,10 +74,7 @@ export class SelectNextStickyScrollLine extends EditorAction2 {
7474
constructor() {
7575
super({
7676
id: 'editor.action.selectNextStickyScrollLine',
77-
title: {
78-
value: localize('selectNextStickyScrollLine.title', "Select next sticky scroll line"),
79-
original: 'Select next sticky scroll line'
80-
},
77+
title: localize2('selectNextStickyScrollLine.title', "Select next sticky scroll line"),
8178
precondition: EditorContextKeys.stickyScrollFocused.isEqualTo(true),
8279
keybinding: {
8380
weight,
@@ -95,10 +92,7 @@ export class SelectPreviousStickyScrollLine extends EditorAction2 {
9592
constructor() {
9693
super({
9794
id: 'editor.action.selectPreviousStickyScrollLine',
98-
title: {
99-
value: localize('selectPreviousStickyScrollLine.title', "Select previous sticky scroll line"),
100-
original: 'Select previous sticky scroll line'
101-
},
95+
title: localize2('selectPreviousStickyScrollLine.title', "Select previous sticky scroll line"),
10296
precondition: EditorContextKeys.stickyScrollFocused.isEqualTo(true),
10397
keybinding: {
10498
weight,
@@ -116,10 +110,7 @@ export class GoToStickyScrollLine extends EditorAction2 {
116110
constructor() {
117111
super({
118112
id: 'editor.action.goToFocusedStickyScrollLine',
119-
title: {
120-
value: localize('goToFocusedStickyScrollLine.title', "Go to focused sticky scroll line"),
121-
original: 'Go to focused sticky scroll line'
122-
},
113+
title: localize2('goToFocusedStickyScrollLine.title', "Go to focused sticky scroll line"),
123114
precondition: EditorContextKeys.stickyScrollFocused.isEqualTo(true),
124115
keybinding: {
125116
weight,
@@ -138,10 +129,7 @@ export class SelectEditor extends EditorAction2 {
138129
constructor() {
139130
super({
140131
id: 'editor.action.selectEditor',
141-
title: {
142-
value: localize('selectEditor.title', "Select Editor"),
143-
original: 'Select Editor'
144-
},
132+
title: localize2('selectEditor.title', "Select Editor"),
145133
precondition: EditorContextKeys.stickyScrollFocused.isEqualTo(true),
146134
keybinding: {
147135
weight,

‎src/vs/platform/actionWidget/browser/actionWidget.ts

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { IAction } from 'vs/base/common/actions';
99
import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
1010
import { Disposable, DisposableStore, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
1111
import 'vs/css!./actionWidget';
12-
import { localize } from 'vs/nls';
12+
import { localize, localize2 } from 'vs/nls';
1313
import { acceptSelectedActionCommand, ActionList, IActionListDelegate, IActionListItem, previewSelectedActionCommand } from 'vs/platform/actionWidget/browser/actionList';
1414
import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
1515
import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
@@ -168,10 +168,7 @@ registerAction2(class extends Action2 {
168168
constructor() {
169169
super({
170170
id: 'hideCodeActionWidget',
171-
title: {
172-
value: localize('hideCodeActionWidget.title', "Hide action widget"),
173-
original: 'Hide action widget'
174-
},
171+
title: localize2('hideCodeActionWidget.title', "Hide action widget"),
175172
precondition: ActionWidgetContextKeys.Visible,
176173
keybinding: {
177174
weight,
@@ -190,10 +187,7 @@ registerAction2(class extends Action2 {
190187
constructor() {
191188
super({
192189
id: 'selectPrevCodeAction',
193-
title: {
194-
value: localize('selectPrevCodeAction.title', "Select previous action"),
195-
original: 'Select previous action'
196-
},
190+
title: localize2('selectPrevCodeAction.title', "Select previous action"),
197191
precondition: ActionWidgetContextKeys.Visible,
198192
keybinding: {
199193
weight,
@@ -216,10 +210,7 @@ registerAction2(class extends Action2 {
216210
constructor() {
217211
super({
218212
id: 'selectNextCodeAction',
219-
title: {
220-
value: localize('selectNextCodeAction.title', "Select next action"),
221-
original: 'Select next action'
222-
},
213+
title: localize2('selectNextCodeAction.title', "Select next action"),
223214
precondition: ActionWidgetContextKeys.Visible,
224215
keybinding: {
225216
weight,
@@ -242,10 +233,7 @@ registerAction2(class extends Action2 {
242233
constructor() {
243234
super({
244235
id: acceptSelectedActionCommand,
245-
title: {
246-
value: localize('acceptSelected.title', "Accept selected action"),
247-
original: 'Accept selected action'
248-
},
236+
title: localize2('acceptSelected.title', "Accept selected action"),
249237
precondition: ActionWidgetContextKeys.Visible,
250238
keybinding: {
251239
weight,
@@ -267,10 +255,7 @@ registerAction2(class extends Action2 {
267255
constructor() {
268256
super({
269257
id: previewSelectedActionCommand,
270-
title: {
271-
value: localize('previewSelected.title', "Preview selected action"),
272-
original: 'Preview selected action'
273-
},
258+
title: localize2('previewSelected.title', "Preview selected action"),
274259
precondition: ActionWidgetContextKeys.Visible,
275260
keybinding: {
276261
weight,

‎src/vs/platform/actions/common/menuResetAction.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { localize } from 'vs/nls';
6+
import { localize2 } from 'vs/nls';
77
import { Categories } from 'vs/platform/action/common/actionCommonCategories';
88
import { Action2, IMenuService } from 'vs/platform/actions/common/actions';
99
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
@@ -14,10 +14,7 @@ export class MenuHiddenStatesReset extends Action2 {
1414
constructor() {
1515
super({
1616
id: 'menu.resetHiddenStates',
17-
title: {
18-
value: localize('title', 'Reset All Menus'),
19-
original: 'Reset All Menus'
20-
},
17+
title: localize2('title', "Reset All Menus"),
2118
category: Categories.View,
2219
f1: true
2320
});

0 commit comments

Comments
 (0)