Skip to content

Commit

Permalink
Merge branch 'main' into fix/9127-qa-fix-position-of-loading-bar-in-o…
Browse files Browse the repository at this point in the history
…auth-screen
  • Loading branch information
amontenegro authored Mar 13, 2024
2 parents e84281d + f01a5dd commit 971be1e
Show file tree
Hide file tree
Showing 20 changed files with 1,354 additions and 1,348 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
## v2.62.7 - 2024-03-13

[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.62.6...v2.62.7)

- [#2186](https://github.com/ORCID/orcid-angular/pull/2186): fix: Add full stop to sign in text and update claim link text

### Fix

- Add full stop to sign in text and update claim link text

## v2.62.6 - 2024-03-11

[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.62.5...v2.62.6)
Expand Down
160 changes: 80 additions & 80 deletions src/app/cdk/my-orcid-alerts/my-orcid-alerts.component.html
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>
Loading

0 comments on commit 971be1e

Please sign in to comment.