Merge branch 'main' into display-public-page-message-when-there-are-n…

…o-domains
ORCID · Aug 28, 2024 · 2a93f88 · 2a93f88
2 parents 9215436 + 7d558fd
commit 2a93f88
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 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
@@ -283,6 +283,7 @@ <h2 class="orc-font-body-large" i18n="@@side-bar.emailAddressesUppercase">
                 [disableVisibilities]="disableVisibilities[domain.putCode]"
                 formControlName="visibility"
                 id="cy-domain-visibility"
+                [itemTitle]="domain.value"
                 [ariaLabelPrivate]="ariaLabelVisibilityEmailTrustedParty"
                 [ariaLabelPublic]="ariaLabelVisibilityEmailTrustedParty"
                 [ariaLabelTrustedParty]="ariaLabelVisibilityEmailTrustedParty"

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
@@ -49,11 +49,11 @@ export class ModalEmailComponent implements OnInit, OnDestroy {
   ariaLabelKnowledgeBase = $localize`:@@side-bar.ariaLabelOrcidTermsOfUseBase:ORCID knowledge base (Opens in a new tab)`
   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`
+  ariaLabelSave = $localize`:@@side-bar.ariaLabelEmailAndDomainsSave:Save changes to Emails & domains`
   ariaLabelNotificationsAreSentToEmail = $localize`:@@side-bar.notificationsAreSentToEmail:Notifications are sent to`
-  ariaLabelCancel = $localize`:@@side-bar.ariaLabelEmailCancel:Cancel changes and close Emails`
+  ariaLabelCancel = $localize`:@@side-bar.ariaLabelEmailAndDomainsCancel:Cancel changes and close Emails & domains`
   ariaLabelDelete = $localize`:@@side-bar.ariaLabelEmailDelete:Delete Email`
-  ariaLabelClose = $localize`:@@side-bar.ariaLabelEmailClose:Close Emails`
+  ariaLabelClose = $localize`:@@side-bar.ariaLabelEmailAndDomainsClose:Close Emails & domains`
   ariaLabelEmailAddress = $localize`:@@side-bar.emailAddress:Email address`
   ariaLabelNewEmailAddress = $localize`:@@side-bar.newEmailAddress:New email address`
   ariaLabelOtherEmailAddresses = $localize`:@@side-bar.otherEmails:Other email addresses`

diff --git a/src/locale/properties/side-bar/side-bar.en.properties b/src/locale/properties/side-bar/side-bar.en.properties
@@ -62,9 +62,12 @@ side-bar.ariaLabelOrcidTermsOfUseBase=ORCID knowledge base (Opens in a new tab)
 side-bar.ariaLabelOrcidTermsSupport=ORCID support page (Opens in a new tab)
 side-bar.ariaLabelOrcidTermsOfUseLink=ORCID terms of use (Opens in a new tab)
 side-bar.ariaLabelEmailSave=Save changes to Emails
+side-bar.ariaLabelEmailAndDomainsSave=Save changes to Emails & domains
 side-bar.ariaLabelEmailCancel=Cancel changes and close Emails
+side-bar.ariaLabelEmailAndDomainsCancel=Cancel changes and close Emails & domains
 side-bar.ariaLabelEmailDelete=Delete Email
 side-bar.ariaLabelEmailClose=Close Emails
+side-bar.ariaLabelEmailAndDomainsClose=Close Emails & domains
 side-bar.ariaLabelEmail=Emails
 side-bar.ariaLabelCountrySave=Save changes to Countries
 side-bar.ariaLabelCountryCancel=Cancel changes and close Countries