diff --git a/src/app/pages/users/profile/user-profile.component.html b/src/app/pages/users/profile/user-profile.component.html index 5aee9cda..7b771259 100644 --- a/src/app/pages/users/profile/user-profile.component.html +++ b/src/app/pages/users/profile/user-profile.component.html @@ -80,7 +80,7 @@

My Profile

EXPIRATION:
- {{userService.user.expiration_time ? userService.user.expiration_time.toLocaleDateString() : 'NEVER'}} + {{userService.user.expiration_time ? userService.user.expiration_time.toLocaleDateString() : this.translateService.userManagement.labels.never}}
@@ -92,7 +92,7 @@

My Profile

*ngIf="userService.user.role != 'ADMIN'"> -
+
All CCIs
diff --git a/src/app/pages/users/profile/user-profile.component.ts b/src/app/pages/users/profile/user-profile.component.ts index 57272378..19da357d 100644 --- a/src/app/pages/users/profile/user-profile.component.ts +++ b/src/app/pages/users/profile/user-profile.component.ts @@ -28,7 +28,7 @@ export class UserProfileComponent implements AfterViewInit { constructor(public userService: UserService, private filterService: FilterService, - private translateService: TranslateService, + public translateService: TranslateService, private formBuilder: UntypedFormBuilder, public dialog: MatDialog, private router: Router, diff --git a/src/app/services/translate.service.ts b/src/app/services/translate.service.ts index eee276bc..752b7c6b 100644 --- a/src/app/services/translate.service.ts +++ b/src/app/services/translate.service.ts @@ -129,7 +129,9 @@ export class TranslateService { "dialogTitleEditUser": $localize `:@@page.users.label.dialogTitleEditUser:Edit user`, "dialogTitleInviteUser": $localize `:@@page.users.label.dialogTitleInviteUser:Invite user`, "activeYES": $localize `:@@page.users.label.activeYES:YES`, - "activeNO": $localize `:@@page.users.label.activeNO:NO` + "activeNO": $localize `:@@page.users.label.activeNO:NO`, + "never": $localize `:@@page.users.label.never:Never`, + 'AllCCIs': $localize `:@@page.users.label.AllCCIs:All CCIs`, }, buttons:{ "actionSave": $localize `:@@page.users.button.action.save:Save`, diff --git a/src/locale/messages.json b/src/locale/messages.json index e61275d1..d2c726bf 100644 --- a/src/locale/messages.json +++ b/src/locale/messages.json @@ -238,6 +238,9 @@ "page.notifications.dashboard.label.user": "User", "page.notifications.dashboard.label.actions": "Actions", "page.notifications.dashboard.button.markAsread": "Mark as Read", + "page.notifications.dashboard.filter.read": "Read", + "page.notifications.dashboard.filter.unread": "Unread", + "page.notifications.dashboard.filter.all": "All", "page.project-detail.breadcrumb.projects": "Projects", "page.project-detail.breadcrumb.projectDetails": "Project Details", "page.project-detail.button.open": "Open", @@ -443,6 +446,8 @@ "page.users.label.dialogTitleInviteUser": "Invite user", "page.users.label.activeYES": "YES", "page.users.label.activeNO": "NO", + "page.users.label.never": "never", + "page.users.label.AllCCIs": "All CCI's", "page.users.button.action.save": "Save", "page.users.button.action.cancel": "Cancel", "page.users.button.action.sendInvitation": "Send invitation",