feat(DH): Improve plurals in text

geonetwork · Nov 13, 2023 · ec8c13d · ec8c13d
1 parent 5f1c197
commit ec8c13d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/apps/datahub/src/app/home/news-page/key-figures/key-figures.component.html b/apps/datahub/src/app/home/news-page/key-figures/key-figures.component.html
@@ -4,7 +4,7 @@
       class="py-[37px] pl-[47px] rounded-lg border bg-white mb-5 card-shadow cursor-pointer"
       [figure]="recordsCount$ | async"
       [icon]="'folder_open'"
-      [title]="'catalog.figures.datasets' | translate"
+      [title]="'catalog.figures.datasets'"
       [color]="'secondary'"
     ></gn-ui-figure>
   </a>
@@ -13,7 +13,7 @@
       class="py-[37px] pl-[47px] rounded-lg bg-white border card-shadow cursor-pointer"
       [figure]="orgsCount$ | async"
       [icon]="'corporate_fare'"
-      [title]="'catalog.figures.organisations' | translate"
+      [title]="'catalog.figures.organisations'"
       [color]="'secondary'"
     ></gn-ui-figure>
   </a>

diff --git a/libs/ui/dataviz/src/lib/figure/figure.component.html b/libs/ui/dataviz/src/lib/figure/figure.component.html
@@ -1,4 +1,5 @@
 <div
+  translate
   class="flex flex-row justify-start items-center overflow-hidden"
   [title]="hoverTitle"
 >
@@ -15,6 +16,8 @@
       <span class="figure font-medium mr-[0.3em]">{{ figure }}</span>
       <span class="unit text-[0.665em]">{{ unit }}</span>
     </div>
-    <div class="title truncate">{{ title }}</div>
+    <div translate class="title truncate" [translateParams]="{ count: figure }">
+      {{ title }}
+    </div>
   </div>
 </div>
diff --git a/libs/ui/dataviz/src/lib/ui-dataviz.module.ts b/libs/ui/dataviz/src/lib/ui-dataviz.module.ts
@@ -2,9 +2,10 @@ import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { FigureComponent } from './figure/figure.component'
 import { MatIconModule } from '@angular/material/icon'
+import { TranslateModule } from '@ngx-translate/core'
 
 @NgModule({
-  imports: [CommonModule, MatIconModule],
+  imports: [CommonModule, MatIconModule, TranslateModule.forChild()],
   declarations: [FigureComponent],
   exports: [FigureComponent],
 })

diff --git a/translations/en.json b/translations/en.json
@@ -1,6 +1,6 @@
 {
-  "catalog.figures.datasets": "datasets",
-  "catalog.figures.organisations": "organisations",
+  "catalog.figures.datasets": "{count, plural, =0{datasets} one{dataset} other{datasets}}",
+  "catalog.figures.organisations": "{count, plural, =0{organisations} one{organisation} other{organisations}}",
   "chart.aggregation.average": "average",
   "chart.aggregation.count": "count",
   "chart.aggregation.max": "max",

diff --git a/translations/fr.json b/translations/fr.json
@@ -1,6 +1,6 @@
 {
-  "catalog.figures.datasets": "données",
-  "catalog.figures.organisations": "organisations",
+  "catalog.figures.datasets": "{count, plural, =0{données} one{donnée} other{données}}",
+  "catalog.figures.organisations": "{count, plural, =0{organisations} one{organisation} other{organisations}}",
   "chart.aggregation.average": "moyenne",
   "chart.aggregation.count": "nombre",
   "chart.aggregation.max": "maximum",