From bada75dd829951d41b8a57403d6111b843fa6e82 Mon Sep 17 00:00:00 2001
From: Sebastian Wittek <sebastian.wittek@mni.thm.de>
Date: Thu, 11 Apr 2019 14:30:19 +0200
Subject: [PATCH] switch between english and german date by event
---
.../components/shared/comment/comment.component.html | 9 +++++++--
src/app/components/shared/comment/comment.component.ts | 10 ++++++++--
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/app/components/shared/comment/comment.component.html b/src/app/components/shared/comment/comment.component.html
index 1f831baca..813caab70 100644
--- a/src/app/components/shared/comment/comment.component.html
+++ b/src/app/components/shared/comment/comment.component.html
@@ -26,9 +26,14 @@
</div>
</div>
<div id="footer">
- <div id="date">
- {{comment.timestamp}}
+ <div *ngIf="lang === 'de'; else englishDate">
+ {{comment.timestamp | date: ' HH:mm:ss '}}Uhr,{{comment.timestamp | date: ' M.d.yy'}}
</div>
+ <ng-template #englishDate>
+ {{comment.timestamp | date: 'h:mm:ss a, M/d/yy'}}
+ </ng-template>
+
+
<div id="counter">
</div>
</div>
diff --git a/src/app/components/shared/comment/comment.component.ts b/src/app/components/shared/comment/comment.component.ts
index 36fbd582f..97cf6e09e 100644
--- a/src/app/components/shared/comment/comment.component.ts
+++ b/src/app/components/shared/comment/comment.component.ts
@@ -21,6 +21,7 @@ export class CommentComponent implements OnInit {
isStudent = false;
isLoading = true;
hasVoted = 0;
+ lang: string;
constructor(protected authenticationService: AuthenticationService,
private route: ActivatedRoute,
@@ -31,13 +32,18 @@ export class CommentComponent implements OnInit {
public dialog: MatDialog,
protected langService: LanguageService,
private wsCommentService: WsCommentServiceService) {
- langService.langEmitter.subscribe(lang => translateService.use(lang)); }
+ langService.langEmitter.subscribe(lang => {
+ translateService.use(lang);
+ this.lang = lang;
+ } );
+ }
ngOnInit() {
if (this.authenticationService.getRole() === 0) {
this.isStudent = true;
}
- this.translateService.use(localStorage.getItem('currentLang'));
+ this.lang = localStorage.getItem('currentLang');
+ this.translateService.use(this.lang);
}
setRead(comment: Comment): void {
--
GitLab