Merge branch 'main' into lmendoza/jun-2025-multiple-changes

cryptalith · web-flow · commit 6a8456845e12 · 2025-06-02T19:45:30.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,27 @@
+## v2.115.6 - 2025-05-29
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.115.5...v2.115.6)
+
+## v2.115.5 - 2025-05-29
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.115.4...v2.115.5)
+
+- [#2524](https://github.com/ORCID/orcid-angular/pull/2524): add microdelay to interstitial for already authorized users
+
+## v2.115.4 - 2025-05-28
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.115.3...v2.115.4)
+
+## v2.115.3 - 2025-05-20
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.115.2...v2.115.3)
+
+## v2.115.2 - 2025-05-19
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.115.1...v2.115.2)
+
+- [#2523](https://github.com/ORCID/orcid-angular/pull/2523): 9803-truncate-extremely-long-user-names-in-the-global-header
+
 ## v2.115.1 - 2025-05-19
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.115.0...v2.115.1)
diff --git a/src/app/account-settings/components/settings-security-alternate-sign-in/settings-security-alternate-sign-in.component.html b/src/app/account-settings/components/settings-security-alternate-sign-in/settings-security-alternate-sign-in.component.html
@@ -1,7 +1,7 @@
 <app-settings-panels-data *ngIf="accounts$ | async as accounts">
-  <p i18n="@@account.youCanSingIntoOrcid">
-    You can sign into ORCID using the personal and institutional accounts you
-    have linked to your ORCID record.
+  <p i18n="@@account.youCanSignIntoOrcid">
+    You can sign into ORCID using any of the institutional accounts you have
+    linked to your ORCID record.
   </p>
 
   <a
