diff --git a/src/app/core/register2/register2.form-adapter.ts b/src/app/core/register2/register2.form-adapter.ts index f86e6fff4c..1e0b4c7990 100644 --- a/src/app/core/register2/register2.form-adapter.ts +++ b/src/app/core/register2/register2.form-adapter.ts @@ -127,6 +127,9 @@ export function Register2FormAdapterMixin>(base: T) { } else { return { affiliationName: { value: value.value }, + disambiguatedAffiliationSourceId: { + value: value.disambiguatedAffiliationIdentifier, + }, orgDisambiguatedId: { value: value.disambiguatedAffiliationIdentifier, }, @@ -137,6 +140,10 @@ export function Register2FormAdapterMixin>(base: T) { month: startDateGroup.startDateMonth, year: startDateGroup.startDateYear, }, + sourceId: { value: value.sourceId }, + city: { value: value.city }, + region: { value: value.region }, + country: { value: value.country }, } } } diff --git a/src/app/register2/components/form-current-employment/form-current-employment.component.html b/src/app/register2/components/form-current-employment/form-current-employment.component.html index 18aa84e8df..44c5785088 100644 --- a/src/app/register2/components/form-current-employment/form-current-employment.component.html +++ b/src/app/register2/components/form-current-employment/form-current-employment.component.html @@ -3,33 +3,42 @@

Current employment

