Merge branch 'lmendoza/24-sep-bach-fixes' of github.com:ORCID/orcid-a…

…ngular into lmendoza/24-sep-bach-fixes
ORCID · Sep 25, 2024 · dc481d0 · dc481d0
2 parents 3389c1a + 3eacd06
commit dc481d0
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v2.105.5 - 2024-09-25
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.105.4...v2.105.5)
+
+- [#2353](https://github.com/ORCID/orcid-angular/pull/2353): 24-sep-bach-fixes
+
 ## v2.105.4 - 2024-09-24
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.105.3...v2.105.4)

diff --git a/src/app/cdk/trusted-summary/component/summary-simple-panel/summary-simple-panel.component.ts b/src/app/cdk/trusted-summary/component/summary-simple-panel/summary-simple-panel.component.ts
@@ -46,7 +46,8 @@ export class SummarySimplePanelComponent implements OnInit {
   constructor(@Inject(WINDOW) private _window: Window) {}
 
   ngOnInit(): void {
-    this.acitivityCountOverflow = this.simpleActivities.length > 3 || this.count > 3
+    this.acitivityCountOverflow =
+      this.simpleActivities.length > 3 || this.count > 3
     this.simpleActivities = this.simpleActivities.slice(0, 3)
   }
   goToUrl(url?: string, event?: KeyboardEvent) {

diff --git a/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.html b/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.html
@@ -110,7 +110,6 @@ <h1 class="orc-font-body-large">
       'panel-body-3-cols': !mobile
     }"
   >
-
     <div
       class="column"
       [ngClass]="{ 'column-border': !mobile && (twoColumns || threeColumns) }"
@@ -226,7 +225,12 @@ <h3 class="orc-font-small-print" i18n="@@summary.keyDates">
     <div
       class="column"
       [ngClass]="{ 'column-border': !mobile && threeColumns }"
-      *ngIf="peerReviews?.length || works?.length || funds?.length || researchResoruces?.length"
+      *ngIf="
+        peerReviews?.length ||
+        works?.length ||
+        funds?.length ||
+        researchResoruces?.length
+      "
     >
       <ng-container *ngIf="works?.length">
         <a
@@ -335,7 +339,7 @@ <h3 class="orc-font-small-print" i18n="@@summary.keyDates">
       class="column"
       *ngIf="
         trustedSummary.professionalActivities?.length ||
-        externalIdentifiers?.length || 
+        externalIdentifiers?.length ||
         trustedSummary.educationQualifications?.length
       "
     >
@@ -396,8 +400,8 @@ <h3 class="orc-font-small-print" i18n="@@summary.keyDates">
           [url]="trustedSummary?.orcid + '#education-and-qualification'"
           [activitySummary]="trustedSummary.educationQualifications"
           [count]="trustedSummary.educationQualificationsCount"
-          [moreLabel]="labelViewEducationQualificationsActivities"
-          [moreLabelSingular]="labelViewEducationQualificationsActivitie"
+          [moreLabel]="labelMoreEducationQualifications"
+          [moreLabelSingular]="labelMoreEducationQualification"
           [ariaLabelActivitySection]="ariaLabelEducationQualificationsActions"
           [standaloneMode]="standaloneMode"
           [activitySection]="'education-and-qualification'"

diff --git a/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.ts b/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.ts
@@ -79,6 +79,8 @@ export class TrustedSummaryComponent implements OnInit, OnDestroy {
   labelMoreAffiliation = $localize`:@@summary.moreAffiliation:more Affiliation`
   labelMoreProfessionalActivitie = $localize`:@@summary.moreProfessionalActivitie:more Professional activity`
   labelMoreOtherIdentifier = $localize`:@@summary.moreOtherIdentifier:more Other Identifier`
+  labelMoreEducationQualifications = $localize`:@@summary.moreEducationQualifications:more Education and Qualifications`
+  labelMoreEducationQualification = $localize`:@@summary.moreEducationQualification:more Education and Qualification`
   labelEmailDomains = $localize`:@@summary.emailDomainsLabel:Email Domains`
   labelOrcidRecord = $localize`:@@public-layout.my_orcid:ORCID Record`
   labelViewAffiliations = $localize`:@@summary.viewAffiliations:View all affiliations in`
@@ -88,8 +90,8 @@ export class TrustedSummaryComponent implements OnInit, OnDestroy {
   labelViewPeerReviews = $localize`:@@summary.viewPeerReviews:View all peer reviews in`
   labelViewProfessionalActivities = $localize`:@@summary.viewProfessionalActivities:View all professional activities in`
   labelViewIdentifiers = $localize`:@@summary.viewIdentifiers:View all identifiers in`
-  labelViewEducationQualificationsActivities = $localize`:@@summary.viewEducationQualificationsActivities:More education qualification activities`
-  labelViewEducationQualificationsActivitie = $localize`:@@summary.viewEducationQualificationsActivitie:More education qualification activity`
+  labelViewEducationQualificationsActivities = $localize`:@@summary.viewEducationQualificationsActivities:View all education and qualifications in`
+  labelViewEducationQualificationsActivitie = $localize`:@@summary.viewEducationQualificationsActivitie:View education and qualification in`
   labelViewDomain = $localize`:@@summary.viewDomain:View all email domains in`
 
   funds: SimpleActivityModel[] = []

diff --git a/src/app/record/pages/my-orcid/my-orcid.component.ts b/src/app/record/pages/my-orcid/my-orcid.component.ts
@@ -187,7 +187,7 @@ export class MyOrcidComponent implements OnInit, OnDestroy {
               'professional-activities',
               'research-resources',
               'emails-panel',
-              'education-and-qualification'
+              'education-and-qualification',
             ].find((x) => x === this.fragment)
           ) {
             setTimeout(() => {

diff --git a/src/locale/properties/summary/summary.en.properties b/src/locale/properties/summary/summary.en.properties
@@ -54,6 +54,8 @@ summary.moreEmailDomains=more Email Domains
 summary.moreEmailDomain=more Email Domain
 summary.emailDomainsLabel=Email Domains
 summary.viewResearchResources=View all research and resources in
-summary.viewEducationQualificationsActivities=More education qualification activities
-summary.viewEducationQualificationsActivitie=More education qualification activity
+summary.viewEducationQualificationsActivities=View all education and qualifications in
+summary.viewEducationQualificationsActivitie=View education and qualification in
+summary.moreEducationQualifications=more Education and Qualifications
+summary.moreEducationQualification=more Education and Qualification
 summary.viewDomain=View all email domains in
diff --git a/src/locale/properties/summary/summary.lr.properties b/src/locale/properties/summary/summary.lr.properties
@@ -57,3 +57,5 @@ summary.viewResearchResources=LR
 summary.viewEducationQualificationsActivities=LR
 summary.viewEducationQualificationsActivitie=LR
 summary.viewDomain=LR
+summary.moreEducationQualifications=LR
+summary.moreEducationQualification=LR
diff --git a/src/locale/properties/summary/summary.rl.properties b/src/locale/properties/summary/summary.rl.properties
@@ -57,3 +57,5 @@ summary.viewResearchResources=RL
 summary.viewEducationQualificationsActivities=RL
 summary.viewEducationQualificationsActivitie=RL
 summary.viewDomain=RL
+summary.moreEducationQualifications=RL
+summary.moreEducationQualification=RL
diff --git a/src/locale/properties/summary/summary.xx.properties b/src/locale/properties/summary/summary.xx.properties
@@ -57,3 +57,5 @@ summary.viewResearchResources=X
 summary.viewEducationQualificationsActivities=X
 summary.viewEducationQualificationsActivitie=X
 summary.viewDomain=X
+summary.moreEducationQualifications=X
+summary.moreEducationQualification=X