diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.html b/dmp-frontend/src/app/ui/navbar/navbar.component.html
index a16ca4119..de9b6212b 100644
--- a/dmp-frontend/src/app/ui/navbar/navbar.component.html
+++ b/dmp-frontend/src/app/ui/navbar/navbar.component.html
@@ -37,13 +37,19 @@
-->
-
@@ -79,7 +85,7 @@
-
+
diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.scss b/dmp-frontend/src/app/ui/navbar/navbar.component.scss
index 72ab45098..9fb9eef3f 100644
--- a/dmp-frontend/src/app/ui/navbar/navbar.component.scss
+++ b/dmp-frontend/src/app/ui/navbar/navbar.component.scss
@@ -20,3 +20,13 @@ $mat-card-header-size: 40px !default;
z-index: 1000;
height: 70px;
}
+
+::ng-deep.lang-menu {
+ border-color: transparent;
+ padding: 8px;
+}
+
+::ng-deep.lang-button {
+ padding-top: 15px;
+ padding-bottom: 15px;
+}
diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.ts b/dmp-frontend/src/app/ui/navbar/navbar.component.ts
index 7155ca41d..511bc566f 100644
--- a/dmp-frontend/src/app/ui/navbar/navbar.component.ts
+++ b/dmp-frontend/src/app/ui/navbar/navbar.component.ts
@@ -166,6 +166,15 @@ export class NavbarComponent extends BaseComponent implements OnInit {
return 'Dashboard';
}
+ public getCurrentLanguage(): any {
+ const lang = this.languages.find(lang => lang.value === this.languageService.getCurrentLanguage());
+ return lang;
+ }
+
+ public getPrincipalName(): string {
+ return this.authentication.current().name;
+ }
+
public principalHasAvatar(): boolean {
return this.authentication.current().avatarUrl != null && this.authentication.current().avatarUrl.length > 0;
}
@@ -207,7 +216,7 @@ export class NavbarComponent extends BaseComponent implements OnInit {
if (this.isAuthenticated()) {
const langMap = new Map();
langMap.set('language', selectedLanguage.value);
- this.userService.updateUserSettings({language: selectedLanguage})
+ this.userService.updateUserSettings({language: this.languages.find(lang => lang.value === selectedLanguage.value)})
.pipe(takeUntil(this._destroyed))
.subscribe((response) => {
this.languageService.changeLanguage(selectedLanguage.value);