From 2b45d64695d19e373a9e359f44babaccf69e76ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tautvidas=20Sipavi=C4=8Dius?= Date: Mon, 27 Feb 2017 16:08:50 +0200 Subject: [PATCH] Make numberOfItems translation singular/plural aware --- assets/js/src/listing/pages.jsx | 11 ++++++++--- views/forms.html | 3 ++- views/newsletters.html | 3 ++- views/segments.html | 3 ++- views/subscribers/subscribers.html | 3 ++- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/assets/js/src/listing/pages.jsx b/assets/js/src/listing/pages.jsx index 09f8fc5c53..b3f44a04bd 100644 --- a/assets/js/src/listing/pages.jsx +++ b/assets/js/src/listing/pages.jsx @@ -164,11 +164,16 @@ define([ { 'one-page': (this.props.count <= this.props.limit) } ); + var numberOfItemsLabel; + if (this.props.count == 1) { + numberOfItemsLabel = MailPoet.I18n.t('numberOfItemsSingular'); + } else { + numberOfItemsLabel = MailPoet.I18n.t('numberOfItemsMultiple') + .replace('%$1d', this.props.count.toLocaleString()); + } return (
- { - MailPoet.I18n.t('numberOfItems').replace('%$1d', this.props.count.toLocaleString()) - } + { numberOfItemsLabel } { pagination }
); diff --git a/views/forms.html b/views/forms.html index b24ca85821..511b25a2a0 100644 --- a/views/forms.html +++ b/views/forms.html @@ -37,7 +37,8 @@ 'lastPage': __('Last page'), 'currentPage': __('Current Page'), 'pageOutOf': __('of'), - 'numberOfItems': __('%$1d item(s)'), + 'numberOfItemsSingular': __('1 item'), + 'numberOfItemsMultiple': __('%$1d items'), 'formName': __('Name'), 'segments': __('Lists'), diff --git a/views/newsletters.html b/views/newsletters.html index ab2f38fc17..b53076084d 100644 --- a/views/newsletters.html +++ b/views/newsletters.html @@ -50,7 +50,8 @@ 'lastPage': __('Last page'), 'currentPage': __('Current page'), 'pageOutOf': __('of'), - 'numberOfItems': __('%$1d item(s)'), + 'numberOfItemsSingular': __('1 item'), + 'numberOfItemsMultiple': __('%$1d items'), 'selectType': __('Select type'), 'template': __('Template'), diff --git a/views/segments.html b/views/segments.html index 375dcf4d09..1fb5cbc502 100644 --- a/views/segments.html +++ b/views/segments.html @@ -61,7 +61,8 @@ 'lastPage': __('Last page'), 'currentPage': __('Current page'), 'pageOutOf': __('of'), - 'numberOfItems': __('%$1d item(s)'), + 'numberOfItemsSingular': __('1 item'), + 'numberOfItemsMultiple': __('%$1d items'), 'segmentDescriptionTip': __('This text box is for your own use and is never shown to your subscribers.'), 'backToList': __('Back') diff --git a/views/subscribers/subscribers.html b/views/subscribers/subscribers.html index b44f1baab8..b6a20f44cb 100644 --- a/views/subscribers/subscribers.html +++ b/views/subscribers/subscribers.html @@ -42,7 +42,8 @@ 'lastPage': __('Last page'), 'currentPage': __('Current Page'), 'pageOutOf': __('of'), - 'numberOfItems': __('%$1d item(s)'), + 'numberOfItemsSingular': __('1 item'), + 'numberOfItemsMultiple': __('%$1d items'), 'email': __('E-mail'), 'firstname': __('First name'),