Merge branch 'main' into transifex

ORCID · Dec 14, 2023 · d832d2c · d832d2c
2 parents e18abf8 + 50d21f1
commit d832d2c
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 39 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,12 @@
+## v2.51.13 - 2023-12-08
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.51.12...v2.51.13)
+
 ## v2.51.12 - 2023-12-08
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.51.11...v2.51.12)
 
-- [#2116](https://github.com/ORCID/orcid-angular/pull/2116): 
+- [#2116](https://github.com/ORCID/orcid-angular/pull/2116):
 
 ### Fix
 

diff --git a/src/app/register2/components/backend-error/backend-error.component.html b/src/app/register2/components/backend-error/backend-error.component.html
@@ -1,15 +1,11 @@
 <ng-container *ngIf="recognizedError[errorCode] === 0">
-  <ng-container *ngIf="!registrationTogglz">
-    <ng-container i18n="@@register.emailAlreadyExists"
-      >This email already exists in our system. Would you like to</ng-container
-    >
-
-    <a (click)="navigateToSignin(value)" i18n="@@register.signinLowerCase"
-      >sign in</a
-    ><ng-container i18n="@@shared.questionMark">?</ng-container>
-  </ng-container>
-
-  <ng-container *ngIf="registrationTogglz && nextButtonWasClicked">
+  <ng-container
+    *ngIf="
+      (showEmailAlreadyExistUntilNextButtonWasClicked &&
+        nextButtonWasClicked) ||
+      !showEmailAlreadyExistUntilNextButtonWasClicked
+    "
+  >
     <ng-container i18n="@@register.emailIsAlreadyAssociated"
       >This email is already associated with an existing ORCID record. Please
       use a different email address.</ng-container

diff --git a/src/app/register2/components/backend-error/backend-error.component.ts b/src/app/register2/components/backend-error/backend-error.component.ts
@@ -31,6 +31,7 @@ export class BackendErrorComponent implements OnInit {
   recognizedError = RegisterBackendErrors
   _errorCode: string
   @Input() nextButtonWasClicked = false
+  @Input() showEmailAlreadyExistUntilNextButtonWasClicked = false
   registrationTogglz = false
 
   @Input()

diff --git a/...components/form-personal-additional-emails/form-personal-additional-emails.component.html b/...components/form-personal-additional-emails/form-personal-additional-emails.component.html
@@ -6,7 +6,13 @@
       index as i
     "
   >
-    <mat-label class="orc-font-small-print" id="additional-email-label">
+    <mat-label
+      class="orc-font-small-print"
+      id="additional-email-label"
+      [ngClass]="{
+        error: additionalEmailsTouched && additionalEmails.valid === false
+      }"
+    >
       <ng-container i18n="@@register.additionalEmails"
         >Additional email</ng-container
       >
@@ -36,19 +42,21 @@
     >
       Please enter a valid email address, for example [email protected]
     </mat-error>
-    <mat-error
-      *ngFor="
-        let error of getControlErrorAtFormLevel(
-          additionalEmailControl.value,
-          'backendErrors'
-        )
-      "
-    >
-      <app-backend-error
-        [errorCode]="error"
-        [value]="additionalEmailControl.value.value"
-      ></app-backend-error>
-    </mat-error>
+    <ng-container *ngIf="additionalEmailsTouched">
+      <mat-error
+        *ngFor="
+          let error of getControlErrorAtFormLevel(
+            additionalEmailControl.value,
+            'backendErrors'
+          )
+        "
+      >
+        <app-backend-error
+          [errorCode]="error"
+          [value]="additionalEmailControl.value.value"
+        ></app-backend-error>
+      </mat-error>
+    </ng-container>
 
     <!-- <button
       *ngIf="i == 0"

diff --git a/...2/components/form-personal-additional-emails/form-personal-additional-emails.component.ts b/...2/components/form-personal-additional-emails/form-personal-additional-emails.component.ts
@@ -22,6 +22,7 @@ import { ErrorStateMatcherForFormLevelErrors } from '../../ErrorStateMatcherForF
   styleUrls: [
     './form-personal-additional-emails.component.scss',
     '../register2.style.scss',
+    '../register2.scss-theme.scss',
   ],
 })
 export class FormPersonalAdditionalEmailsComponent implements AfterViewInit {

diff --git a/src/app/register2/components/form-personal/form-personal.component.html b/src/app/register2/components/form-personal/form-personal.component.html
@@ -145,6 +145,7 @@ <h3 i18n="@@register.yourEmailAddresses" class="orc-font-body margin-top-12">
           *ngFor="let error of this.emails.getError('backendError', 'email')"
         >
           <app-backend-error
+            [showEmailAlreadyExistUntilNextButtonWasClicked]="true"
             [nextButtonWasClicked]="nextButtonWasClicked"
             [errorCode]="error"
             [value]="emails.get('email').value"
@@ -273,7 +274,7 @@ <h3 i18n="@@register.yourEmailAddresses" class="orc-font-body margin-top-12">
             </h3>
           </div>
           <div>
-            <ng-container i18n="@@register.addA">Add a</ng-container>
+            <ng-container i18n="@@register.addA">Add an additional</ng-container>
             <strong i18n="@@register.professionalEmail"
               >professional email</strong
             >
@@ -297,7 +298,7 @@ <h3 i18n="@@register.yourEmailAddresses" class="orc-font-body margin-top-12">
         <div class="content">
           <div>
             <h3 class="orc-font-body" i18n="@@register.addAnotherEmailToSecure">
-              Add another email to secure your account
+              Add an additional email to secure your account
             </h3>
           </div>
           <div i18n="@@register.addingAnAddiotionalEmailAsBackup">
@@ -327,13 +328,12 @@ <h3 class="orc-font-body" i18n="@@register.addAnotherEmailToSecure">
           </div>
           <div>
             <ng-container i18n="@@register.weRecommendAdding"
-              >We recommend adding a </ng-container
-            >&nbsp;<strong i18n="@@register.personalEmail"
+              >We recommend adding an additional</ng-container
+            >
+            <strong i18n="@@register.personalEmail"
               >personal email</strong
-            >&nbsp;
-            <ng-container i18n="@@register.asBackupSoYouAlways">
-              as backup so you always have access to your ORCID account if you
-              change jobs or roles.</ng-container
+            >
+            <ng-container i18n="@@register.asBackupSoYouAlways">as backup so you always have access to your ORCID account if you change jobs or roles.</ng-container
             >
           </div>
         </div>

diff --git a/src/app/register2/components/step-d/step-d.component.html b/src/app/register2/components/step-d/step-d.component.html
@@ -74,10 +74,9 @@ <h2 class="orc-font-body-small" i18n="@@register.step2.4">
           color="primary"
           matStepperPrevious
           type="button"
-          i18n="@@shared.previousStep"
           id="step-c-back-button"
         >
-          <a> Previous Step</a>
+          <a i18n="@@shared.previousStep"> Previous Step</a>
         </button>
       </div>
     </form>

diff --git a/src/locale/properties/register/register.en.properties b/src/locale/properties/register/register.en.properties
@@ -141,12 +141,12 @@ register.confirmationEmailNotMatch2=Email addresses do not match
 register.thisLooksLikeAPersonalEmail=This looks like a personal email
 register.asBackupSoWeCanBetter=as backup so we can better recommend affiliations and other related data to you.
 register.professionalEmail=professional email
-register.addA=Add a
-register.addAnotherEmailToSecure=Add another email to secure your account
+register.addA=Add an additional
+register.addAnotherEmailToSecure=Add an additional email to secure your account
 register.addingAnAddiotionalEmailAsBackup=Adding an additional email as backup helps secure your account and makes sure you can always sign in.
 regiser.thisLooksLikeAProffessional=This looks like a professional email
 register.asBackupSoYouAlways=as backup so you always have access to your ORCID account if you change jobs or roles.
-register.weRecommendAdding=We recommend adding a
+register.weRecommendAdding=We recommend adding an additional
 register.youMustAccept=You must accept the terms we use and consent to your data being processed in the United States
 register.termsOfUse2=terms of use
 register.agree2=and agree to my data being publicly accessible where marked as “Visible to Everyone”.