From b7eb2936fcb0f0219ffb888971c9a8da9a62f450 Mon Sep 17 00:00:00 2001 From: ncastejon <castejon.nicolas@gmail.com> Date: Fri, 16 Nov 2018 09:25:37 +0100 Subject: [PATCH] fix_34 singular/plural dataset counter in organizations page --- .../components/organizations/organizations.component.html | 4 +++- src/environments/environment.ts | 2 +- src/i18n/messages.en.xlf | 6 +++++- src/i18n/messages.fr.xlf | 6 +++++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/app/editorialisation/components/organizations/organizations.component.html b/src/app/editorialisation/components/organizations/organizations.component.html index ca909bc3..9dc27edc 100644 --- a/src/app/editorialisation/components/organizations/organizations.component.html +++ b/src/app/editorialisation/components/organizations/organizations.component.html @@ -19,7 +19,9 @@ <div *ngIf="organization.datasetsCount" class="columns is-vcentered"> <div class="column is-6 datasetsCount"> <span class="has-text-danger has-text-weight-bold count"> - {{ organization.datasetsCount}}</span><br /> <span i18n="@@organizations.datasets">datasets</span> + {{ organization.datasetsCount}}</span><br /> + <span i18n="@@organizations.datasets.plural" *ngIf="organization.datasetsCount > 1">datasets</span> + <span i18n="@@organizations.datasets.singular" *ngIf="organization.datasetsCount < 2">dataset</span> </div> <div class="column is-6"> <a class="button" (click)="goToResearchWithOrganizationFilter(organization.name)"> diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 286a6d8b..c3016842 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -26,7 +26,7 @@ export const environment = { }, backendUrls: { - organizations: 'http://localhost:3000/organizations', + organizations: 'http://localhost:3001/organizations', resources: 'http://localhost:3003/resources', }, diff --git a/src/i18n/messages.en.xlf b/src/i18n/messages.en.xlf index cfcee6c0..d42692a9 100644 --- a/src/i18n/messages.en.xlf +++ b/src/i18n/messages.en.xlf @@ -295,10 +295,14 @@ <source>More information</source> <target>More information</target> </trans-unit> - <trans-unit id="organizations.datasets" datatype="html"> + <trans-unit id="organizations.datasets.plural" datatype="html"> <source>datasets</source> <target>datasets</target> </trans-unit> + <trans-unit id="organizations.datasets.singular" datatype="html"> + <source>dataset</source> + <target>dataset</target> + </trans-unit> <trans-unit id="organizations.research" datatype="html"> <source>RESEARCH</source> <target>RESEARCH</target> diff --git a/src/i18n/messages.fr.xlf b/src/i18n/messages.fr.xlf index 199e92a9..918b82fc 100644 --- a/src/i18n/messages.fr.xlf +++ b/src/i18n/messages.fr.xlf @@ -303,10 +303,14 @@ <source>More information</source> <target>Plus d'informations</target> </trans-unit> - <trans-unit id="organizations.datasets" datatype="html"> + <trans-unit id="organizations.datasets.plural" datatype="html"> <source>datasets</source> <target>jeux de données</target> </trans-unit> + <trans-unit id="organizations.datasets.singular" datatype="html"> + <source>dataset</source> + <target>jeu de données</target> + </trans-unit> <trans-unit id="organizations.research" datatype="html"> <source>RESEARCH</source> <target>RECHERCHER</target> -- GitLab