Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Merge branch 'VM/RED-9585' into 'master'

Browse Source 
RED-9585 - Incorrect capitalization in German translation + missing singular/plural distinction

Closes RED-9585

See merge request redactmanager/red-ui!626
This commit is contained in:
Dan Percic 2024-10-17 14:01:31 +02:00
commit bb3f59f1bb
7 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/admin/components/users-stats/users-stats.component.html
View File

@ -23,7 +23,7 @@
<div class="mt-44">
<redaction-donut-chart
[config]="chartConfig"
[config]="chartConfig()"
[radius]="63"
[strokeWidth]="15"
[subtitles]="['user-stats.chart.users' | translate]"

6
apps/red-ui/src/app/modules/admin/components/users-stats/users-stats.component.ts
View File

@ -1,4 +1,4 @@
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { Component, EventEmitter, input, Input, output, Output } from '@angular/core';
import { DonutChartConfig } from '@red/domain';
import { CircleButtonComponent } from '@iqser/common-ui';
import { TranslateModule } from '@ngx-translate/core';
@ -12,6 +12,6 @@ import { DonutChartComponent } from '@shared/components/donut-chart/donut-chart.
imports: [CircleButtonComponent, TranslateModule, DonutChartComponent],
})
export class UsersStatsComponent {
@Output() toggleCollapse = new EventEmitter();
@Input() chartConfig: DonutChartConfig[];
readonly chartConfig = input.required<DonutChartConfig[]>();
readonly toggleCollapse = output();
}

2
apps/red-ui/src/app/services/translate-chart.service.ts
View File

@ -57,7 +57,7 @@ export class TranslateChartService {
translateRoles(config: DonutChartConfig[]): DonutChartConfig[] {
return config.map(val => ({
...val,
label: this._translateService.instant(rolesTranslations[val.label]).toLowerCase(),
label: this._translateService.instant(rolesTranslations[val.label], { length: val.value }),
}));
}
}

8
apps/red-ui/src/assets/i18n/redact/de.json
View File

@ -2316,13 +2316,13 @@
},
"roles": {
"inactive": "Inaktiv",
"manager-admin": "Manager & Admin",
"manager-admin": "Manager & {length, plural, one{Admin} other{Admins}}",
"no-role": "Keine Rolle definiert",
"red-admin": "Anwendungsadmin",
"red-admin": "{length, plural, one{Anwendungsadmin} other{Anwendungsadmins}}",
"red-manager": "Manager",
"red-user": "Benutzer",
"red-user-admin": "Benutzeradmin",
"regular": "regulärer Benutzer"
"red-user-admin": "{length, plural, one{Benutzeradmin} other{Benutzeradmins}}",
"regular": "{length, plural, one{regulärer} other{reguläre}} Benutzer"
},
"search": {
"active-dossiers": "Dokumente in aktiven Dossiers",

10
apps/red-ui/src/assets/i18n/redact/en.json
View File

@ -2359,12 +2359,12 @@
},
"roles": {
"inactive": "Inactive",
"manager-admin": "Manager & admin",
"manager-admin": "Manager & {length, plural, one{Admin} other{Admins}}",
"no-role": "No role defined",
"red-admin": "Application admin",
"red-manager": "Manager",
"red-user": "User",
"red-user-admin": "Users admin",
"red-admin": "Application {length, plural, one{admin} other{admins}}",
"red-manager": "{length, plural, one{Manager} other{Managers}}",
"red-user": "{length, plural, one{User} other{Users}}",
"red-user-admin": "{length, plural, one{User} other{Users}} admin",
"regular": "Regular"
},
"search-screen": {

8
apps/red-ui/src/assets/i18n/scm/de.json
View File

@ -2316,13 +2316,13 @@
},
"roles": {
"inactive": "Inaktiv",
"manager-admin": "Manager & admin",
"manager-admin": "Manager & {length, plural, one{Admin} other{Admins}}",
"no-role": "Keine Rolle definiert",
"red-admin": "Anwendungsadministrator",
"red-admin": "{length, plural, one{Anwendungsadmin} other{Anwendungsadmins}}",
"red-manager": "Manager",
"red-user": "Benutzer",
"red-user-admin": "Benutzer-Admin",
"regular": "Regulär"
"red-user-admin": "{length, plural, one{Benutzeradmin} other{Benutzeradmins}}",
"regular": "{length, plural, one{regulärer} other{reguläre}} Benutzer"
},
"search": {
"active-dossiers": "ganze Plattform",

10
apps/red-ui/src/assets/i18n/scm/en.json
View File

@ -2359,12 +2359,12 @@
},
"roles": {
"inactive": "Inactive",
"manager-admin": "Manager & admin",
"manager-admin": "Manager & {length, plural, one{Admin} other{Admins}}",
"no-role": "No role defined",
"red-admin": "Application admin",
"red-manager": "Manager",
"red-user": "User",
"red-user-admin": "Users admin",
"red-admin": "Application {length, plural, one{admin} other{admins}}",
"red-manager": "{length, plural, one{Manager} other{Managers}}",
"red-user": "{length, plural, one{User} other{Users}}",
"red-user-admin": "{length, plural, one{User} other{Users}} admin",
"regular": "Regular"
},
"search-screen": {