diff --git a/documentation.json b/documentation.json index 0cb0043690..cceda5c7d9 100644 --- a/documentation.json +++ b/documentation.json @@ -41344,7 +41344,7 @@ }, "extends": "BaseForm", "implements": ["OnInit", "AfterViewInit"], - "templateData": "\n
\n \n First name\n \n \n Please enter your first/given name\n \n \n Invalid name characters or format\n \n \n
\n \n
\n
\n
\n\n \n help_outline\n \n
\n \n Last name\n (Optional)\n \n \n Invalid name characters or format\n \n \n
\n \n
\n
\n
\n\n \n \n Primary email\n \n \n An email is required\n \n \n Invalid email format\n \n\n \n \n \n \n \n \n \n Confirm primary email\n \n \n Please confirm your email\n \n \n Invalid email format\n \n \n Email confirmation does not match\n \n \n \n \n \n \n \n\n \n \n \n
\n\n\n \n

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

\n

Last name is your family name.

\n

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

\n More information on names\n
\n\n" + "templateData": "\n
\n \n First name\n \n \n Please enter your first/given name\n \n \n Invalid name characters or format\n \n \n
\n \n
\n
\n
\n\n \n help_outline\n \n
\n \n Last name\n (Optional)\n \n \n Invalid name characters or format\n \n \n
\n \n
\n
\n
\n\n \n \n Primary email\n \n \n An email is required\n \n \n Invalid email format\n \n\n \n \n \n \n \n \n \n Confirm primary email\n \n \n Please confirm your email\n \n \n Invalid email format\n \n \n Email confirmation does not match\n \n \n \n \n \n \n \n\n \n \n \n
\n\n\n \n

\n First name is your given name or The names you most commonly go by.\n

\n

Last name is your family name.

\n

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

\n More information on names\n
\n\n" }, { "name": "FormSignInComponent", diff --git a/src/app/register/components/form-personal/form-personal.component.html b/src/app/register/components/form-personal/form-personal.component.html index 4b447f9fdd..21910caf8b 100644 --- a/src/app/register/components/form-personal/form-personal.component.html +++ b/src/app/register/components/form-personal/form-personal.component.html @@ -163,7 +163,7 @@ >

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

Last name is your family name.

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 9cd2411c67..f66c4c9ab1 100644 --- a/src/app/register2/components/form-password/form-password.component.ts +++ b/src/app/register2/components/form-password/form-password.component.ts @@ -42,7 +42,7 @@ import { environment } from 'src/environments/environment' export class FormPasswordComponent extends BaseForm implements OnInit { labelInfo = $localize`:@@register.ariaLabelInfoPassword:info about password` labelClose = $localize`:@@register.ariaLabelClose:close` - labelConfirmPassword = $localize`:@@register.confirmPassword:Confirm password` + labelConfirmPassword = $localize`:@@register.confirmYourPassword:Confirm your password` @ViewChild(`#passwordPopover`) passwordPopover @ViewChild(`#passwordPopoverTrigger`) passwordPopoverTrigger hasNumberPattern = HAS_NUMBER 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 72bb9ee41b..237ff52302 100644 --- a/src/app/register2/components/form-personal/form-personal.component.html +++ b/src/app/register2/components/form-personal/form-personal.component.html @@ -95,8 +95,8 @@

error: emailFormTouched && emails.controls.email.errors }" id="email-input-label" - i18n="@@register.Email" - >EmailPrimary email matInput appTrim type="email" + [placeholder]="emailPlaceholder" />

- Add a Add a + professional email @@ -299,7 +300,7 @@

