Merge pull request #2113 from ORCID/fix/batch-fixes-dec-6

fix/batch-fixes-dec-6
ORCID · Dec 7, 2023 · 45189d4 · 45189d4
2 parents c96cfbf + 651116e
commit 45189d4
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 73 deletions.
diff --git a/src/app/register2/components/form-password/form-password.component.ts b/src/app/register2/components/form-password/form-password.component.ts
@@ -143,10 +143,12 @@ export class FormPasswordComponent extends BaseForm implements OnInit {
     const validStatus = this.confirmPasswordValid && this.passwordValid
 
     if (!this.passwordsValidAreValidAlreadyChecked && validStatus) {
-      this.announce($localize`:@@register.passwordAreValid:Your password match`)
+      this.announce(
+        $localize`:@@register.passwordAreValid:Your passwords match`
+      )
     } else if (this.passwordsValidAreValidAlreadyChecked && !validStatus) {
       this.announce(
-        $localize`:@@register.passwordAreNotValid:Your password do not match`
+        $localize`:@@register.passwordAreNotValid:Your passwords do not match`
       )
     }
     this.passwordsValidAreValidAlreadyChecked = validStatus

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
@@ -74,33 +74,3 @@
     </button> -->
   </div>
 </ng-container>
-
-<!-- <a (click)="addAdditionalEmail()" class="mat-button-font">
-  <mat-icon>add</mat-icon>
-  <span i18n="@@register.additionalEmailAdd">Add another email</span>
-</a> -->
-<!--
-<mde-popover
-  #namesPopover="mdePopover"
-  [mdePopoverOverlapTrigger]="false"
-  [mdePopoverCloseOnClick]="true"
->
-  <mat-card class="mat-elevation-z3 orcid-popover">
-    <ng-container i18n="@@register.additionalEmailInfo"
-      >Ensure that you never lose access to your ORCID record by registering
-      additional email addresses on your account.</ng-container
-    >
-
-    <button
-      mat-button
-      color="primary"
-      [attr.aria-label]="labelClose"
-      (click)="additionalEmailsPopoverTrigger.closePopover()"
-      cdkFocusInitial
-      i18n="@@shared.ok"
-      type="button"
-    >
-      Ok
-    </button>
-  </mat-card>
-</mde-popover> -->
diff --git a/src/app/register2/components/form-personal/form-personal.component.html b/src/app/register2/components/form-personal/form-personal.component.html
@@ -343,26 +343,3 @@ <h3 class="orc-font-body" i18n="@@register.addAnotherEmailToSecure">
     ></app-form-personal-additional-emails>
   </ng-container>
 </ng-container>
-
-<mde-popover
-  #namesPopover="mdePopover"
-  [mdePopoverOverlapTrigger]="false"
-  [mdePopoverCloseOnClick]="true"
->
-  <mat-card class="mat-elevation-z3 orcid-popover">
-    <p i18n="@@register.firstNameDetail">
-      First name is your given name or the name you most commonly go by.
-    </p>
-    <p i18n="@@register.lastNameDetail">Last name is your family name.</p>
-    <p i18n="@@register.youWillHaveAChance">
-      You will have a chance to add additional names after you have created your
-      account.
-    </p>
-    <a
-      href="https://support.orcid.org/hc/articles/360006973853"
-      target="orcid.frontend.register.help.more_info.link.text"
-      i18n="@@register.moreInfoOnNames"
-      >More information on names</a
-    >
-  </mat-card>
-</mde-popover>
diff --git a/src/app/register2/components/form-personal/form-personal.component.ts b/src/app/register2/components/form-personal/form-personal.component.ts
@@ -272,20 +272,10 @@ export class FormPersonalComponent extends BaseForm implements OnInit {
   get emailsAreValid() {
     const validStatus = this.emailConfirmationValid && this.emailValid
     if (!this.emailsAreValidAlreadyChecked && validStatus) {
-      this.announce(
-        $localize`:@@register.emailsAreValid:Your` +
-          ' ' +
-          this.emails.controls['email'].value +
-          ' ' +
-          $localize`:@@register.emailMatch:match`
-      )
+      this.announce($localize`:@@register.emailAreValid:Your emails match`)
     } else if (this.emailsAreValidAlreadyChecked && !validStatus) {
       this.announce(
-        $localize`:@@register.emailsAreValid:Your` +
-          ' ' +
-          this.emails.controls['email'].value +
-          ' ' +
-          $localize`:@@register.emailNotMatch:not match`
+        $localize`:@@register.emailAreNotValid:Your emails do not match`
       )
     }
     this.emailsAreValidAlreadyChecked = validStatus

diff --git a/src/app/register2/components/step-d/step-d.component.html b/src/app/register2/components/step-d/step-d.component.html
@@ -54,6 +54,7 @@ <h2 class="orc-font-body-small" i18n="@@register.step2.3">
           color="primary"
           [disabled]="loading"
           (click)="nextButtonWasClicked = true"
+          matStepperNext
         >
           <ng-container
             *ngIf="!reactivation?.isReactivation"

diff --git a/src/app/register2/pages/register/register2.component.html b/src/app/register2/pages/register/register2.component.html
@@ -8,6 +8,7 @@
           labelPosition="bottom"
           class="orcid-stepper-wizard"
           (selectionChange)="selectionChange($event)"
+          role="tablist"
         >
           <mat-step [stepControl]="FormGroupStepA">
             <ng-template matStepLabel i18n="@@register.personalData"
@@ -37,7 +38,6 @@
             <app-step-ct
               #stepComponentC
               [(formGroup)]="FormGroupStepC"
-              (submit)="register()"
               [loading]="loading"
               [reactivation]="reactivation"
             ></app-step-ct>

diff --git a/src/locale/properties/register/register.en.properties b/src/locale/properties/register/register.en.properties
@@ -182,9 +182,8 @@ register.step2.3=Step 3 of 4 - Visibility
 shared.previousStep=Previous Step
 register.addAnAdditionalEmail=Add an additional email
 register.personalEmail=personal email
-register.passwordAreValid=Your password match
-register.passwordAreNotValid=Your password do not match
-register.emailsAreValid=Your
-register.emailMatch=match
-register.emailNotMatch=not match
+register.passwordAreValid=Your passwords match
+register.passwordAreNotValid=Your passwords do not match
+register.emailAreValid=Your emails match
+register.emailAreNotValid=Your emails do not match
 register.Email=Email