Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Dec 13, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8b04c5
Allow setTitle with nonTranslate, use it in some detail views
reiterl Dec 12, 2024
dc65706
Add nonTranslate true to projector-detail view
reiterl Dec 13, 2024
5441613
Merge branch 'main' into 4416-web-browser-title-and-translate
reiterl Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions client/src/app/site/base/base.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion ...genda/modules/topics/pages/topic-detail/components/topic-detail/topic-detail.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion ...ments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...src/app/site/pages/meetings/pages/autopilot/components/autopilot/autopilot.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h2>{{ 'Autopilot' | translate }}</h2>
[target]="lowerProjectionTarget"
>
<h1>
{{ title | translate }}
{{ title }}
</h1>
</a>
</mat-card-content>
Expand Down
2 changes: 1 addition & 1 deletion ...ons/pages/motion-detail/pages/motion-view/components/motion-view/motion-view.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion ...articipant-detail/components/participant-detail-view/participant-detail-view.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion ...ectors/modules/projector-detail/components/projector-detail/projector-detail.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
})
Expand Down
Loading