diff --git a/dmp-frontend/src/app/ui/about/about.component.ts b/dmp-frontend/src/app/ui/about/about.component.ts index 5d0640053..ff9740a7b 100644 --- a/dmp-frontend/src/app/ui/about/about.component.ts +++ b/dmp-frontend/src/app/ui/about/about.component.ts @@ -1,9 +1,11 @@ import { Component, OnInit } from '@angular/core'; import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'; +import { Router } from '@angular/router'; import { AboutService } from '@app/core/services/about/about.service'; import { LanguageService } from '@app/core/services/language/language.service'; import { MatomoService } from '@app/core/services/matomo/matomo-service'; import { BaseComponent } from '@common/base/base.component'; +import { TranslateService, LangChangeEvent } from '@ngx-translate/core'; import { takeUntil } from 'rxjs/operators'; @Component({ @@ -20,11 +22,16 @@ export class AboutComponent extends BaseComponent implements OnInit { private aboutService: AboutService, private sanitizer: DomSanitizer, private languageService: LanguageService, - private matomoService: MatomoService + private matomoService: MatomoService, + private translate: TranslateService, + private router: Router ) { super(); } ngOnInit() { this.matomoService.trackPageView('About'); + this.translate.onLangChange.subscribe((event: LangChangeEvent) => { + this.router.navigate(['/reload'], { skipLocationChange: true }).then(() => this.router.navigate(['/about'])); + }); this.aboutService.getAbout(this.languageService.getCurrentLanguage()) .pipe(takeUntil(this._destroyed)) .subscribe(response => { diff --git a/dmp-frontend/src/app/ui/faq/faq-content/faq-content.component.ts b/dmp-frontend/src/app/ui/faq/faq-content/faq-content.component.ts index 2fae67a4d..80cce9640 100644 --- a/dmp-frontend/src/app/ui/faq/faq-content/faq-content.component.ts +++ b/dmp-frontend/src/app/ui/faq/faq-content/faq-content.component.ts @@ -26,7 +26,7 @@ export class FaqContentComponent extends BaseComponent implements OnInit { ) { super(); } ngOnInit() { - this.matomoService.trackPageView('Terms of Service'); + this.matomoService.trackPageView('FAQ'); this.faqService.getFaq(this.languageService.getCurrentLanguage()) .pipe(takeUntil(this._destroyed)) .subscribe(response => { diff --git a/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.ts b/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.ts index a5cb277b8..e4deba043 100644 --- a/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.ts +++ b/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.ts @@ -1,9 +1,11 @@ import { Component, OnInit, Input } from '@angular/core'; import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'; +import { Router } from '@angular/router'; import { GlossaryService } from '@app/core/services/glossary/glossary.service'; import { LanguageService } from '@app/core/services/language/language.service'; import { MatomoService } from '@app/core/services/matomo/matomo-service'; import { BaseComponent } from '@common/base/base.component'; +import { LangChangeEvent, TranslateService } from '@ngx-translate/core'; import { takeUntil } from 'rxjs/operators'; @Component({ @@ -22,11 +24,17 @@ export class GlossaryContentComponent extends BaseComponent implements OnInit { private glossaryService: GlossaryService, private sanitizer: DomSanitizer, private languageService: LanguageService, - private matomoService: MatomoService + private matomoService: MatomoService, + private translate: TranslateService, + private router: Router ) { super(); } ngOnInit() { this.matomoService.trackPageView('Glossary'); + this.translate.onLangChange.subscribe((event: LangChangeEvent) => { + this.router.navigate(['/reload'], { skipLocationChange: true }).then(() => this.router.navigate(['/glossary'])); + + }); this.glossaryService.getGlossary(this.languageService.getCurrentLanguage()) .pipe(takeUntil(this._destroyed)) .subscribe(response => { diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.ts index 4a3bddc6a..ee83c5e10 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.ts +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.ts @@ -1,9 +1,11 @@ import { Component, OnInit } from '@angular/core'; import { SafeResourceUrl, DomSanitizer } from '@angular/platform-browser'; +import { Router } from '@angular/router'; import { LanguageService } from '@app/core/services/language/language.service'; import { MatomoService } from '@app/core/services/matomo/matomo-service'; import { TermsOfServiceService } from '@app/core/services/terms-of-service/terms-of-service.service'; import { BaseComponent } from '@common/base/base.component'; +import { TranslateService, LangChangeEvent } from '@ngx-translate/core'; import { takeUntil } from 'rxjs/operators'; @Component({ @@ -20,11 +22,16 @@ export class TermsComponent extends BaseComponent implements OnInit { private termsService: TermsOfServiceService, private sanitizer: DomSanitizer, private languageService: LanguageService, - private matomoService: MatomoService + private matomoService: MatomoService, + private translate: TranslateService, + private router: Router ) { super(); } ngOnInit() { this.matomoService.trackPageView('Terms of Service'); + this.translate.onLangChange.subscribe((event: LangChangeEvent) => { + this.router.navigate(['/reload'], { skipLocationChange: true }).then(() => this.router.navigate(['/terms-and-conditions'])); + }); this.termsService.getTermsOfService(this.languageService.getCurrentLanguage()) .pipe(takeUntil(this._destroyed)) .subscribe(response => { diff --git a/dmp-frontend/src/app/ui/user-guide/user-guide-content/user-guide-content.component.ts b/dmp-frontend/src/app/ui/user-guide/user-guide-content/user-guide-content.component.ts index 0ceef5a72..5555a9f42 100644 --- a/dmp-frontend/src/app/ui/user-guide/user-guide-content/user-guide-content.component.ts +++ b/dmp-frontend/src/app/ui/user-guide/user-guide-content/user-guide-content.component.ts @@ -48,7 +48,7 @@ export class UserGuideContentComponent extends BaseComponent implements OnInit { this.scroll(ev); }); this.translate.onLangChange.subscribe((event: LangChangeEvent) => { - this.router.navigate(['/reload']).then(() => this.router.navigate(['/user-guide'])); + this.router.navigate(['/reload'], { skipLocationChange: true }).then(() => this.router.navigate(['/user-guide'])); }); this.userGuideService.getUserGuide(this.languageService.getCurrentLanguage()) .pipe(takeUntil(this._destroyed))