From ce8107dbb4425379410523a15e8c9756d8fa8d6d Mon Sep 17 00:00:00 2001 From: leomendoza123 Date: Mon, 15 Jan 2024 22:36:46 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=A4=96=20GITHUB=20ACTIONS=20i18n=20ge?= =?UTF-8?q?nerator?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../properties/register/register.en.properties | 9 ++------- .../properties/register/register.lr.properties | 15 +++++++++++++++ .../properties/register/register.rl.properties | 15 +++++++++++++++ .../properties/register/register.xx.properties | 15 +++++++++++++++ 4 files changed, 47 insertions(+), 7 deletions(-) diff --git a/src/locale/properties/register/register.en.properties b/src/locale/properties/register/register.en.properties index ae8eefec7f..38b36fd779 100644 --- 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 @@ -209,4 +204,4 @@ register.departmentPlaceholder=School, college or department register.rolePlaceholder=Your role or job in the organization register.yearPlaceholder=Year register.monthPlaceholder=Month -register.clearOrganization=Clear organization \ No newline at end of file +register.clearOrganization=Clear organization diff --git a/src/locale/properties/register/register.lr.properties b/src/locale/properties/register/register.lr.properties index 9b60c4c162..6223d272cf 100644 --- 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 index 0c77eac32b..14a6841453 100644 --- 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 index a6808f9e56..de5918cf71 100644 --- 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 From db3561ebd4fe4cd2ad33da86f5759bb9872d204c Mon Sep 17 00:00:00 2001 From: orcid-releaser Date: Mon, 15 Jan 2024 22:38:39 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=A4=96=20GITHUB=20ACTIONS=20format=5F?= =?UTF-8?q?prettier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form-current-employment.component.spec.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/app/register2/components/form-current-employment/form-current-employment.component.spec.ts b/src/app/register2/components/form-current-employment/form-current-employment.component.spec.ts index 391399cfda..1eb944aa77 100644 --- a/src/app/register2/components/form-current-employment/form-current-employment.component.spec.ts +++ b/src/app/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, From 450a060fb833bdef082a91f6a4f44725312fab1e Mon Sep 17 00:00:00 2001 From: github actions Date: Mon, 15 Jan 2024 22:59:00 +0000 Subject: [PATCH 3/3] v2.53.5 changelog update --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1c64a1dee..4527159b28 100644 --- 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)