From d04f1b7b0b37a7625dd7a3d92a3ae7ca32a6b643 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Wed, 23 Oct 2024 22:25:10 +0300 Subject: [PATCH] RED-9585 - Incorrect capitalization in German translation + missing singular/plural distinction --- .../components/users-stats/users-stats.component.html | 2 +- .../components/users-stats/users-stats.component.ts | 6 +++--- .../red-ui/src/app/services/translate-chart.service.ts | 2 +- apps/red-ui/src/assets/i18n/redact/de.json | 8 ++++---- apps/red-ui/src/assets/i18n/redact/en.json | 10 +++++----- apps/red-ui/src/assets/i18n/scm/de.json | 8 ++++---- apps/red-ui/src/assets/i18n/scm/en.json | 10 +++++----- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/components/users-stats/users-stats.component.html b/apps/red-ui/src/app/modules/admin/components/users-stats/users-stats.component.html index e71a59228..8de639b0a 100644 --- a/apps/red-ui/src/app/modules/admin/components/users-stats/users-stats.component.html +++ b/apps/red-ui/src/app/modules/admin/components/users-stats/users-stats.component.html @@ -23,7 +23,7 @@
(); + readonly toggleCollapse = output(); } diff --git a/apps/red-ui/src/app/services/translate-chart.service.ts b/apps/red-ui/src/app/services/translate-chart.service.ts index 4303c7f26..e55304910 100644 --- a/apps/red-ui/src/app/services/translate-chart.service.ts +++ b/apps/red-ui/src/app/services/translate-chart.service.ts @@ -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 }), })); } } diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json index 7ab47e05c..cc945b56f 100644 --- a/apps/red-ui/src/assets/i18n/redact/de.json +++ b/apps/red-ui/src/assets/i18n/redact/de.json @@ -2359,13 +2359,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-screen": { "cols": { diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json index 7ba620704..7371d9898 100644 --- a/apps/red-ui/src/assets/i18n/redact/en.json +++ b/apps/red-ui/src/assets/i18n/redact/en.json @@ -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": { diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json index ce0b0a7b2..a2c0b845c 100644 --- a/apps/red-ui/src/assets/i18n/scm/de.json +++ b/apps/red-ui/src/assets/i18n/scm/de.json @@ -2371,13 +2371,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-screen": { "cols": { diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json index f2c03bfa7..80d8de8fd 100644 --- a/apps/red-ui/src/assets/i18n/scm/en.json +++ b/apps/red-ui/src/assets/i18n/scm/en.json @@ -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": {