Skip to content

Commit 22f3f60

Browse files
authored
Move some text out of localization string for integrated terminal settings (microsoft#154318)
Fixes microsoft#154317
1 parent ad9675f commit 22f3f60

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const terminalConfiguration: IConfigurationNode = {
3434
type: 'object',
3535
properties: {
3636
[TerminalSettingId.SendKeybindingsToShell]: {
37-
markdownDescription: localize('terminal.integrated.sendKeybindingsToShell', "Dispatches most keybindings to the terminal instead of the workbench, overriding `#terminal.integrated.commandsToSkipShell#`, which can be used alternatively for fine tuning."),
37+
markdownDescription: localize('terminal.integrated.sendKeybindingsToShell', "Dispatches most keybindings to the terminal instead of the workbench, overriding {0}, which can be used alternatively for fine tuning.", '`#terminal.integrated.commandsToSkipShell#`'),
3838
type: 'boolean',
3939
default: false
4040
},
@@ -106,17 +106,17 @@ const terminalConfiguration: IConfigurationNode = {
106106
[TerminalSettingId.ShellIntegrationDecorationIconSuccess]: {
107107
type: 'string',
108108
default: 'primitive-dot',
109-
markdownDescription: localize('terminal.integrated.shellIntegration.decorationIconSuccess', "Controls the icon that will be used for each command in terminals with shell integration enabled that do not have an associated exit code. Set to `''` to hide the icon or disable decorations with `#terminal.integrated.shellIntegration.decorationsEnabled#`")
109+
markdownDescription: localize('terminal.integrated.shellIntegration.decorationIconSuccess', "Controls the icon that will be used for each command in terminals with shell integration enabled that do not have an associated exit code. Set to {0} to hide the icon or disable decorations with {1}.", '`\'\'`', '`#terminal.integrated.shellIntegration.decorationsEnabled#`')
110110
},
111111
[TerminalSettingId.ShellIntegrationDecorationIconError]: {
112112
type: 'string',
113113
default: 'error-small',
114-
markdownDescription: localize('terminal.integrated.shellIntegration.decorationIconError', "Controls the icon that will be used for each command in terminals with shell integration enabled that do have an associated exit code. Set to `''` to hide the icon or disable decorations with `#terminal.integrated.shellIntegration.decorationsEnabled#`.")
114+
markdownDescription: localize('terminal.integrated.shellIntegration.decorationIconError', "Controls the icon that will be used for each command in terminals with shell integration enabled that do have an associated exit code. Set to {0} to hide the icon or disable decorations with {1}.", '`\'\'`', '`#terminal.integrated.shellIntegration.decorationsEnabled#`')
115115
},
116116
[TerminalSettingId.ShellIntegrationDecorationIcon]: {
117117
type: 'string',
118118
default: 'circle-outline',
119-
markdownDescription: localize('terminal.integrated.shellIntegration.decorationIcon', "Controls the icon that will be used for skipped/empty commands. Set to `''` to hide the icon or disable decorations with `#terminal.integrated.shellIntegration.decorationsEnabled#`")
119+
markdownDescription: localize('terminal.integrated.shellIntegration.decorationIcon', "Controls the icon that will be used for skipped/empty commands. Set to {0} to hide the icon or disable decorations with {1}.", '`\'\'`', '`#terminal.integrated.shellIntegration.decorationsEnabled#`')
120120
},
121121
[TerminalSettingId.TabsFocusMode]: {
122122
type: 'string',
@@ -139,7 +139,7 @@ const terminalConfiguration: IConfigurationNode = {
139139
default: false
140140
},
141141
[TerminalSettingId.AltClickMovesCursor]: {
142-
markdownDescription: localize('terminal.integrated.altClickMovesCursor', "If enabled, alt/option + click will reposition the prompt cursor to underneath the mouse when `#editor.multiCursorModifier#` is set to `'alt'` (the default value). This may not work reliably depending on your shell."),
142+
markdownDescription: localize('terminal.integrated.altClickMovesCursor', "If enabled, alt/option + click will reposition the prompt cursor to underneath the mouse when {0} is set to {1} (the default value). This may not work reliably depending on your shell.", '`#editor.multiCursorModifier#`', '`\'alt\'`'),
143143
type: 'boolean',
144144
default: true
145145
},
@@ -159,7 +159,7 @@ const terminalConfiguration: IConfigurationNode = {
159159
default: true
160160
},
161161
[TerminalSettingId.FontFamily]: {
162-
markdownDescription: localize('terminal.integrated.fontFamily', "Controls the font family of the terminal, this defaults to `#editor.fontFamily#`'s value."),
162+
markdownDescription: localize('terminal.integrated.fontFamily', "Controls the font family of the terminal, this defaults to {0}'s value.", '`#editor.fontFamily#`'),
163163
type: 'string'
164164
},
165165
// TODO: Support font ligatures
@@ -254,7 +254,7 @@ const terminalConfiguration: IConfigurationNode = {
254254
default: TerminalCursorStyle.BLOCK
255255
},
256256
[TerminalSettingId.CursorWidth]: {
257-
markdownDescription: localize('terminal.integrated.cursorWidth', "Controls the width of the cursor when `#terminal.integrated.cursorStyle#` is set to `line`."),
257+
markdownDescription: localize('terminal.integrated.cursorWidth', "Controls the width of the cursor when {0} is set to {1}.", '`#terminal.integrated.cursorStyle#`', '`line`'),
258258
type: 'number',
259259
default: 1
260260
},
@@ -354,7 +354,8 @@ const terminalConfiguration: IConfigurationNode = {
354354
'terminal.integrated.commandsToSkipShell',
355355
"A set of command IDs whose keybindings will not be sent to the shell but instead always be handled by VS Code. This allows keybindings that would normally be consumed by the shell to act instead the same as when the terminal is not focused, for example `Ctrl+P` to launch Quick Open.\n\n \n\nMany commands are skipped by default. To override a default and pass that command's keybinding to the shell instead, add the command prefixed with the `-` character. For example add `-workbench.action.quickOpen` to allow `Ctrl+P` to reach the shell.\n\n \n\nThe following list of default skipped commands is truncated when viewed in Settings Editor. To see the full list, {1} and search for the first command from the list below.\n\n \n\nDefault Skipped Commands:\n\n{0}",
356356
DEFAULT_COMMANDS_TO_SKIP_SHELL.sort().map(command => `- ${command}`).join('\n'),
357-
`[${localize('openDefaultSettingsJson', "open the default settings JSON")}](command:workbench.action.openRawDefaultSettings '${localize('openDefaultSettingsJson.capitalized', "Open Default Settings (JSON)")}')`
357+
`[${localize('openDefaultSettingsJson', "open the default settings JSON")}](command:workbench.action.openRawDefaultSettings '${localize('openDefaultSettingsJson.capitalized', "Open Default Settings (JSON)")}')`,
358+
358359
),
359360
type: 'array',
360361
items: {
@@ -363,7 +364,7 @@ const terminalConfiguration: IConfigurationNode = {
363364
default: []
364365
},
365366
[TerminalSettingId.AllowChords]: {
366-
markdownDescription: localize('terminal.integrated.allowChords', "Whether or not to allow chord keybindings in the terminal. Note that when this is true and the keystroke results in a chord it will bypass `#terminal.integrated.commandsToSkipShell#`, setting this to false is particularly useful when you want ctrl+k to go to your shell (not VS Code)."),
367+
markdownDescription: localize('terminal.integrated.allowChords', "Whether or not to allow chord keybindings in the terminal. Note that when this is true and the keystroke results in a chord it will bypass {0}, setting this to false is particularly useful when you want ctrl+k to go to your shell (not VS Code).", '`#terminal.integrated.commandsToSkipShell#`'),
367368
type: 'boolean',
368369
default: true
369370
},
@@ -464,7 +465,7 @@ const terminalConfiguration: IConfigurationNode = {
464465
default: 30,
465466
},
466467
[TerminalSettingId.LocalEchoEnabled]: {
467-
markdownDescription: localize('terminal.integrated.localEchoEnabled', "When local echo should be enabled. This will override `#terminal.integrated.localEchoLatencyThreshold#`"),
468+
markdownDescription: localize('terminal.integrated.localEchoEnabled', "When local echo should be enabled. This will override {0}", '`#terminal.integrated.localEchoLatencyThreshold#`'),
468469
type: 'string',
469470
enum: ['on', 'off', 'auto'],
470471
enumDescriptions: [

0 commit comments

Comments
 (0)