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.

Sign up for GitHub

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

fix: Add full stop to sign in text and update claim link text #2186

Merged
merged 1 commit into from
Mar 13, 2024
Merged

fix: Add full stop to sign in text and update claim link text #2186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
160 changes: 80 additions & 80 deletions src/app/cdk/my-orcid-alerts/my-orcid-alerts.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,80 +1,80 @@
<ng-container *ngIf="!signInUpdatesV1Togglz">
<mat-toolbar>
<mat-toolbar-row>
<div role="alert">
<p class="mat-body-2">
<ng-container
i18n="@@myOrcidAlerts.invalidVerifyUrl"
*ngIf="invalidVerifyUrl"
>
Your email couldn't be verified, please check the link you used to
verify it.
</ng-container>
<ng-container
i18n="@@myOrcidAlerts.emailVerified"
*ngIf="emailVerified"
>
Thank you for verifying your email
</ng-container>
</p>
</div>
</mat-toolbar-row>
</mat-toolbar>
</ng-container>
<ng-container *ngIf="signInUpdatesV1Togglz">
<ng-container *ngIf="emailVerified || invalidVerifyUrl">
<div
[ngClass]="{
verification: emailVerified,
invalid: invalidVerifyUrl
}"
>
<div>
<mat-icon class="large-material-icon material-symbols-outlined">
<ng-container *ngIf="emailVerified">check_circle</ng-container>
<ng-container *ngIf="invalidVerifyUrl">warning</ng-container>
</mat-icon>
</div>
<div class="content">
<div>
<b i18n="@@ngOrcid.signin.almostDone"> Almost done! </b>
</div>
<div>
<ng-container
i18n="@@ngOrcid.signin.signInToComplete"
*ngIf="emailVerified"
>
Sign in to complete your email verification
</ng-container>
<ng-container
i18n="@@myOrcidAlerts.invalidVerifyUrl"
*ngIf="invalidVerifyUrl"
>
Your email couldn't be verified, please check the link you used to
verify it.
</ng-container>
</div>
</div>
</div>
</ng-container>
<ng-container *ngIf="printError && badCredentials">
<div class="invalid">
<div>
<mat-icon class="large-material-icon material-symbols-outlined"
>warning</mat-icon
>
</div>
<div class="content">
<div>
<b i18n="@@ngOrcid.signin.somethingNotQuiteRight">
Something's not quite right...
</b>
</div>
<div i18n="@@ngOrcid.signin.checkYourSignIn">
Please check that your sign in details are correct and then try
signing in again
</div>
</div>
</div>
</ng-container>
</ng-container>
<ng-container *ngIf="!signInUpdatesV1Togglz">
<mat-toolbar>
<mat-toolbar-row>
<div role="alert">
<p class="mat-body-2">
<ng-container
i18n="@@myOrcidAlerts.invalidVerifyUrl"
*ngIf="invalidVerifyUrl"
>
Your email couldn't be verified, please check the link you used to
verify it.
</ng-container>
<ng-container
i18n="@@myOrcidAlerts.emailVerified"
*ngIf="emailVerified"
>
Thank you for verifying your email
</ng-container>
</p>
</div>
</mat-toolbar-row>
</mat-toolbar>
</ng-container>
<ng-container *ngIf="signInUpdatesV1Togglz">
<ng-container *ngIf="emailVerified || invalidVerifyUrl">
<div
[ngClass]="{
verification: emailVerified,
invalid: invalidVerifyUrl
}"
>
<div>
<mat-icon class="large-material-icon material-symbols-outlined">
<ng-container *ngIf="emailVerified">check_circle</ng-container>
<ng-container *ngIf="invalidVerifyUrl">warning</ng-container>
</mat-icon>
</div>
<div class="content">
<div>
<b i18n="@@ngOrcid.signin.almostDone"> Almost done! </b>
</div>
<div>
<ng-container
i18n="@@ngOrcid.signin.signInToComplete"
*ngIf="emailVerified"
>
Sign in to complete your email verification
</ng-container>
<ng-container
i18n="@@myOrcidAlerts.invalidVerifyUrl"
*ngIf="invalidVerifyUrl"
>
Your email couldn't be verified, please check the link you used to
verify it.
</ng-container>
</div>
</div>
</div>
</ng-container>
<ng-container *ngIf="printError && badCredentials">
<div class="invalid">
<div>
<mat-icon class="large-material-icon material-symbols-outlined"
>warning</mat-icon
>
</div>
<div class="content">
<div>
<b i18n="@@ngOrcid.signin.somethingNotQuiteRight">
Something's not quite right...
</b>
</div>
<div i18n="@@ngOrcid.signin.checkYourSignIn">
Please check that your sign in details are correct and then try
signing in again.
</div>
</div>
</div>
</ng-container>
</ng-container>
6 changes: 3 additions & 3 deletions src/app/sign-in/components/errors/print-errors/print-errors.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
*ngIf="showDeactivatedError"
>
You will need to reactivate the account before you can sign in
with this email address
with this email address.
</i>
</ng-container>

Expand All @@ -94,11 +94,11 @@

<div>
<a
i18n="@@register.resendClaimAddress"
i18n="@@ngOrcid.signin.claimYourOrcidRecord"
(click)="unclaimed()"
*ngIf="showUnclaimedError"
>
Resend a claim email to this email address</a
Claim your ORCID record</a
>
<a
i18n="@@register.reactivateOrcidAssociated"
Expand Down
6 changes: 3 additions & 3 deletions src/app/sign-in/components/form-sign-in/form-sign-in.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@
</mat-hint>

<mat-error
i18n="@@ngOrcid.signin.enterValidEmailOrOrcid"
i18n="@@ngOrcid.signin.pleaseEnterEmailAddress"
*ngIf="usernameForm.hasError('required')"
>Please enter a valid email address or your ORCID iD
>Please enter your email address or your ORCID iD
</mat-error>

<mat-error
Expand Down Expand Up @@ -161,7 +161,7 @@
>
<i i18n="@@ngOrcid.signin.yourCannotSignIn"
>You cannot sign in to this ORCID account until you have reset
your password</i
your password.</i
>
</p>
</div>
Expand Down
Loading
Loading