diff --git a/src/app/components/shared/comment/comment.component.html b/src/app/components/shared/comment/comment.component.html
index 1f831bacaecb5e7e9289f03c4bc754cbedea4195..813caab709825873bd4b70dcc55e97a09933aaec 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 36fbd582fe3fe8fae5f332d26a1e767c1178e665..97cf6e09e07fb8e62d7eeb64d273064041d51962 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 {