Skip to content

Commit 9ae41cd

Browse files
authored
feat(sam): simplify "install yaml" verbiage #2871
Problem: - The `promptInstallYamlPlugin` buttons are verbose, and get truncated on a laptop-sized screen. - "Open Marketplace Page" is inconsistent with other "Install X" dialogs in the Toolkit, and might be confused with a website link.
1 parent d6b4b40 commit 9ae41cd

File tree

4 files changed

+8
-13
lines changed

4 files changed

+8
-13
lines changed

src/awsexplorer/defaultRegion.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ import { RegionProvider } from '../shared/regions/regionProvider'
1616

1717
class RegionMissingUI {
1818
public static readonly add: string = localizedText.yes
19-
public static readonly alwaysIgnore: string = localize(
20-
'AWS.message.prompt.noDontAskAgain',
21-
"No, and don't ask again"
22-
)
19+
public static readonly alwaysIgnore: string = localize('AWS.message.prompt.noDontAskAgain', "No, don't ask again")
2320
public static readonly ignore: string = localizedText.no
2421
}
2522

src/ecs/commands/updateEnableExecuteCommandFlag.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export async function updateEnableExecuteCommandFlag(
2424
settings = PromptSettings.instance
2525
): Promise<void> {
2626
const yes = localize('AWS.generic.response.yes', 'Yes')
27-
const yesDontAskAgain = localize('AWS.message.prompt.yesDontAskAgain', "Yes, and don't ask again")
27+
const yesDontAskAgain = localize('AWS.message.prompt.yesDontAskAgain', "Yes, don't ask again")
2828
const no = localize('AWS.generic.response.no', 'No')
2929

3030
const prompt = enable ? EcsRunCommandPrompt.Enable : EcsRunCommandPrompt.Disable

src/s3/fileViewerManager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ export class S3FileViewerManager {
339339
'You are now editing an S3 file. Saved changes will be uploaded to your S3 bucket.'
340340
)
341341

342-
const dontShow = localize('AWS.s3.fileViewer.button.dismiss', "Don't show this again")
342+
const dontShow = localize('AWS.s3.fileViewer.button.dismiss', "Don't show again")
343343
const help = localize('AWS.generic.message.learnMore', 'Learn more')
344344

345345
await this.window.showWarningMessage(message, dontShow, help).then<unknown>(selection => {

src/shared/sam/activation.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -322,23 +322,21 @@ async function promptInstallYamlPlugin(fileName: string, disposables: vscode.Dis
322322
}
323323
const settings = PromptSettings.instance
324324

325-
const goToMarketplace = localize('AWS.message.info.yaml.goToMarketplace', 'Open Marketplace Page')
326-
const dismiss = localize('AWS.generic.response.dismiss', 'Dismiss')
327-
const permanentlySuppress = localize('AWS.message.info.yaml.suppressPrompt', "Dismiss, and don't show again")
325+
const installBtn = localize('AWS.missingExtension.install', 'Install...')
326+
const permanentlySuppress = localize('AWS.message.info.yaml.suppressPrompt', "Don't show again")
328327

329328
const response = await vscode.window.showInformationMessage(
330329
localize(
331330
'AWS.message.info.yaml.prompt',
332-
'Install YAML extension for additional {0} features.',
331+
'Install YAML extension for more {0} features in SAM template.yaml files.',
333332
getIdeProperties().company
334333
),
335-
goToMarketplace,
336-
dismiss,
334+
installBtn,
337335
permanentlySuppress
338336
)
339337

340338
switch (response) {
341-
case goToMarketplace:
339+
case installBtn:
342340
// Available options are:
343341
// extension.open: opens extension page in VS Code extension marketplace view
344342
// workspace.extension.installPlugin: autoinstalls plugin with no additional feedback

0 commit comments

Comments
 (0)