Pluralize

Author: yardenshoham

options/locale/locale_en-US.ini

@@ -125,7 +125,8 @@ number_of_contributions_in_the_last_12_months = %s contributions in the last 12
 no_contributions = No contributions
 less = Less
 more = More
-number_of_contributions_on_date = <b>%[1]s contributions</b> on %[2]s
+number_of_contributions_on_date_n = <b>%[2]s contributions</b> on %[1]s
+number_of_contributions_on_date_1 = <b>1 contribution</b> on %[1]s
 
 [editor]
 buttons.heading.tooltip = Add heading

templates/user/heatmap.tmpl

@@ -5,7 +5,8 @@
 		data-locale-no-contributions="{{.locale.Tr "heatmap.no_contributions"}}"
 		data-locale-more="{{.locale.Tr "heatmap.more"}}"
 		data-locale-less="{{.locale.Tr "heatmap.less"}}"
-		data-locale-contributions-on="{{.locale.Tr "heatmap.number_of_contributions_on_date"}}"
+		data-locale-contributions-on-n="{{.locale.Tr "heatmap.number_of_contributions_on_date_n"}}"
+		data-locale-contributions-on-1="{{.locale.Tr "heatmap.number_of_contributions_on_date_1"}}"
 	>
 		<div slot="loading">
 			<div class="ui active centered inline indeterminate text loader" id="loading-heatmap">{{.locale.Tr "user.heatmap.loading"}}</div>

web_src/js/components/ActivityHeatmap.vue

@@ -70,7 +70,8 @@ export default {
       const datetime = v.date.toISOString();
       const fallback = v.date.toLocaleDateString();
       const date = `<relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="${datetime}">${fallback}</relative-time>`;
-      return locale.contributions_on.replace('%[1]s', number).replace('%[2]s', date);
+      const stringToFormat = v.count === 1 ? locale.contributions_on_1 : locale.contributions_on_n;
+      return stringToFormat.replace('%[2]s', number).replace('%[1]s', date);
     }
   },
 };

web_src/js/features/heatmap.js

@@ -25,7 +25,8 @@ export function initHeatmap() {
       no_contributions: el.getAttribute('data-locale-no-contributions'),
       more: el.getAttribute('data-locale-more'),
       less: el.getAttribute('data-locale-less'),
-      contributions_on: el.getAttribute('data-locale-contributions-on'),
+      contributions_on_n: el.getAttribute('data-locale-contributions-on-n'),
+      contributions_on_1: el.getAttribute('data-locale-contributions-on-1'),
     };
 
     const View = createApp(ActivityHeatmap, {values, locale});