Merge branch 'main' into lmendoza/batch-fixes-17-jan-2024

ORCID · Jan 17, 2024 · d0886bc · d0886bc
2 parents a23af9d + 450a060
commit d0886bc
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v2.53.5 - 2024-01-15
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.53.4...v2.53.5)
+
+- [#2135](https://github.com/ORCID/orcid-angular/pull/2135): 8934 registration add an affiliation with typeahead
+
 ## v2.53.4 - 2024-01-12
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.53.3...v2.53.4)

diff --git a/...pp/register2/components/form-current-employment/form-current-employment.component.spec.ts b/...pp/register2/components/form-current-employment/form-current-employment.component.spec.ts
@@ -13,7 +13,10 @@ import { ErrorHandlerService } from '../../../core/error-handler/error-handler.s
 import { ReactivationService } from '../../../core/reactivation/reactivation.service'
 import { Register2Service } from '../../../core/register2/register2.service'
 import { FormCurrentEmploymentComponent } from './form-current-employment.component'
-import { MatLegacyAutocomplete, MatLegacyAutocompleteModule } from '@angular/material/legacy-autocomplete'
+import {
+  MatLegacyAutocomplete,
+  MatLegacyAutocompleteModule,
+} from '@angular/material/legacy-autocomplete'
 import { SharedModule } from 'src/app/shared/shared.module'
 
 describe('FormPersonalComponent', () => {
@@ -22,7 +25,13 @@ describe('FormPersonalComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule, MdePopoverModule, RouterTestingModule, MatLegacyAutocompleteModule, SharedModule],
+      imports: [
+        HttpClientTestingModule,
+        MdePopoverModule,
+        RouterTestingModule,
+        MatLegacyAutocompleteModule,
+        SharedModule,
+      ],
       declarations: [FormCurrentEmploymentComponent],
       providers: [
         WINDOW_PROVIDERS,

diff --git a/src/locale/properties/register/register.en.properties b/src/locale/properties/register/register.en.properties
@@ -157,17 +157,12 @@ register.onlyPeopleAndOrganization=Only people and organizations you’ve given
 register.itemsArePrivateAndOnly=Items are private and only visible to you
 register.step1.2=Step 1 of 4 - Names and emails
 register.step2.2=Step 2 of 4 - Password
-register.step2.3=Step 3 of 4 - Visibility
+register.step2.3=Step 2 of 5 - Password
 register.step2.4=Step 4 of 4 - Terms and conditions
-
-
 register.step1.3=Step 1 of 5 - Names and emails
-register.step2.3=Step 2 of 5 - Password
 register.step3.3=Step 3 of 5 - Current employment
 register.step4.3=Step 4 of 5 - Visibility
 register.step5.3=Step 5 of 5 - Terms and conditions
-
-
 register.nextStep=Next Step
 register.cancelRegistration=Cancel registration
 register.previousStep=Previous Step

diff --git a/src/locale/properties/register/register.lr.properties b/src/locale/properties/register/register.lr.properties
@@ -195,3 +195,18 @@ register.confirmYourPassword=LR
 register.VisibilityParties=LR
 register.emailPlaceholder=LR
 register.emailIsAlreadyAssociated=LR
+register.step1.3=LR
+register.step3.3=LR
+register.step4.3=LR
+register.step5.3=LR
+register.roleJobTitle=LR
+register.department=LR
+register.weCantIdentifyThisOrganization=LR
+register.currentEmployment=LR
+register.pleaseEnterAnOrganizationName=LR
+register.organizationPlaceholder=LR
+register.departmentPlaceholder=LR
+register.rolePlaceholder=LR
+register.yearPlaceholder=LR
+register.monthPlaceholder=LR
+register.clearOrganization=LR
diff --git a/src/locale/properties/register/register.rl.properties b/src/locale/properties/register/register.rl.properties
@@ -195,3 +195,18 @@ register.confirmYourPassword=RL
 register.VisibilityParties=RL
 register.emailPlaceholder=RL
 register.emailIsAlreadyAssociated=RL
+register.step1.3=RL
+register.step3.3=RL
+register.step4.3=RL
+register.step5.3=RL
+register.roleJobTitle=RL
+register.department=RL
+register.weCantIdentifyThisOrganization=RL
+register.currentEmployment=RL
+register.pleaseEnterAnOrganizationName=RL
+register.organizationPlaceholder=RL
+register.departmentPlaceholder=RL
+register.rolePlaceholder=RL
+register.yearPlaceholder=RL
+register.monthPlaceholder=RL
+register.clearOrganization=RL
diff --git a/src/locale/properties/register/register.xx.properties b/src/locale/properties/register/register.xx.properties
@@ -195,3 +195,18 @@ register.confirmYourPassword=X
 register.VisibilityParties=X
 register.emailPlaceholder=X
 register.emailIsAlreadyAssociated=X
+register.step1.3=X
+register.step3.3=X
+register.step4.3=X
+register.step5.3=X
+register.roleJobTitle=X
+register.department=X
+register.weCantIdentifyThisOrganization=X
+register.currentEmployment=X
+register.pleaseEnterAnOrganizationName=X
+register.organizationPlaceholder=X
+register.departmentPlaceholder=X
+register.rolePlaceholder=X
+register.yearPlaceholder=X
+register.monthPlaceholder=X
+register.clearOrganization=X