From 0d23df0fd185e4154fa4c1535501540a1aa23de7 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Thu, 30 Jul 2020 13:44:43 +0300 Subject: [PATCH] Use singular 'visitor' when appropriate (#259) --- assets/js/dashboard/stats/countries.js | 3 ++- assets/js/dashboard/stats/visitor-graph.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/assets/js/dashboard/stats/countries.js b/assets/js/dashboard/stats/countries.js index ce25268dd..1cc05e381 100644 --- a/assets/js/dashboard/stats/countries.js +++ b/assets/js/dashboard/stats/countries.js @@ -82,9 +82,10 @@ export default class Countries extends React.Component { highlightBorderColor: '#a779e9', popupTemplate: function(geo, data) { if (!data) { return ; } + const pluralizedLabel = data.numberOfThings === 1 ? label.slice(0, -1) : label return ['
', '', geo.properties.name, '', - '
', data.numberOfThings, ' ' + label, + '
', data.numberOfThings, ' ' + pluralizedLabel, '
'].join(''); } } diff --git a/assets/js/dashboard/stats/visitor-graph.js b/assets/js/dashboard/stats/visitor-graph.js index cdb85fc2a..d98174d98 100644 --- a/assets/js/dashboard/stats/visitor-graph.js +++ b/assets/js/dashboard/stats/visitor-graph.js @@ -126,7 +126,8 @@ class LineGraph extends React.Component { const dataset = this._data.datasets[item.datasetIndex] if (!this.drawnLabels[dataset.label]) { this.drawnLabels[dataset.label] = true - return ` ${item.yLabel} ${dataset.label}` + const pluralizedLabel = item.yLabel === 1 ? dataset.label.slice(0, -1) : dataset.label + return ` ${item.yLabel} ${pluralizedLabel}` } }, footer: function(dataPoints) {