fix: move translateService.currentLang assignment to the component

pcg-kk · pcg-kk · commit 6f1af9a59a6f · 2025-03-06T21:15:51.000+01:00
diff --git a/src/app/community-list-page/community-list/community-list.component.html b/src/app/community-list-page/community-list/community-list.component.html
@@ -46,7 +46,7 @@
     </div>
     <ds-truncatable [id]="node.id">
       <div class="text-muted" cdkTreeNodePadding>
-        <div class="d-flex" *ngIf="node.payload.shortDescription(translateService.currentLang) as shorDescription">
+        <div class="d-flex" *ngIf="node.payload.shortDescription(currentLanguage) as shorDescription">
           <span aria-hidden="true" class="btn btn-default invisible">
             <span class="fa fa-chevron-right"></span>
           </span>
@@ -77,12 +77,12 @@ <h6 class="align-middle my-auto">
     </div>
     <ds-truncatable [id]="node.id">
       <div class="text-muted" cdkTreeNodePadding>
-        <div class="d-flex" *ngIf="node.payload.shortDescription(translateService.currentLang)">
+        <div class="d-flex" *ngIf="node.payload.shortDescription(currentLanguage) as shortDescription">
           <span aria-hidden="true" class="btn btn-default invisible">
             <span class="fa fa-chevron-right"></span>
           </span>
           <ds-truncatable-part [id]="node.id" [minLines]="3">
-            <span>{{node.payload.shortDescription(translateService.currentLang)}}</span>
+            <span>{{shortDescription}}</span>
           </ds-truncatable-part>
         </div>
       </div>
