#929

ec-doris · Aug 12, 2024 · 4d68b11 · 4d68b11
1 parent 30ac737
commit 4d68b11
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/src/app/pages/users/profile/user-profile.component.html b/src/app/pages/users/profile/user-profile.component.html
@@ -80,7 +80,7 @@ <h1 i18n="@@page.users.profile.title">My Profile</h1>
             <kohesio-ecl-form-group>
                 <kohesio-ecl-form-label i18n="@@page.users.profile.label.expiration">EXPIRATION:</kohesio-ecl-form-label>
                 <div class="label-only">
-                    {{userService.user.expiration_time ? userService.user.expiration_time.toLocaleDateString() : 'NEVER'}}
+                    {{userService.user.expiration_time ? userService.user.expiration_time.toLocaleDateString() : this.translateService.userManagement.labels.never}}
                 </div>
             </kohesio-ecl-form-group>
             <kohesio-ecl-form-group>
@@ -92,7 +92,7 @@ <h1 i18n="@@page.users.profile.title">My Profile</h1>
                      *ngIf="userService.user.role != 'ADMIN'">
                     <button type="button" class="ecl-tag ecl-tag--removable" *ngFor="let cci of ccis_list">{{cci}}</button>
                 </div>
-                <div class="label-only" *ngIf="userService.user.role == 'ADMIN'">
+                <div class="label-only" *ngIf="userService.user.role == 'ADMIN'" i18n="@@page.users.label.AllCCIs">
                     All CCIs
                 </div>
             </kohesio-ecl-form-group>

diff --git 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
@@ -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
@@ -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",