Merge pull request #2186 from ORCID/fix/9122-qa-fixes-to-text-in-sign…

…-in-updates fix: Add full stop to sign in text and update claim link text
ORCID · Mar 13, 2024 · f39d50f · f39d50f
2 parents 285e7f2 + 6f34682
commit f39d50f
Show file tree

Hide file tree

Showing 21 changed files with 1,357 additions and 1,363 deletions.
diff --git a/src/app/cdk/my-orcid-alerts/my-orcid-alerts.component.html b/src/app/cdk/my-orcid-alerts/my-orcid-alerts.component.html
@@ -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>
diff --git a/src/app/sign-in/components/errors/print-errors/print-errors.component.html b/src/app/sign-in/components/errors/print-errors/print-errors.component.html
@@ -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>
 
@@ -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"

diff --git a/src/app/sign-in/components/form-sign-in/form-sign-in.component.html b/src/app/sign-in/components/form-sign-in/form-sign-in.component.html
@@ -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
@@ -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>