diff --git a/src/app/community-list-page/community-list/community-list.component.ts b/src/app/community-list-page/community-list/community-list.component.ts
@@ -4,7 +4,6 @@ import {
 } from '@angular/cdk/tree';
 import {
   AsyncPipe,
-  NgClass,
   NgIf,
 } from '@angular/common';
 import {
@@ -19,6 +18,7 @@ import {
 } from '@ngx-translate/core';
 import { take } from 'rxjs/operators';
 
+import { environment } from '../../../environments/environment';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import {
   SortDirection,
@@ -45,10 +45,15 @@ import { FlatNode } from '../flat-node.model';
   templateUrl: './community-list.component.html',
   styleUrls: ['./community-list.component.scss'],
   standalone: true,
-  imports: [NgIf, ThemedLoadingComponent, CdkTreeModule, NgClass, RouterLink, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [NgIf, ThemedLoadingComponent, CdkTreeModule, RouterLink, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 export class CommunityListComponent implements OnInit, OnDestroy {
 
+  /**
+   * The current language of the page
+   */
+  currentLanguage: string = environment.defaultLanguage;
+
   private expandedNodes: FlatNode[] = [];
   public loadingNode: FlatNode;
 
@@ -68,6 +73,8 @@ export class CommunityListComponent implements OnInit, OnDestroy {
     this.paginationConfig.elementsPerPage = 2;
     this.paginationConfig.currentPage = 1;
     this.paginationConfig.sort = new SortOptions('dc.title', SortDirection.ASC);
+
+    this.currentLanguage = translateService.currentLang;
   }
 
   ngOnInit() {
diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html
@@ -9,7 +9,7 @@
   </span>
   <div class="card-body">
     <h4 class="card-title">{{ dsoNameService.getName(object) }}</h4>
-    <p *ngIf="object.shortDescription(translateService.currentLang) as shortDescription" class="card-text">{{shortDescription}}</p>
+    <p *ngIf="object.shortDescription(currentLanguage) as shortDescription" class="card-text">{{shortDescription}}</p>
     <div *ngIf="linkType !== linkTypes.None" class="text-center">
       <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', object.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
     </div>
diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
@@ -12,6 +12,7 @@ import {
   TranslateService,
 } from '@ngx-translate/core';
 
+import { environment } from '../../../../environments/environment';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../core/cache/builders/link.service';
 import { Collection } from '../../../core/shared/collection.model';
@@ -39,6 +40,12 @@ import { followLink } from '../../utils/follow-link-config.model';
 export class CollectionGridElementComponent extends AbstractListableElementComponent<
   Collection
 > {
+
+  /**
+   * The current language of the page
+   */
+  currentLanguage: string = environment.defaultLanguage;
+
   private _object: Collection;
 
   constructor(
@@ -47,6 +54,8 @@ export class CollectionGridElementComponent extends AbstractListableElementCompo
     public translateService: TranslateService,
   ) {
     super(dsoNameService);
+
+    this.currentLanguage = translateService.currentLang;
   }
 
   // @ts-ignore
diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html
@@ -9,7 +9,7 @@
   </span>
   <div class="card-body">
     <h4 class="card-title">{{ dsoNameService.getName(object) }}</h4>
-    <p *ngIf="object.shortDescription(translateService.currentLang) as shortDescription" class="card-text">{{shortDescription}}</p>
+    <p *ngIf="object.shortDescription(currentLanguage) as shortDescription" class="card-text">{{shortDescription}}</p>
     <div *ngIf="linkType !== linkTypes.None" class="text-center">
       <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', object.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
     </div>
diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
@@ -12,6 +12,7 @@ import {
   TranslateService,
 } from '@ngx-translate/core';
 
+import { environment } from '../../../../environments/environment';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../core/cache/builders/link.service';
 import { Community } from '../../../core/shared/community.model';
@@ -38,6 +39,12 @@ import { followLink } from '../../utils/follow-link-config.model';
 
 @listableObjectComponent(Community, ViewMode.GridElement)
 export class CommunityGridElementComponent extends AbstractListableElementComponent<Community> {
+
+  /**
+   * The current language of the page
+   */
+  currentLanguage: string = environment.defaultLanguage;
+
   private _object: Community;
 
   constructor(
@@ -46,6 +53,8 @@ export class CommunityGridElementComponent extends AbstractListableElementCompon
     public translateService: TranslateService,
   ) {
     super(dsoNameService);
+
+    this.currentLanguage = translateService.currentLang;
   }
 
   // @ts-ignore
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
@@ -10,7 +10,7 @@
   <div class="card-body">
     <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
     <h4 class="card-title">{{ dsoNameService.getName(dso) }}</h4>
-    <p *ngIf="dso.shortDescription(translateService.currentLang) as shortDescription" class="card-text">{{shortDescription}}</p>
+    <p *ngIf="dso.shortDescription(currentLanguage) as shortDescription" class="card-text">{{shortDescription}}</p>
     <div *ngIf="linkType !== linkTypes.None" class="text-center">
       <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/',  dso.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
     </div>
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
@@ -12,6 +12,7 @@ import {
   TranslateService,
 } from '@ngx-translate/core';
 
+import { environment } from '../../../../../environments/environment';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../../core/cache/builders/link.service';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
@@ -43,6 +44,11 @@ import { SearchResultGridElementComponent } from '../search-result-grid-element.
 export class CollectionSearchResultGridElementComponent extends SearchResultGridElementComponent< CollectionSearchResult, Collection > {
   private _dso: Collection;
 
+  /**
+   * The current language of the page
+   */
+  currentLanguage: string = environment.defaultLanguage;
+
   constructor(
     public dsoNameService: DSONameService,
     public translateService: TranslateService,
@@ -51,6 +57,8 @@ export class CollectionSearchResultGridElementComponent extends SearchResultGrid
     protected bitstreamDataService: BitstreamDataService,
   ) {
     super(dsoNameService, truncatableService, bitstreamDataService);
+
+    this.currentLanguage = translateService.currentLang;
   }
 
   // @ts-ignore
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
@@ -10,7 +10,7 @@
     <div class="card-body">
         <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
         <h4 class="card-title">{{ dsoNameService.getName(dso) }}</h4>
-        <p *ngIf="dso.shortDescription(translateService.currentLang) as shortDescription" class="card-text">{{shortDescription}}</p>
+        <p *ngIf="dso.shortDescription(currentLanguage) as shortDescription" class="card-text">{{shortDescription}}</p>
         <div *ngIf="linkType !== linkTypes.None" class="text-center">
             <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', dso.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
         </div>
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
@@ -12,6 +12,7 @@ import {
   TranslateService,
 } from '@ngx-translate/core';
 
+import { environment } from '../../../../../environments/environment';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../../core/cache/builders/link.service';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
@@ -44,6 +45,12 @@ import { SearchResultGridElementComponent } from '../search-result-grid-element.
  */
 @listableObjectComponent(CommunitySearchResult, ViewMode.GridElement)
 export class CommunitySearchResultGridElementComponent extends SearchResultGridElementComponent<CommunitySearchResult,Community> {
+
+  /**
+   * The current language of the page
+   */
+  currentLanguage: string = environment.defaultLanguage;
+
   private _dso: Community;
 
   constructor(
@@ -54,6 +61,8 @@ export class CommunitySearchResultGridElementComponent extends SearchResultGridE
     protected bitstreamDataService: BitstreamDataService,
   ) {
     super(dsoNameService, truncatableService, bitstreamDataService);
+
+    this.currentLanguage = translateService.currentLang;
   }
 
   // @ts-ignore
diff --git a/src/app/shared/object-list/collection-list-element/collection-list-element.component.html b/src/app/shared/object-list/collection-list-element/collection-list-element.component.html
@@ -8,6 +8,6 @@
   <span class="pr-2">&nbsp;</span>
   <span *ngIf="object.archivedItemsCount >= 0" class="badge badge-pill badge-secondary align-self-center archived-items-lead">{{object.archivedItemsCount}}</span>
 </div>
-<div *ngIf="object.shortDescription(translateService.currentLang) as shortDescription" class="text-muted abstract-text">
+<div *ngIf="object.shortDescription(currentLanguage) as shortDescription" class="text-muted abstract-text">
     {{shortDescription}}
 </div>
diff --git a/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts b/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
@@ -3,6 +3,7 @@ import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 
+import { environment } from '../../../../environments/environment';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { Collection } from '../../../core/shared/collection.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
@@ -21,10 +22,18 @@ import { AbstractListableElementComponent } from '../../object-collection/shared
  */
 @listableObjectComponent(Collection, ViewMode.ListElement)
 export class CollectionListElementComponent extends AbstractListableElementComponent<Collection> {
+
+  /**
+   * The current language of the page
+   */
+  currentLanguage: string = environment.defaultLanguage;
+
   constructor(
     public dsoNameService: DSONameService,
     public translateService: TranslateService,
   ) {
     super(dsoNameService);
+
+    this.currentLanguage = translateService.currentLang;
   }
 }
diff --git a/src/app/shared/object-list/community-list-element/community-list-element.component.html b/src/app/shared/object-list/community-list-element/community-list-element.component.html
@@ -8,6 +8,6 @@
   <span class="pr-2">&nbsp;</span>
   <span *ngIf="object.archivedItemsCount >= 0" class="badge badge-pill badge-secondary align-self-center archived-items-lead">{{object.archivedItemsCount}}</span>
 </div>
-<div *ngIf="object.shortDescription(translateService.currentLang) as shorDescription" class="text-muted abstract-text">
+<div *ngIf="object.shortDescription(currentLanguage) as shorDescription" class="text-muted abstract-text">
     {{shorDescription}}
 </div>
diff --git a/src/app/shared/object-list/community-list-element/community-list-element.component.ts b/src/app/shared/object-list/community-list-element/community-list-element.component.ts
@@ -3,6 +3,7 @@ import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 
+import { environment } from '../../../../environments/environment';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { Community } from '../../../core/shared/community.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
@@ -22,11 +23,18 @@ import { AbstractListableElementComponent } from '../../object-collection/shared
 @listableObjectComponent(Community, ViewMode.ListElement)
 export class CommunityListElementComponent extends AbstractListableElementComponent<Community> {
 
+  /**
+   * The current language of the page
+   */
+  currentLanguage: string = environment.defaultLanguage;
+
   constructor(
     public dsoNameService: DSONameService,
     public translateService: TranslateService,
   ) {
     super(dsoNameService);
+
+    this.currentLanguage = translateService.currentLang;
   }
 
 }
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
@@ -4,6 +4,6 @@
     <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
     <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
     <span *ngIf="linkType === linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
-    <div *ngIf="dso.shortDescription(translateService.currentLang)" class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
+    <div *ngIf="dso.shortDescription(currentLanguage)" class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
   </div>
 </div>
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
@@ -14,6 +14,7 @@ import {
   APP_CONFIG,
   AppConfig,
 } from '../../../../../config/app-config.interface';
+import { environment } from '../../../../../environments/environment';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { Collection } from '../../../../core/shared/collection.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
@@ -41,11 +42,18 @@ export class CollectionSearchResultListElementComponent extends SearchResultList
    */
   showThumbnails: boolean;
 
+  /**
+   * The current language of the page
+   */
+  currentLanguage: string = environment.defaultLanguage;
+
   constructor(protected truncatableService: TruncatableService,
               public dsoNameService: DSONameService,
               public translateService: TranslateService,
               @Inject(APP_CONFIG) protected appConfig?: AppConfig) {
     super(truncatableService, dsoNameService, appConfig);
+
+    this.currentLanguage = translateService.currentLang;
   }
 
   ngOnInit(): void {
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
@@ -4,6 +4,6 @@
     <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
     <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"  [routerLink]="['/communities/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
     <span *ngIf="linkType === linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
-    <div *ngIf="dso.shortDescription(translateService.currentLang)" class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
+    <div *ngIf="dso.shortDescription(currentLanguage)" class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
   </div>
 </div>
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
@@ -14,6 +14,7 @@ import {
   APP_CONFIG,
   AppConfig,
 } from '../../../../../config/app-config.interface';
+import { environment } from '../../../../../environments/environment';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { Community } from '../../../../core/shared/community.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
@@ -40,12 +41,19 @@ export class CommunitySearchResultListElementComponent extends SearchResultListE
    */
   showThumbnails: boolean;
 
+  /**
+   * The current language of the page
+   */
+  currentLanguage: string = environment.defaultLanguage;
+
   constructor(protected truncatableService: TruncatableService,
               public dsoNameService: DSONameService,
               public translateService: TranslateService,
               @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(truncatableService, dsoNameService, appConfig);
+
+    this.currentLanguage = translateService.currentLang;
   }
 
   ngOnInit(): void {
