diff --git a/src/app/register2/components/form-password/form-password.component.ts b/src/app/register2/components/form-password/form-password.component.ts index 8ae0c27ef3..d2093a672b 100644 --- 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,10 @@ 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/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.html b/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.html index 922e2b9a96..8e6e00efd8 100644 --- a/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.html +++ b/src/app/register2/components/form-personal-additional-emails/form-personal-additional-emails.component.html @@ -74,33 +74,3 @@ --> - - - diff --git a/src/app/register2/components/form-personal/form-personal.component.html b/src/app/register2/components/form-personal/form-personal.component.html index 903aa656bf..72bb9ee41b 100644 --- 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 @@

> - - - -

- First name is your given name or the name you most commonly go by. -

-

Last name is your family name.

-

- You will have a chance to add additional names after you have created your - account. -

- More information on names -
-
diff --git a/src/app/register2/components/form-personal/form-personal.component.ts b/src/app/register2/components/form-personal/form-personal.component.ts index 248bbef5da..efaaff76e5 100644 --- 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,12 @@ 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` + this.announce($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 index 4f06601762..c79dae78cc 100644 --- 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 @@

color="primary" [disabled]="loading" (click)="nextButtonWasClicked = true" + matStepperNext > diff --git a/src/locale/properties/register/register.en.properties b/src/locale/properties/register/register.en.properties index 1a91ae83af..81bd4e7145 100644 --- 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