diff --git a/src/app/features/tasks/task-list/task-list.component.html b/src/app/features/tasks/task-list/task-list.component.html index 3f982d3f98..dd7bc46f22 100644 --- a/src/app/features/tasks/task-list/task-list.component.html +++ b/src/app/features/tasks/task-list/task-list.component.html @@ -8,11 +8,15 @@ class="expand-tasks-btn" mat-button > - - + {{ isHideDone() ? doneTasksLength() + ' done ' : allTasksLength() }} sub - tasks + + @if (isHideDone()) { + {{ + T.F.TASK.CMP.SHOW_HIDDEN_DONE_SUB_TASKS | translate: { nr: doneTasksLength() } + }} + } @else { + {{ T.F.TASK.CMP.SHOW_HIDDEN_SUB_TASKS | translate: { nr: allTasksLength() } }} + } + expand_more diff --git a/src/app/features/tasks/task-list/task-list.component.ts b/src/app/features/tasks/task-list/task-list.component.ts index 89080d2e70..847578b69e 100644 --- a/src/app/features/tasks/task-list/task-list.component.ts +++ b/src/app/features/tasks/task-list/task-list.component.ts @@ -39,6 +39,7 @@ import { MatButton } from '@angular/material/button'; import { MatIcon } from '@angular/material/icon'; import { TaskComponent } from '../task/task.component'; import { AsyncPipe } from '@angular/common'; +import { TranslatePipe } from '@ngx-translate/core'; import { TaskViewCustomizerService } from '../../task-view-customizer/task-view-customizer.service'; import { TaskLog } from '../../../core/log'; import { ScheduleExternalDragService } from '../../schedule/schedule-week/schedule-external-drag.service'; @@ -91,6 +92,7 @@ export interface DropModelDataForList { CdkDropList, CdkDrag, AsyncPipe, + TranslatePipe, forwardRef(() => TaskComponent), ], }) diff --git a/src/app/t.const.ts b/src/app/t.const.ts index 073d80ec64..0557540990 100644 --- a/src/app/t.const.ts +++ b/src/app/t.const.ts @@ -1673,6 +1673,8 @@ const T = { REMOVE_FROM_MY_DAY: 'F.TASK.CMP.REMOVE_FROM_MY_DAY', SCHEDULE: 'F.TASK.CMP.SCHEDULE', SET_DEADLINE: 'F.TASK.CMP.SET_DEADLINE', + SHOW_HIDDEN_DONE_SUB_TASKS: 'F.TASK.CMP.SHOW_HIDDEN_DONE_SUB_TASKS', + SHOW_HIDDEN_SUB_TASKS: 'F.TASK.CMP.SHOW_HIDDEN_SUB_TASKS', TIME_CONFLICT: 'F.TASK.CMP.TIME_CONFLICT', TOGGLE_ATTACHMENTS: 'F.TASK.CMP.TOGGLE_ATTACHMENTS', TOGGLE_DETAIL_PANEL: 'F.TASK.CMP.TOGGLE_DETAIL_PANEL', diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index cf3674837c..c42dc95e62 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1635,6 +1635,8 @@ "REMOVE_FROM_MY_DAY": "Remove from Today", "SCHEDULE": "Schedule task", "SET_DEADLINE": "Set deadline", + "SHOW_HIDDEN_DONE_SUB_TASKS": "+ {{nr}} done subtasks", + "SHOW_HIDDEN_SUB_TASKS": "+ {{nr}} subtasks", "TIME_CONFLICT": "Overlaps with another scheduled task", "TOGGLE_ATTACHMENTS": "Show/hide attachments", "TOGGLE_DETAIL_PANEL": "Show/hide task panel",