Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Email modal aria tweaks #2314

Merged
merged 10 commits into from
Jul 25, 2024
Original file line number Diff line number Diff line change
Expand Up @@ -83,17 +83,18 @@ <h2 class="orc-font-body-large" i18n="@@side-bar.emailAddressesUppercase">
formControlName="email"
type="email"
appTrim
[attr.aria-label]="ariaLabelPrimaryEmail"
[attr.aria-label]="
email.putCode.startsWith('new')
? ariaLabelNewEmailAddress
: ariaLabelEmailAddress + ' ' + email.value
"
/>
</mat-form-field>
<div
*ngIf="showEmailAsVerified(email.putCode)"
class="verified-email"
>
<strong tabindex="0" class="row orc-font-body-small">
<span class="sr-only" i18n="@@side-bar.primaryEmail"
>Primary email address</span
>
{{ emailsForm.value[email.putCode].email }}</strong
>
<em
Expand Down Expand Up @@ -250,6 +251,7 @@ <h2 class="orc-font-body-large" i18n="@@side-bar.emailAddressesUppercase">
i18n="@@side-bar.yourOrcidAccountSettings"
href="/account"
target="_blank"
[attr.aria-label]="ariaOpenAccountSettings"
rel="noopener noreferrer"
>your ORCID account settings.</a
>
Expand All @@ -260,7 +262,9 @@ <h2 class="orc-font-body-large" i18n="@@side-bar.emailAddressesUppercase">
>
<mat-select
outline="black"
[aria-label]="ariaLabelSelect"
[aria-label]="
ariaLabelNotificationsAreSentToEmail + ' ' + primaryEmail?.value
"
[attr.disabled]="!hasVerifiedEmailAddress()"
(selectionChange)="makePrimary($event.value)"
[ngClass]="{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,12 @@ 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`
ariaLabelNotificationsAreSentToEmail = $localize`:@@side-bar.notificationsAreSentToEmail: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`
ariaLabelNewEmailAddress = $localize`:@@side-bar.newEmailAddress:New 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`
Expand All @@ -61,6 +62,7 @@ export class ModalEmailComponent implements OnInit, OnDestroy {
ariaLabelVisibilityEmailPublic = $localize`:@@side-bar.ariaLabelEmailPublic:Set email visibility to Everyone`
ariaLabelVisibilityEmailTrustedParty = $localize`:@@side-bar.ariaLabelEmailTrustedParties:Set email visibility to Trusted Parties`
ariaLabelVisibilityEmailPrivate = $localize`:@@side-bar.ariaLabelEmailPrivate:Set email visibility to Only Me`
ariaOpenAccountSettings = $localize`:@@side-bar.ariaOpenAccountSettings:Open your ORCID account settings`
deleteTooltip = $localize`:@@side-bar.deleteTooltip:You can't delete the only email address in your account`
visibilityTooltip = $localize`:@@side-bar.visibilityTooltip:Visibility set to Only me`

Expand Down
4 changes: 4 additions & 0 deletions src/locale/properties/side-bar/side-bar.en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ 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.newEmailAddress=New email address
side-bar.emailAddresses=email addresses
side-bar.emailAddressesUppercase=Email addresses
side-bar.inYourOrcidRecord=in your ORCID record.
Expand Down Expand Up @@ -93,3 +95,5 @@ side-bar.ariaLabelOtherEmailPrivate=Set other email visibility to Only Me
side-bar.ariaLabelEmailPublic=Set email visibility to Everyone
side-bar.ariaLabelEmailTrustedParties=Set email visibility to Trusted Parties
side-bar.ariaLabelEmailPrivate=Set email visibility to Only Me
side-bar.ariaOpenAccountSettings=Open your ORCID account settings
side-bar.notificationsAreSentToEmail=Notifications are sent to
Loading