diff --git a/src/app/authorize/pages/authorize/authorize.component.ts b/src/app/authorize/pages/authorize/authorize.component.ts
@@ -210,9 +210,9 @@ export class AuthorizeComponent {
       this.debugLog('User alreay authorized this app')
       if (this.isThereInterstitialToShow()) {
         this.redirectByReportAlreadyAuthorize = true
-        this.showInterstitial()
         this.loading = false
         this.redirectUrl = this.oauthSession.redirectUrl
+        setTimeout(() => this.showInterstitial())
       } else {
         this.finishRedirectObs(this.oauthSession)
       }
diff --git a/src/app/core/user-info/user-info.service.ts b/src/app/core/user-info/user-info.service.ts
@@ -35,7 +35,10 @@ export class UserInfoService {
           'userInfo.json'
 
         if (outhSiginFlag) {
-          userInfoUrl = runtimeEnvironment.AUTH_SERVER + 'userInfo.json'
+          userInfoUrl =
+            runtimeEnvironment.AUTH_SERVER +
+            (options?.publicRecordId ? options.publicRecordId + '/' : '') +
+            'userInfo.json'
         }
 
         return this._http
diff --git a/src/app/record/components/top-bar/modals/modal-name/modal-name.component.html b/src/app/record/components/top-bar/modals/modal-name/modal-name.component.html
@@ -111,7 +111,7 @@ <h2 class="orc-font-body-large">
             *ngIf="namesForm?.get('givenNames').hasError('required')"
             i18n="@@topBar.firstNameError"
           >
-            Please enter your first/given name
+            Please enter your given names
           </mat-error>
           <mat-error
             *ngIf="namesForm?.get('givenNames').hasError('illegalName')"
@@ -146,7 +146,7 @@ <h2 class="orc-font-body-large">
             *ngIf="namesForm?.get('familyName').hasError('required')"
             i18n="@@topBar.firstNameError"
           >
-            Please enter your first/given name
+            Please enter your given names
           </mat-error>
           <mat-error
             *ngIf="namesForm?.get('familyName').hasError('illegalName')"
diff --git a/src/app/record/components/top-bar/modals/modal-name/modal-name.component.ts b/src/app/record/components/top-bar/modals/modal-name/modal-name.component.ts
@@ -69,8 +69,8 @@ export class ModalNameComponent implements OnInit, OnDestroy {
   nameMaxLength = 99
   otherNameMaxLength = 254
 
-  ngOrcidAddGivenName = $localize`:@@topBar.addGivenName:Add given name`
-  ngOrcidAddFamilyName = $localize`:@@topBar.addFamilyName:Add family name`
+  ngOrcidAddGivenName = $localize`:@@topBar.addGivenName:Your given names or forenames`
+  ngOrcidAddFamilyName = $localize`:@@topBar.addFamilyName:Your family names or surnames`
   ngOrcidAddPublishedName = $localize`:@@topBar.addPublishedName:Add a published or credit name`
   ngOrcidAddOtherName = $localize`:@@topBar.addOtherName:Add other name`
   ngOrcidDefaultVisibilityLabel = $localize`:@@topBar.manageWhoCanSee:Control who can see your given, family and published names by setting the visibility. The default visibility for your names is`
diff --git a/src/app/register2/components/form-personal/form-personal.component.ts b/src/app/register2/components/form-personal/form-personal.component.ts
@@ -102,9 +102,8 @@ export class FormPersonalComponent
   labelInfoAboutName = $localize`:@@register.ariaLabelInfo:info about names`
   labelClose = $localize`:@@register.ariaLabelClose:close`
   labelConfirmEmail = $localize`:@@register.confirmEmail:Confirm primary email`
-  labelNameYouMostCommonly = $localize`:@@register.labelNameYouMostMost:The names you most commonly go by`
-  labelFamilyNamePlaceholder = $localize`:@@register.familyNamePlaceholder:Your family name or surname
-  `
+  labelNameYouMostCommonly = $localize`:@@register.labelNameYouMostMost:Your given names or forenames`
+  labelFamilyNamePlaceholder = $localize`:@@register.familyNamePlaceholder:Your family names or surnames`
   professionalEmail: boolean
   personalEmail: boolean
   undefinedEmail: boolean
diff --git a/src/locale/properties/account/account.en.properties b/src/locale/properties/account/account.en.properties
@@ -37,6 +37,7 @@ account.accessGranted=Access granted
 account.alternateSignInID=Alternate sign in ID
 account.account=Account
 account.youCanSingIntoOrcid=You can sign into ORCID using the personal and institutional accounts you have linked to your ORCID record.
+account.youCanSignIntoOrcid=You can sign into ORCID using any of the institutional accounts you have linked to your ORCID record.
 account.learnMoreAboutUsing=Learn more about using alternate accounts to sign in to ORCID
 account.accountPassword=Account password
 account.actions=Account actions
diff --git a/src/locale/properties/account/account.lr.properties b/src/locale/properties/account/account.lr.properties
@@ -35,6 +35,7 @@ account.accessGranted=LR
 account.alternateSignInID=LR
 account.account=LR
 account.youCanSingIntoOrcid=LR
+account.youCanSignIntoOrcid=LR
 account.learnMoreAboutUsing=LR
 account.actions=LR
 account.OrcidCollectsLimited=LR
diff --git a/src/locale/properties/account/account.rl.properties b/src/locale/properties/account/account.rl.properties
@@ -35,6 +35,7 @@ account.accessGranted=RL
 account.alternateSignInID=RL
 account.account=RL
 account.youCanSingIntoOrcid=RL
+account.youCanSignIntoOrcid=RL
 account.learnMoreAboutUsing=RL
 account.actions=RL
 account.OrcidCollectsLimited=RL
diff --git a/src/locale/properties/account/account.xx.properties b/src/locale/properties/account/account.xx.properties
@@ -35,6 +35,7 @@ account.accessGranted=X
 account.alternateSignInID=X
 account.account=X
 account.youCanSingIntoOrcid=X
+account.youCanSignIntoOrcid=X
 account.learnMoreAboutUsing=X
 account.actions=X
 account.OrcidCollectsLimited=X
diff --git a/src/locale/properties/register/register.en.properties b/src/locale/properties/register/register.en.properties
@@ -183,8 +183,8 @@ 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 names you most commonly go by
-register.familyNamePlaceholder=Your family name or surname
+register.labelNameYouMostMost=Your given names or forenames
+register.familyNamePlaceholder=Your family names or surnames
 register.ariaLabelMoreInformationOnVisibility=More information on visibility settings (Opens in new tab)
 shared.previousStep=Previous Step
 register.addAnAdditionalEmail=Add an additional email
diff --git a/src/locale/properties/top-bar/top-bar.en.properties b/src/locale/properties/top-bar/top-bar.en.properties
@@ -3,8 +3,8 @@ topBar.biography=Biography
 topBar.publishedName=Published name
 topBar.yourPublishedName=Your published name
 topBar.alsoKnowAs=Also known as
-topBar.addGivenName=Add given name
-topBar.addFamilyName=Add family name
+topBar.addGivenName=Your given names or forenames
+topBar.addFamilyName=Your family names or surnames
 topBar.addPublishedName=Add a published or credit name
 topBar.addOtherName=Add other name
 topBar.information=Information about yourself, your research interests and other pertinent details that enhance your ORCID record.
@@ -13,7 +13,7 @@ topBar.yourGivenAndFamilyNames=Your given and family names
 topBar.orcidHasANumber=ORCID has a number of options for adding and managing your names.
 topBar.findOutMore=Find out more about managing names in your ORCID record
 topBar.givenNames=Given names
-topBar.firstNameError=Please enter your first/given name
+topBar.firstNameError=Please enter your given names
 topBar.invalidName=Invalid name characters or format
 topBar.invalidBio=Invalid characters or format
 topBar.familyNames=Family names
