From 67f1a812b37da62ac875067baf244723c456f575 Mon Sep 17 00:00:00 2001
From: andrej romanov <50377758+auumgn@users.noreply.github.com>
Date: Wed, 24 Jul 2024 20:48:11 +0300
Subject: [PATCH] more aria tweaks

---
 .../side-bar/modals/modal-email/modal-email.component.html  | 6 ++++--
 .../side-bar/modals/modal-email/modal-email.component.ts    | 4 ++--
 src/locale/properties/side-bar/side-bar.en.properties       | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.html b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.html
index 4c3ec3eb1..8018c5ae2 100644
--- a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.html
+++ b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.html
@@ -83,7 +83,7 @@ <h2 class="orc-font-body-large" i18n="@@side-bar.emailAddressesUppercase">
                   formControlName="email"
                   type="email"
                   appTrim
-                  [attr.aria-label]="ariaLabelPrimaryEmail"
+                  [attr.aria-label]="ariaLabelEmailAddress"
                 />
               </mat-form-field>
               <div
@@ -254,7 +254,9 @@ <h2 class="orc-font-body-large" i18n="@@side-bar.emailAddressesUppercase">
       >
         <mat-select
           outline="black"
-          [aria-label]="ariaLabelSelect"
+          [aria-label]="
+            ariaLabelNotificationsAreSentTo + ' ' + primaryEmail?.value
+          "
           [attr.disabled]="hasOneEmailAddress()"
           (selectionChange)="makePrimary($event.value)"
           [ngClass]="{
diff --git a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.ts b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.ts
index 36270827e..de615fbd7 100644
--- a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.ts
+++ b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.ts
@@ -46,11 +46,11 @@ export class ModalEmailComponent implements OnInit, OnDestroy {
   ariaLabelKnowledgeSupport = $localize`:@@side-bar.ariaLabelOrcidTermsSupport:ORCID support page (Opens in a new tab)`
   ariaLabelOrcidTermsOfUseLink = $localize`:@@side-bar.ariaLabelOrcidTermsOfUseLink:ORCID terms of use (Opens in a new tab)`
   ariaLabelSave = $localize`:@@side-bar.ariaLabelEmailSave:Save changes to Emails`
-  ariaLabelSelect = $localize`:@@side-bar.ariaLabelEmailSave:Select email to receive notifications`
+  ariaLabelNotificationsAreSentTo = $localize`:@@side-bar.notificationsAreSentTo:Notifications are sent to`
   ariaLabelCancel = $localize`:@@side-bar.ariaLabelEmailCancel:Cancel changes and close Emails`
   ariaLabelDelete = $localize`:@@side-bar.ariaLabelEmailDelete:Delete Email`
   ariaLabelClose = $localize`:@@side-bar.ariaLabelEmailClose:Close Emails`
-  ariaLabelPrimaryEmail = $localize`:@@side-bar.primaryEmail:Primary email address`
+  ariaLabelEmailAddress = $localize`:@@side-bar.emailAddress:Email address`
   ariaLabelOtherEmailAddresses = $localize`:@@side-bar.otherEmails:Other email addresses`
   ariaLabelVisibilityPrimaryEmailPublic = $localize`:@@side-bar.ariaLabelPrimaryEmailPublic:Set primary email visibility to Everyone`
   ariaLabelVisibilityPrimaryEmailTrustedParty = $localize`:@@side-bar.ariaLabelPrimaryEmailTrustedParties:Set primary email visibility to Trusted Parties`
diff --git a/src/locale/properties/side-bar/side-bar.en.properties b/src/locale/properties/side-bar/side-bar.en.properties
index f36965014..5209811c1 100644
--- a/src/locale/properties/side-bar/side-bar.en.properties
+++ b/src/locale/properties/side-bar/side-bar.en.properties
@@ -12,6 +12,7 @@ side-bar.pleaseVerifyWarning=Please verify your email addresses
 side-bar.verifyToAccessOrcidFeatures=To access all of ORCID’s editing features you must verify at least one email address. Until then you will only be able to manage
 side-bar.names=names
 side-bar.and=and
+side-bar.emailAddress=Email address
 side-bar.emailAddresses=email addresses
 side-bar.emailAddressesUppercase=Email addresses
 side-bar.inYourOrcidRecord=in your ORCID record.