From 97d9fcdb63191f6d266457435d57f0d0af605f4b Mon Sep 17 00:00:00 2001 From: meganrogge Date: Fri, 6 Sep 2024 15:30:21 -0700 Subject: [PATCH 1/3] fix #227257 --- src/vs/workbench/browser/parts/statusbar/statusbarPart.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts index a1182f5bd0e403..8ef495fbad5edf 100644 --- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts +++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts @@ -678,6 +678,7 @@ export class AuxiliaryStatusbarPart extends StatusbarPart implements IAuxiliaryS @IContextKeyService contextKeyService: IContextKeyService, ) { const id = AuxiliaryStatusbarPart.COUNTER++; + container.ariaLabel = 'Status bar'; super(`workbench.parts.auxiliaryStatus.${id}`, instantiationService, themeService, contextService, storageService, layoutService, contextMenuService, contextKeyService); } } @@ -712,6 +713,7 @@ export class StatusbarService extends MultiWindowParts implements statusbarPartContainer.style.position = 'relative'; statusbarPartContainer.setAttribute('aria-live', 'off'); statusbarPartContainer.setAttribute('tabindex', '0'); + statusbarPartContainer.setAttribute('aria-label', 'Status bar'); container.appendChild(statusbarPartContainer); // Statusbar Part From 591033da0efa4c671b83a0ad772f820ec06058d3 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Fri, 6 Sep 2024 15:57:12 -0700 Subject: [PATCH 2/3] fix #227537 --- .../languageStatus/browser/languageStatus.contribution.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.ts b/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.ts index 36e4187a4b2833..da6a90d05efc57 100644 --- a/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.ts +++ b/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.ts @@ -331,6 +331,7 @@ class LanguageStatus { // -- pin const actionBar = new ActionBar(right, { hoverDelegate: nativeHoverDelegate }); + actionBar.setAriaLabel(!isPinned ? 'Add to status bar' : 'Remove from status bar'); store.add(actionBar); let action: Action; if (!isPinned) { From cecac9e49aff6ad54cee97df8976e18e977cdd8a Mon Sep 17 00:00:00 2001 From: meganrogge Date: Fri, 6 Sep 2024 16:27:56 -0700 Subject: [PATCH 3/3] localize --- src/vs/workbench/browser/parts/statusbar/statusbarPart.ts | 3 +-- .../languageStatus/browser/languageStatus.contribution.ts | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts index 8ef495fbad5edf..a55c31144e8800 100644 --- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts +++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts @@ -678,7 +678,6 @@ export class AuxiliaryStatusbarPart extends StatusbarPart implements IAuxiliaryS @IContextKeyService contextKeyService: IContextKeyService, ) { const id = AuxiliaryStatusbarPart.COUNTER++; - container.ariaLabel = 'Status bar'; super(`workbench.parts.auxiliaryStatus.${id}`, instantiationService, themeService, contextService, storageService, layoutService, contextMenuService, contextKeyService); } } @@ -713,7 +712,7 @@ export class StatusbarService extends MultiWindowParts implements statusbarPartContainer.style.position = 'relative'; statusbarPartContainer.setAttribute('aria-live', 'off'); statusbarPartContainer.setAttribute('tabindex', '0'); - statusbarPartContainer.setAttribute('aria-label', 'Status bar'); + statusbarPartContainer.setAttribute('aria-label', localize('statusBar', 'Status Bar')); container.appendChild(statusbarPartContainer); // Statusbar Part diff --git a/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.ts b/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.ts index da6a90d05efc57..28a38f4a198dda 100644 --- a/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.ts +++ b/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.ts @@ -331,18 +331,19 @@ class LanguageStatus { // -- pin const actionBar = new ActionBar(right, { hoverDelegate: nativeHoverDelegate }); - actionBar.setAriaLabel(!isPinned ? 'Add to status bar' : 'Remove from status bar'); + const actionLabel: string = isPinned ? localize('unpin', "Remove from Status Bar") : localize('pin', "Add to Status Bar"); + actionBar.setAriaLabel(actionLabel); store.add(actionBar); let action: Action; if (!isPinned) { - action = new Action('pin', localize('pin', "Add to Status Bar"), ThemeIcon.asClassName(Codicon.pin), true, () => { + action = new Action('pin', actionLabel, ThemeIcon.asClassName(Codicon.pin), true, () => { this._dedicated.add(status.id); this._statusBarService.updateEntryVisibility(status.id, true); this._update(); this._storeState(); }); } else { - action = new Action('unpin', localize('unpin', "Remove from Status Bar"), ThemeIcon.asClassName(Codicon.pinned), true, () => { + action = new Action('unpin', actionLabel, ThemeIcon.asClassName(Codicon.pinned), true, () => { this._dedicated.delete(status.id); this._statusBarService.updateEntryVisibility(status.id, false); this._update();