Allow setTitle with nonTranslate, use it in some detail views (#4483)

OpenSlides · Dec 13, 2024 · 3b63252 · 3b63252
1 parent 2d8ed92
commit 3b63252
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 9 deletions.
diff --git a/client/src/app/site/base/base.component.ts b/client/src/app/site/base/base.component.ts
@@ -93,9 +93,12 @@ export abstract class BaseComponent extends BaseUiComponent implements OnDestroy
      * Set the title in web browser using angulars TitleService
      * @param prefix The title prefix. Should be translated here.
      */
-    public setTitle(prefix: string): void {
-        const translatedPrefix = this.translate.instant(prefix);
-        this.titleService.setTitle(translatedPrefix + this.titleSuffix);
+    public setTitle(prefix: string, nonTranslate?: boolean): void {
+        let titlePrefix = prefix;
+        if (!nonTranslate) {
+            titlePrefix = this.translate.instant(prefix);
+        }
+        this.titleService.setTitle(titlePrefix + this.titleSuffix);
     }
 
     /**

diff --git a/...genda/modules/topics/pages/topic-detail/components/topic-detail/topic-detail.component.ts b/...genda/modules/topics/pages/topic-detail/components/topic-detail/topic-detail.component.ts
@@ -280,7 +280,7 @@ export class TopicDetailComponent extends BaseMeetingComponent implements OnInit
             // also ensures edition cannot be interrupted by autoupdate
             if (newViewTopic) {
                 const title = newViewTopic.getListTitle();
-                super.setTitle(title);
+                super.setTitle(title, true);
                 this.topic = newViewTopic;
                 // personalInfoForm is undefined during 'new' and directly after reloading
                 if (!this.editTopic) {

diff --git a/...ments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.ts b/...ments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.ts
@@ -200,7 +200,7 @@ export class AssignmentDetailComponent extends BaseMeetingComponent implements O
             this.assignmentRepo.getViewModelObservable(assignmentId).subscribe(assignment => {
                 if (assignment) {
                     const title = assignment.getTitle();
-                    super.setTitle(title);
+                    super.setTitle(title, true);
                     this.assignment = assignment;
                     if (!this.isEditing) {
                         this.patchForm(this.assignment);

diff --git a/...src/app/site/pages/meetings/pages/autopilot/components/autopilot/autopilot.component.html b/...src/app/site/pages/meetings/pages/autopilot/components/autopilot/autopilot.component.html
@@ -36,7 +36,7 @@ <h2>{{ 'Autopilot' | translate }}</h2>
                             [target]="lowerProjectionTarget"
                         >
                             <h1>
-                                {{ title | translate }}
+                                {{ title }}
                             </h1>
                         </a>
                     </mat-card-content>

diff --git a/...ons/pages/motion-detail/pages/motion-view/components/motion-view/motion-view.component.ts b/...ons/pages/motion-detail/pages/motion-view/components/motion-view/motion-view.component.ts
@@ -231,7 +231,7 @@ export class MotionViewComponent extends BaseMeetingComponent implements OnInit,
 
     public onMotionUpdated(motion: ViewMotion): void {
         const title = motion.getTitle();
-        super.setTitle(title);
+        super.setTitle(title, true);
         this.motion = motion;
         this.cd.markForCheck();
     }

diff --git a/...articipant-detail/components/participant-detail-view/participant-detail-view.component.ts b/...articipant-detail/components/participant-detail-view/participant-detail-view.component.ts
@@ -279,7 +279,7 @@ export class ParticipantDetailViewComponent extends BaseMeetingComponent {
             this.repo.getViewModelObservable(this._userId!).subscribe(user => {
                 if (user) {
                     const title = user.getTitle();
-                    super.setTitle(title);
+                    super.setTitle(title, true);
                     this.user = user;
                     this.cd.markForCheck();
                 }

diff --git a/...ectors/modules/projector-detail/components/projector-detail/projector-detail.component.ts b/...ectors/modules/projector-detail/components/projector-detail/projector-detail.component.ts
@@ -349,7 +349,7 @@ export class ProjectorDetailComponent extends BaseMeetingComponent implements On
             this.repo.getViewModelObservable(this._projectorId!).subscribe(projector => {
                 if (projector) {
                     const title = projector.name;
-                    super.setTitle(title);
+                    super.setTitle(title, true);
                     this.projector = projector;
                 }
             })