Adding an additional email as backup helps secure your account and - make sure you can always sign in. + makes sure you can always sign in.
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 757cb5f356..4a88364b3e 100644 --- a/src/app/register2/components/form-personal/form-personal.component.ts +++ b/src/app/register2/components/form-personal/form-personal.component.ts @@ -80,12 +80,12 @@ export class FormPersonalComponent extends BaseForm implements OnInit { @Input() nextButtonWasClicked: boolean @Input() reactivation: ReactivationLocal @ViewChild(FormGroupDirective) formGroupDir: FormGroupDirective - + emailPlaceholder = $localize`:@@register.emailPlaceholder:The email address you use most` arialabelConfirmEmail = $localize`:@@register.labelConfirmEmail:Confirm your email address` labelInfoAboutName = $localize`:@@register.ariaLabelInfo:info about names` labelClose = $localize`:@@register.ariaLabelClose:close` labelConfirmEmail = $localize`:@@register.confirmEmail:Confirm primary email` - labelNameYouMostCommonly = $localize`:@@register.labelNameYouMostMost:The name you most commonly go by` + labelNameYouMostCommonly = $localize`:@@register.labelNameYouMostMost:The names you most commonly go by` labelFamilyNamePlaceholder = $localize`:@@register.familyNamePlaceholder:Your family name or surname ` professionalEmail: boolean diff --git a/src/app/register2/components/form-visibility/form-visibility.component.html b/src/app/register2/components/form-visibility/form-visibility.component.html index 255fac8375..e3732c6273 100644 --- a/src/app/register2/components/form-visibility/form-visibility.component.html +++ b/src/app/register2/components/form-visibility/form-visibility.component.html @@ -72,8 +72,8 @@ />
- Trusted OrganizationsTrusted parties (5% of users choose this)Create your ORCID iD -

+

Step 4 of 4 - Terms and conditions

diff --git a/src/locale/properties/register/register.en.properties b/src/locale/properties/register/register.en.properties index 81bd4e7145..dd29aee8cb 100644 --- a/src/locale/properties/register/register.en.properties +++ b/src/locale/properties/register/register.en.properties @@ -24,6 +24,7 @@ register.passwordSymbol=1 letter or symbol register.passwordLength=8 or more characters register.passwordNotEmail=Password must not be the same as your email address register.password=Password +register.confirmYourPassword=Confirm your password register.confirmPassword=Confirm password register.confirmationEmailNotMatch=Email confirmation does not match register.invalidEmail=Invalid email format @@ -86,7 +87,7 @@ register.visibilityRequired=Please choose a default visibility setting. register.moreInfoOnNames=More information on names register.youWillHaveAChance=You will have a chance to add additional names after you have created your account. register.lastNameDetail=Last name is your family name. -register.firstNameDetail=First name is your given name or the name you most commonly go by. +register.firstNameDetail=First name is your given name or The names you most commonly go by. register.mustBe8=Must be 8 or more characters and contain: register.passwordLengthDetail=Must be between 8 and 256 characters long and contain: register.atLeast1=at least 1 numeral: 0 - 9 @@ -142,7 +143,7 @@ register.asBackupSoWeCanBetter=as backup so we can better recommend affiliations register.professionalEmail=professional email register.addA=Add a register.addAnotherEmailToSecure=Add another email to secure your account -register.addingAnAddiotionalEmailAsBackup=Adding an additional email as backup helps secure your account and make sure you can always sign in. +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 @@ -175,7 +176,7 @@ register.passwordLetterOrSymbolOk=Password contains at least a letter or symbol register.passwordNumberError=Password must contain at least a number register.passwordNumberOk=Password contains at least a number register.labelConfirmEmail=Confirm your email address -register.labelNameYouMostMost=The name you most commonly go by +register.labelNameYouMostMost=The names you most commonly go by register.familyNamePlaceholder=Your family name or surname register.ariaLabelMoreInformationOnVisibility=More information on visibility settings (Opens in new tab) register.step2.3=Step 3 of 4 - Visibility @@ -187,3 +188,6 @@ register.passwordAreNotValid=Your passwords do not match register.emailAreValid=Your emails match register.emailAreNotValid=Your emails do not match register.Email=Email +register.VisibilityParties=Trusted parties +register.step2.4=Step 4 of 4 - Terms and conditions +register.emailPlaceholder=The email address you use most