From 14bf6932ec35c4cc2f18c7927888aa81bfeb9756 Mon Sep 17 00:00:00 2001 From: bakhirev Date: Fri, 13 Oct 2023 15:52:08 +0300 Subject: [PATCH] JIRA-1234 feat(lang): test test test --- src/ts/config/translations/ru.ts | 17 ++++++------ src/ts/pages/Team/components/Week.tsx | 39 ++++++++++++++++----------- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/src/ts/config/translations/ru.ts b/src/ts/config/translations/ru.ts index dc48c7a..393c48e 100644 --- a/src/ts/config/translations/ru.ts +++ b/src/ts/config/translations/ru.ts @@ -111,20 +111,19 @@ localization.parse('ru', ` § page.team.tree.line: строк § page.team.tree.lineAdd: добавили § page.team.tree.lineRemove: изменили -§ page.team.week.commits: коммитов -§ page.team.week.tasks: задач -§ page.team.week.add: добавили -§ page.team.week.change: изменили -§ page.team.week.remove: удалили -§ page.team.week.worked: работа -§ page.team.week.losses: дни без коммитов -§ page.team.week.days: дней § page.team.week.date: Дата § page.team.week.numberTasks: Количество задач § page.team.week.people: Количество человек -§ page.team.week.files: Изменения файлов +§ page.team.week.line: Изменение строк § page.team.week.days: Дни с коммитами и без § page.team.week.lossesDetails: Кто не коммитил +§ page.team.week.add: добавили +§ page.team.week.change: изменили +§ page.team.week.remove: удалили +§ page.team.week.hasCommits: были коммиты +§ page.team.week.hasNotCommits: небыло коммитов +§ page.team.week.days: дней +§ page.team.week.tasks: задач § page.person.total.title: Основные характеристики § page.person.total.daysWorked.title: дней работы § page.person.total.daysWorked.description: Учтены только дни, в которые делались коммиты diff --git a/src/ts/pages/Team/components/Week.tsx b/src/ts/pages/Team/components/Week.tsx index f651e48..3baa037 100644 --- a/src/ts/pages/Team/components/Week.tsx +++ b/src/ts/pages/Team/components/Week.tsx @@ -30,11 +30,18 @@ interface IWeekViewProps { function WeekView({ response, updateSort }: IWeekViewProps) { if (!response) return null; - const tasksChart = getOptions({ max: getMax(response, 'tasks'), order: dataGripStore.dataGrip.type.list }); - const authorsChart = getOptions({ max: getMax(response, 'authorsLength'), order: dataGripStore.dataGrip.author.list, suffix: 'задач' }); - const changesChart = getOptions({ max: getMax(response, 'changesLength'), order: ['добавили', 'изменили', 'удалили'], suffix: 'строк' }); - const workDaysTotalChart = getOptions({ order: ['были коммиты', 'небыло коммитов'], suffix: 'дней' }); - const workDaysChart = getOptions({ order: dataGripStore.dataGrip.author.list, suffix: 'дней' }); + const tasksChart = getOptions({ max: getMax(response, 'tasks'), order: dataGripStore.dataGrip.type.list, suffix: 'page.team.week.tasks' }); + const authorsChart = getOptions({ max: getMax(response, 'authorsLength'), order: dataGripStore.dataGrip.author.list, suffix: 'page.team.week.tasks' }); + const changesChart = getOptions({ max: getMax(response, 'changesLength'), order: [ + 'page.team.week.add', + 'page.team.week.change', + 'page.team.week.remove', + ], suffix: 'строк' }); + const workDaysTotalChart = getOptions({ order: [ + 'page.team.week.hasCommits', + 'page.team.week.hasNotCommits', + ], suffix: 'page.team.week.days' }); + const workDaysChart = getOptions({ order: dataGripStore.dataGrip.author.list, suffix: 'page.team.week.days' }); return ( ( ( ( )} @@ -108,20 +115,20 @@ function WeekView({ response, updateSort }: IWeekViewProps) { /> ( )} minWidth={200} /> ) => (