- +
class="selected-org orc-font-small-print" *ngIf="selectedOrganizationFromDatabase && displayOrganizationHint" > - {{ selectedOrganizationFromDatabase.value }}, {{ selectedOrganizationFromDatabase.city }}, + {{ selectedOrganizationFromDatabase.region + }}, {{ selectedOrganizationFromDatabase.country }}
idx + 1) - organization: string | Organization = '' + organization: string | Organization | OrgDisambiguated = '' platform: PlatformInfo isMobile: boolean + rorId: string = 'https://ror.org/036mest28' constructor( private _register: Register2Service, private _platform: PlatformInfoService, private _liveAnnouncer: LiveAnnouncer, private _recordAffiliationService: RecordAffiliationService, - private _formBuilder: FormBuilder + private _formBuilder: FormBuilder, + private registerStateService: RegisterStateService ) { super() this._platform.get().subscribe((platform) => { @@ -122,6 +127,19 @@ export class FormCurrentEmploymentComponent extends BaseForm implements OnInit { } ngOnInit() { + this.registerStateService.matchOrganization$.subscribe((organization) => { + this.organization = organization + this.form.patchValue({ + organization: organization, + }) + this.rorIdHasBeenMatched = !!organization + + if (this.rorIdHasBeenMatched) { + this.form.controls.organization.markAsTouched() + } else { + this.form.controls.organization.markAsUntouched() + } + }) this.form = new UntypedFormGroup({ organization: new UntypedFormControl(this.organization, { validators: [ @@ -212,8 +230,12 @@ export class FormCurrentEmploymentComponent extends BaseForm implements OnInit { ) } - autoCompleteDisplayOrganization(organization: Organization) { - return organization.value + autoCompleteDisplayOrganization( + organization: Organization | string | OrgDisambiguated + ) { + if (typeof organization === 'object') { + return organization.value + } } private _filter(value: string): Observable { 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 8ed82b0c73..74b8af9c8f 100644 --- a/src/app/register2/components/form-personal/form-personal.component.html +++ b/src/app/register2/components/form-personal/form-personal.component.html @@ -67,6 +67,12 @@

[placeholder]="labelFamilyNamePlaceholder" /> + + Must be less than 100 characters + Terms of Use

(form.hasError('required', 'termsOfUse') || form.hasError('required', 'dataProcessed')) " - i18n="@@register.youMustAccept" - >You must accept the terms we use and consent to your data being processed in + i18n="@@register.youMustAccept2" + >You must accept the terms of use and consent to your data being processed in the United States diff --git a/src/app/register2/components/register2.style.scss b/src/app/register2/components/register2.style.scss index 02d5503f66..666af1f1db 100644 --- a/src/app/register2/components/register2.style.scss +++ b/src/app/register2/components/register2.style.scss @@ -61,8 +61,18 @@ mat-label.orc-font-small-print { .step-actions { border-top: 1px solid; padding-top: 32px; - a { - font-style: italic; + + button { + height: 40px; + font-size: 16px; + a { + font-style: italic; + font-size: 14px; + } + a.skip-step { + font-style: normal; + font-size: 14px; + } } } .columns-12 { @@ -150,6 +160,9 @@ mat-label.orc-font-small-print { .info, .announce { + .main-paragraph { + margin-bottom: 16px; + } .content div:not(:last-child) { margin-bottom: 16px; } @@ -222,7 +235,7 @@ mat-label.orc-font-small-print { justify-content: space-between; width: 100%; margin-top: 29px; - gap: 12px; + gap: 16px; } } } diff --git a/src/app/register2/components/step-c2/step-c2.component.html b/src/app/register2/components/step-c2/step-c2.component.html index 275b224da2..c17d8989af 100644 --- a/src/app/register2/components/step-c2/step-c2.component.html +++ b/src/app/register2/components/step-c2/step-c2.component.html @@ -72,7 +72,7 @@

id="step-c-back-button" (click)="optionalNextStep()" > - + Skip this step without adding an affiliation diff --git a/src/app/register2/register-state.service.spec.ts b/src/app/register2/register-state.service.spec.ts new file mode 100644 index 0000000000..5fa81d43cc --- /dev/null +++ b/src/app/register2/register-state.service.spec.ts @@ -0,0 +1,21 @@ +import { TestBed } from '@angular/core/testing'; + +import { RegisterStateService } from './register-state.service'; + +describe('RegisterStateService', () => { + let service: RegisterStateService; + + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [{ + provide: RegisterStateService, + useValue: {} + }] + }); + service = TestBed.inject(RegisterStateService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/register2/register-state.service.ts b/src/app/register2/register-state.service.ts new file mode 100644 index 0000000000..58bf95ceb7 --- /dev/null +++ b/src/app/register2/register-state.service.ts @@ -0,0 +1,67 @@ +import { Injectable } from '@angular/core' +import { OrganizationsService } from '../core' +import { Organization } from 'src/app/types/record-affiliation.endpoint' +import { Subject } from 'rxjs' +import { OrgDisambiguated } from '../types' +@Injectable({ + providedIn: 'root', +}) +export class RegisterStateService { + rorIdHasBeenMatched: boolean = false + matchOrganization$ = new Subject() + primaryEmailMatched: Organization + secondaryEmail: Organization + constructor(private _organizationsService: OrganizationsService) {} + + setRorAffiliationFound(affiliationFound: string, additionalEmail = false) { + if (!!affiliationFound) { + this._organizationsService + .getOrgDisambiguated('ROR', affiliationFound) + .subscribe((affiliation) => { + this.rorIdHasBeenMatched = true + if (!additionalEmail) { + this.primaryEmailMatched = + this.affiliationToOrganization(affiliation) + } else { + this.secondaryEmail = this.affiliationToOrganization(affiliation) + } + + this.updateTheAffiliationMatch() + }) + } else { + if (!additionalEmail) { + this.primaryEmailMatched = null + } else { + this.secondaryEmail = null + } + this.updateTheAffiliationMatch() + } + } + + private affiliationToOrganization( + affiliation: OrgDisambiguated + ): Organization { + return { + value: affiliation.value, + city: affiliation.city, + region: affiliation.region, + country: affiliation.country, + disambiguatedAffiliationIdentifier: + affiliation.disambiguatedAffiliationIdentifier, + sourceId: affiliation.sourceId, + } as Organization + } + + private updateTheAffiliationMatch() { + if (this.primaryEmailMatched) { + this.rorIdHasBeenMatched = true + this.matchOrganization$.next(this.primaryEmailMatched) + } else if (this.secondaryEmail) { + this.rorIdHasBeenMatched = true + this.matchOrganization$.next(this.secondaryEmail) + } else { + this.rorIdHasBeenMatched = false + this.matchOrganization$.next('') + } + } +} diff --git a/src/app/types/register.email-category.ts b/src/app/types/register.email-category.ts index 807af30464..c34870290f 100644 --- a/src/app/types/register.email-category.ts +++ b/src/app/types/register.email-category.ts @@ -2,4 +2,5 @@ export type EmailCategory = 'PROFESSIONAL' | 'PERSONAL' | 'UNDEFINED' export interface EmailCategoryEndpoint { category: EmailCategory + rorId: string } diff --git a/src/assets/vectors/registration-affiliation-icon.svg b/src/assets/vectors/registration-affiliation-icon.svg new file mode 100644 index 0000000000..3119223dfe --- /dev/null +++ b/src/assets/vectors/registration-affiliation-icon.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/locale/properties/register/register.ar.properties b/src/locale/properties/register/register.ar.properties index f43952529f..17b2743b36 100644 --- a/src/locale/properties/register/register.ar.properties +++ b/src/locale/properties/register/register.ar.properties @@ -147,7 +147,6 @@ register.addingAnAddiotionalEmailAsBackup=تساعد إضافة بريد إلك regiser.thisLooksLikeAProffessional=هذا يبدو وكأنه بريد إلكتروني مهني register.asBackupSoYouAlways=كنسخة احتياطية حتى تتمكن دائمًا من الوصول إلى حسابك على ORCID إذا قمت بتغيير الوظائف أو الأدوار. register.weRecommendAdding=نوصي بإضافة -register.youMustAccept=يجب عليك قبول الشروط التي نستخدمها والموافقة على معالجة بياناتك في الولايات المتحدة register.termsOfUse2=شروط الاستخدام register.agree2=وأوافق على أن تكون بياناتي متاحة للجمهور حيث علِّمت على أنها "مرئية للجميع". register.visibilityLegend=إعدادات العرض diff --git a/src/locale/properties/register/register.cs.properties b/src/locale/properties/register/register.cs.properties index 0581fd7000..2ce9a84d9c 100644 --- a/src/locale/properties/register/register.cs.properties +++ b/src/locale/properties/register/register.cs.properties @@ -147,7 +147,6 @@ register.addingAnAddiotionalEmailAsBackup=Přidáním záložního e-mailu zvý regiser.thisLooksLikeAProffessional=E-mailová adresa vypadá to jako profesní register.asBackupSoYouAlways=jako zálohu, abyste neztratili přístup ke svému účtu ORCID, pokud změníte zaměstnání nebo roli. register.weRecommendAdding=Doporučujeme přidat -register.youMustAccept=Musíte přijmout podmínky, které používáme, a souhlasit se zpracováním vašich údajů ve Spojených státech register.termsOfUse2=podmínky používání register.agree2=a souhlasím, že moje údaje budou veřejně přístupné, pokud budou označeny jako „Viditelné pro všechny“. register.visibilityLegend=Nastavení viditelnosti diff --git a/src/locale/properties/register/register.de.properties b/src/locale/properties/register/register.de.properties index 8ac054c170..4cb7afc184 100644 --- a/src/locale/properties/register/register.de.properties +++ b/src/locale/properties/register/register.de.properties @@ -147,7 +147,6 @@ register.addingAnAddiotionalEmailAsBackup=Indem Sie eine weitere E-Mail-Adresse regiser.thisLooksLikeAProffessional=Dies sieht nach einer beruflichen E-Mail-Adresse aus. register.asBackupSoYouAlways=als Backup hinzuzufügen, damit Sie immer Zugriff auf Ihr ORCID-Konto haben, wenn Sie Ihre Arbeit oder Position wechseln. register.weRecommendAdding=Wir empfehlen, eine -register.youMustAccept=Sie müssen unsere Nutzungsbedingungen akzeptieren und der Verarbeitung Ihrer Daten in den USA zustimmen. register.termsOfUse2=Nutzungsbedingungen register.agree2=und stimme zu, dass meine Daten öffentlich zugänglich sind, wenn sie als „Für alle sichtbar“ gekennzeichnet sind. register.visibilityLegend=Sichtbarkeitseinstellungen diff --git a/src/locale/properties/register/register.en.properties b/src/locale/properties/register/register.en.properties index f3fd84d7e9..6e5774c79b 100644 --- a/src/locale/properties/register/register.en.properties +++ b/src/locale/properties/register/register.en.properties @@ -147,7 +147,7 @@ register.addingAnAddiotionalEmailAsBackup=Adding an additional email as backup h 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 an additional -register.youMustAccept=You must accept the terms we use and consent to your data being processed in the United States +register.youMustAccept2=You must accept the terms of use and consent to your data being processed in the United States register.termsOfUse2=terms of use register.agree2=and agree to my data being publicly accessible where marked as “Visible to Everyone”. register.visibilityLegend=Visibility settings @@ -214,3 +214,7 @@ register.youCannotUseThisEmail=You cannot use this email address when creating a register.emailIsAlreadyAssociated=This email is already associated with an existing ORCID record. Please use a different email address to continue registering a new ORCID iD. register.resendClaimAddress=Resend a claim email to this email address register.reactivateOrcidAssociated=Reactivate the ORCID record associated with this email address +register.affiliationFoud=Affiliation found +register.basedOnYourEmailWeThink=Based on your emails we think you are currently affiliated with +register.webePreselectedThisOrganizationForYouInTheFormBelow=We’ve pre-selected this organization for you in the form below. +register.whenYouCompleteRegistrationAnEmployment=When you complete registration an employment affiliation will be automatically added to your new ORCID record. \ No newline at end of file diff --git a/src/locale/properties/register/register.es.properties b/src/locale/properties/register/register.es.properties index b91a58f852..53c25f4ef1 100644 --- a/src/locale/properties/register/register.es.properties +++ b/src/locale/properties/register/register.es.properties @@ -147,7 +147,6 @@ register.addingAnAddiotionalEmailAsBackup=Al añadir un correo electrónico adic regiser.thisLooksLikeAProffessional=Parece un correo electrónico profesional register.asBackupSoYouAlways=como respaldo para tener siempre acceso a su cuenta de ORCID si cambia de puesto o función. register.weRecommendAdding=Recomendamos agregar un -register.youMustAccept=Tiene que aceptar los términos de uso y dar tu consentimiento para que sus datos se procesen en Estados Unidos. register.termsOfUse2=términos de uso register.agree2=y acepto que mis datos sean de acceso público cuando estén marcados como «Visibles para todos». register.visibilityLegend=Ajustes de visibilidad diff --git a/src/locale/properties/register/register.fr.properties b/src/locale/properties/register/register.fr.properties index fea96ef47d..8e3f175d57 100644 --- a/src/locale/properties/register/register.fr.properties +++ b/src/locale/properties/register/register.fr.properties @@ -147,7 +147,6 @@ register.addingAnAddiotionalEmailAsBackup=L'ajout d'une adresse e-mail suppléme regiser.thisLooksLikeAProffessional=Cela ressemble à une adresse e-mail professionnelle register.asBackupSoYouAlways=comme adresse de secours afin de toujours pouvoir accéder à votre compte ORCID si vous changez de poste. register.weRecommendAdding=Nous vous conseillons d'ajouter une -register.youMustAccept=Vous devez accepter les conditions et consentir au traitement de vos données aux États-Unis register.termsOfUse2=conditions d'utilisation d'ORCID register.agree2=et j'accepte que mes données soient accessibles au public lorsqu'elles sont marquées comme « Visibles pour tous ». register.visibilityLegend=Paramètres de confidentialité diff --git a/src/locale/properties/register/register.it.properties b/src/locale/properties/register/register.it.properties index 485cffbf2a..f4f53d69df 100644 --- a/src/locale/properties/register/register.it.properties +++ b/src/locale/properties/register/register.it.properties @@ -147,7 +147,6 @@ register.addingAnAddiotionalEmailAsBackup=L’aggiunta di un’altra email come regiser.thisLooksLikeAProffessional=Questa sembra un’email professionale register.asBackupSoYouAlways=come backup così avrai sempre accesso all’account ORCID se cambi lavoro o ruolo. register.weRecommendAdding=Consigliamo l’aggiunta di un -register.youMustAccept=Devi accettare i termini che usiamo e acconsentire al trattamento dei tuoi dati negli Stati Uniti register.termsOfUse2=termini di uso register.agree2=e acconsento che i miei dati siano pubblicamente accessibili quando sono contrassegnati come "Visibili per tutti". register.visibilityLegend=Impostazioni di Visibilità diff --git a/src/locale/properties/register/register.ja.properties b/src/locale/properties/register/register.ja.properties index 9da2f8d5c3..b9006f6b16 100644 --- a/src/locale/properties/register/register.ja.properties +++ b/src/locale/properties/register/register.ja.properties @@ -147,7 +147,6 @@ register.addingAnAddiotionalEmailAsBackup=バックアップとして別のメ regiser.thisLooksLikeAProffessional=仕事用のメールのようです register.asBackupSoYouAlways=をバックアップとして追加することで、仕事や役割が変わってもORCIDアカウントにアクセスできるようになります。 register.weRecommendAdding=私たちは -register.youMustAccept=当社の利用規約に同意し、米国でのデータ処理に同意する必要があります register.termsOfUse2=利用規約により register.agree2=そして、「誰でも閲覧可」にマークすると自分のデータが公開されることに同意します。 register.visibilityLegend=可視性設定 diff --git a/src/locale/properties/register/register.ko.properties b/src/locale/properties/register/register.ko.properties index 0fea711248..cf8dbe4a85 100644 --- a/src/locale/properties/register/register.ko.properties +++ b/src/locale/properties/register/register.ko.properties @@ -147,7 +147,6 @@ register.addingAnAddiotionalEmailAsBackup=백업 이메일 주소를 추가하 regiser.thisLooksLikeAProffessional=업무용 이메일인 것으로 보임 register.asBackupSoYouAlways=을 추가하면 업무 및 역할이 변경되었을 때도 ORCID 계정에 항상 액세스할 수 있습니다. register.weRecommendAdding=권장합니다. 백업용 -register.youMustAccept=이용 약관을 수락하여 귀하의 데이터가 미국 내에서 처리되는 데에 동의하셔야 합니다. register.termsOfUse2=이용 약관에 따라 register.agree2=그리고 "모두에게 공개"로 표시된 저의 데이터를 공개적으로 사용 가능하도록 하는 것에 동의합니다. register.visibilityLegend=가시성 설정 diff --git a/src/locale/properties/register/register.lr.properties b/src/locale/properties/register/register.lr.properties index fe0e48c426..56a2be9af0 100644 --- a/src/locale/properties/register/register.lr.properties +++ b/src/locale/properties/register/register.lr.properties @@ -147,7 +147,6 @@ register.addingAnAddiotionalEmailAsBackup=LR regiser.thisLooksLikeAProffessional=LR register.asBackupSoYouAlways=LR register.weRecommendAdding=LR -register.youMustAccept=LR register.termsOfUse2=LR register.agree2=LR register.visibilityLegend=LR diff --git a/src/locale/properties/register/register.pl.properties b/src/locale/properties/register/register.pl.properties index 65a647e517..9d1f2f932a 100644 --- a/src/locale/properties/register/register.pl.properties +++ b/src/locale/properties/register/register.pl.properties @@ -147,7 +147,6 @@ register.addingAnAddiotionalEmailAsBackup=Dodanie kolejnego adresu e-mail jako k regiser.thisLooksLikeAProffessional=To wygląda na służbowy adres e-mail register.asBackupSoYouAlways=jako kopię zapasową, aby zawsze mieć dostęp do konta ORCID, jeśli zmienisz pracę lub rolę. register.weRecommendAdding=Zalecamy dodanie a -register.youMustAccept=Musisz zaakceptować nasze warunki i zgodzić się na przetwarzanie Twoich danych w Stanach Zjednoczonych register.termsOfUse2=warunki korzystania register.agree2=i wyrażam zgodę na publiczne udostępnianie moich danych oznaczonych jako „Widoczne dla wszystkich”. register.visibilityLegend=Ustawienia widoczności diff --git a/src/locale/properties/register/register.pt.properties b/src/locale/properties/register/register.pt.properties index 38db820ab4..72853130f7 100644 --- a/src/locale/properties/register/register.pt.properties +++ b/src/locale/properties/register/register.pt.properties @@ -147,7 +147,6 @@ register.addingAnAddiotionalEmailAsBackup=Adicione outro e-mail como uma cópia regiser.thisLooksLikeAProffessional=Parece ser um e-mail profissional register.asBackupSoYouAlways=como cópia de segurança para que possa sempre aceder à sua conta ORCID caso mude de cargos ou funções. register.weRecommendAdding=Recomendamos adicionar um -register.youMustAccept=Tem de aceitar os nossos termos e dar consentimento para o tratamento dos seus dados nos EUA register.termsOfUse2=termos de uso register.agree2=e concordo que os meus dados sejam de acesso público sempre que assinalados como "Visível a Todos". register.visibilityLegend=Configurações de visibilidade diff --git a/src/locale/properties/register/register.rl.properties b/src/locale/properties/register/register.rl.properties index 214fe5b7e7..2909efe9dc 100644 --- a/src/locale/properties/register/register.rl.properties +++ b/src/locale/properties/register/register.rl.properties @@ -147,7 +147,6 @@ register.addingAnAddiotionalEmailAsBackup=RL regiser.thisLooksLikeAProffessional=RL register.asBackupSoYouAlways=RL register.weRecommendAdding=RL -register.youMustAccept=RL register.termsOfUse2=RL register.agree2=RL register.visibilityLegend=RL diff --git a/src/locale/properties/register/register.ru.properties b/src/locale/properties/register/register.ru.properties index dc5e5deef6..66352b72f9 100644 --- a/src/locale/properties/register/register.ru.properties +++ b/src/locale/properties/register/register.ru.properties @@ -147,7 +147,6 @@ register.addingAnAddiotionalEmailAsBackup=Дополнительный адре regiser.thisLooksLikeAProffessional=Похоже, вы указали рабочий адрес эл. почты register.asBackupSoYouAlways=в качестве резервного. Так вы сможете сохранить доступ к аккаунту ORCID, даже если перейдете на новую должность или место работы. register.weRecommendAdding=Рекомендуем указать -register.youMustAccept=Необходимо принять наши Условия использования и дать согласие на обработку ваших данных в США register.termsOfUse2=условиям использования ORCID register.agree2=и согласиться на общий доступ к моим данным, которые помечены как «видимые для всех». register.visibilityLegend=Настройки видимости diff --git a/src/locale/properties/register/register.tr.properties b/src/locale/properties/register/register.tr.properties index bea3a042b3..178d70c805 100644 --- a/src/locale/properties/register/register.tr.properties +++ b/src/locale/properties/register/register.tr.properties @@ -147,7 +147,6 @@ register.addingAnAddiotionalEmailAsBackup=Yedek olarak ek bir e-posta adresi ekl regiser.thisLooksLikeAProffessional=Bu, profesyonel bir e-posta adresine benziyor register.asBackupSoYouAlways=eklemenizi öneriyoruz, böylece işinizi veya mevkiinizi değiştirirseniz ORCID hesabınıza her zaman erişebilirsiniz. register.weRecommendAdding=Yedek olarak bir -register.youMustAccept=Kullandığımız koşulları kabul etmeli ve verilerinizin Birleşik Devletler'de işlenmesine rıza göstermeniz gerekmektedir register.termsOfUse2=kullanım şartlarına göre register.agree2=ve verilerimin "Herkes Tarafından Görülebilir" olarak işaretlendiği yerlerde herkese açık olmasını kabul ediyorum. register.visibilityLegend=Görünürlük ayarları diff --git a/src/locale/properties/register/register.xx.properties b/src/locale/properties/register/register.xx.properties index 4c7945926c..f74e2be7ed 100644 --- a/src/locale/properties/register/register.xx.properties +++ b/src/locale/properties/register/register.xx.properties @@ -147,7 +147,6 @@ register.addingAnAddiotionalEmailAsBackup=X regiser.thisLooksLikeAProffessional=X register.asBackupSoYouAlways=X register.weRecommendAdding=X -register.youMustAccept=X register.termsOfUse2=X register.agree2=X register.visibilityLegend=X diff --git a/src/locale/properties/register/register.zh_CN.properties b/src/locale/properties/register/register.zh_CN.properties index b761458bda..da3b54e85c 100644 --- a/src/locale/properties/register/register.zh_CN.properties +++ b/src/locale/properties/register/register.zh_CN.properties @@ -147,7 +147,6 @@ register.addingAnAddiotionalEmailAsBackup=新增一个额外的电子邮件作 regiser.thisLooksLikeAProffessional=这似乎是工作电子邮件 register.asBackupSoYouAlways=作为备份，这样即使您更换工作或角色，也能随时访问您的 ORCID 账户。 register.weRecommendAdding=我们建议新增一个 -register.youMustAccept=您必须接受我们的使用条款，并同意在美国处理您的数据 register.termsOfUse2=使用条款 register.agree2=并同意我的数据在标记为“人人可见”的地方被公开访问 register.visibilityLegend=可见性设置 diff --git a/src/locale/properties/register/register.zh_TW.properties b/src/locale/properties/register/register.zh_TW.properties index a75b7d6bec..131c04a506 100644 --- a/src/locale/properties/register/register.zh_TW.properties +++ b/src/locale/properties/register/register.zh_TW.properties @@ -147,7 +147,6 @@ register.addingAnAddiotionalEmailAsBackup=新增額外的電子郵件作為備 regiser.thisLooksLikeAProffessional=這似乎是工作電子郵件 register.asBackupSoYouAlways=作為備份，以在您換工作或職位時總是可以存取您的 ORCID 帳戶。 register.weRecommendAdding=我們建議新增一個 -register.youMustAccept=您必須接受我們使用的條款，並同意您的資料於美國進行處理。 register.termsOfUse2=使用條款 register.agree2=並同意我的資料在標示為「所有人都看得見」的地方可公開存取。 register.visibilityLegend=可見性設定 diff --git a/src/proxy.conf.qa.mjs b/src/proxy.conf.qa.mjs index 95e279cf05..6b494e7efe 100644 --- a/src/proxy.conf.qa.mjs +++ b/src/proxy.conf.qa.mjs @@ -7,7 +7,6 @@ export default { bypass: function (req, res, proxyOptions) { /// PRINT REQUEST PATH if (req.headers.accept?.includes('html')) { - console.log('Skipping proxy', req.path) return '/index.html' } req.headers['X-Dev-Header'] = 'local-host-proxy-call' @@ -21,7 +20,6 @@ export default { bypass: function (req, res, proxyOptions) { /// PRINT REQUEST PATH if (req.headers.accept?.includes('html') && req.path !== '/signout') { - console.log('Skipping proxy', req.path) return '/index.html' } req.headers['X-Dev-Header'] = 'local-host-proxy-call' diff --git a/src/proxy.conf.sandbox.mjs b/src/proxy.conf.sandbox.mjs index 1dc65ba9c3..1a7b8bdb03 100644 --- a/src/proxy.conf.sandbox.mjs +++ b/src/proxy.conf.sandbox.mjs @@ -7,7 +7,6 @@ export default { bypass: function (req, res, proxyOptions) { /// PRRINT REQUEST PATH if (req.headers.accept.includes('html')) { - console.log('Skipping proxy', req.path) return '/index.html' } req.headers['X-Dev-Header'] = 'local-host-proxy-call' @@ -21,7 +20,6 @@ export default { bypass: function (req, res, proxyOptions) { /// PRRINT REQUEST PATH if (req.headers.accept.includes('html')) { - console.log('Skipping proxy', req.path) return '/index.html' } req.headers['X-Dev-Header'] = 'local-host-proxy-call'