From 188ff5a728c83a25c50758e160baf18c44bb4220 Mon Sep 17 00:00:00 2001
From: Sebastian Wittek <sebastian.wittek@mni.thm.de>
Date: Sun, 14 Apr 2019 19:06:18 +0200
Subject: [PATCH] change name of field lang in language
---
src/app/components/shared/comment/comment.component.html | 2 +-
src/app/components/shared/comment/comment.component.ts | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/app/components/shared/comment/comment.component.html b/src/app/components/shared/comment/comment.component.html
index 9cd373bc7..39e66912f 100644
--- a/src/app/components/shared/comment/comment.component.html
+++ b/src/app/components/shared/comment/comment.component.html
@@ -3,7 +3,7 @@
<div fxLayout="row">
<span class="fill-remaining-space"></span>
<div id="date">
- <div *ngIf="lang === 'de'; else englishDate">
+ <div *ngIf="language === 'de'; else englishDate">
{{comment.timestamp | date: ' HH:mm:ss '}}Uhr,{{comment.timestamp | date: ' M.d.yy'}}
</div>
<ng-template #englishDate>
diff --git a/src/app/components/shared/comment/comment.component.ts b/src/app/components/shared/comment/comment.component.ts
index 97cf6e09e..b7f91a90c 100644
--- a/src/app/components/shared/comment/comment.component.ts
+++ b/src/app/components/shared/comment/comment.component.ts
@@ -21,7 +21,7 @@ export class CommentComponent implements OnInit {
isStudent = false;
isLoading = true;
hasVoted = 0;
- lang: string;
+ language: string;
constructor(protected authenticationService: AuthenticationService,
private route: ActivatedRoute,
@@ -34,7 +34,7 @@ export class CommentComponent implements OnInit {
private wsCommentService: WsCommentServiceService) {
langService.langEmitter.subscribe(lang => {
translateService.use(lang);
- this.lang = lang;
+ this.language = lang;
} );
}
@@ -42,8 +42,8 @@ export class CommentComponent implements OnInit {
if (this.authenticationService.getRole() === 0) {
this.isStudent = true;
}
- this.lang = localStorage.getItem('currentLang');
- this.translateService.use(this.lang);
+ this.language = localStorage.getItem('currentLang');
+ this.translateService.use(this.language);
}
setRead(comment: Comment): void {
--
GitLab