From 2aee048f6109ee85587017243fcc2ee33a931851 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Thu, 29 Sep 2022 18:30:40 +0200
Subject: [PATCH] fix: use vue-i18n pluralization

---
 src/components/date/datemathHelp.vue          | 16 +++++++-------
 src/components/tasks/partials/repeatAfter.vue | 10 ++++-----
 src/i18n/lang/en.json                         | 21 +++++++------------
 src/views/user/settings/General.vue           |  8 +++----
 4 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/src/components/date/datemathHelp.vue b/src/components/date/datemathHelp.vue
index eeda712f9..89e20a065 100644
--- a/src/components/date/datemathHelp.vue
+++ b/src/components/date/datemathHelp.vue
@@ -36,35 +36,35 @@
 			<tbody>
 			<tr>
 				<td><code>s</code></td>
-				<td>{{ $t('time.seconds') }}</td>
+				<td>{{ $tc('time.seconds', 2) }}</td>
 			</tr>
 			<tr>
 				<td><code>m</code></td>
-				<td>{{ $t('time.minutes') }}</td>
+				<td>{{ $tc('time.minutes', 2) }}</td>
 			</tr>
 			<tr>
 				<td><code>h</code></td>
-				<td>{{ $t('time.hours') }}</td>
+				<td>{{ $tc('time.hours', 2) }}</td>
 			</tr>
 			<tr>
 				<td><code>H</code></td>
-				<td>{{ $t('time.hours') }}</td>
+				<td>{{ $tc('time.hours', 2) }}</td>
 			</tr>
 			<tr>
 				<td><code>d</code></td>
-				<td>{{ $t('time.days') }}</td>
+				<td>{{ $tc('time.days', 2) }}</td>
 			</tr>
 			<tr>
 				<td><code>w</code></td>
-				<td>{{ $t('time.weeks') }}</td>
+				<td>{{ $tc('time.weeks', 2) }}</td>
 			</tr>
 			<tr>
 				<td><code>M</code></td>
-				<td>{{ $t('time.months') }}</td>
+				<td>{{ $tc('time.months', 2) }}</td>
 			</tr>
 			<tr>
 				<td><code>y</code></td>
-				<td>{{ $t('time.years') }}</td>
+				<td>{{ $tc('time.years', 2) }}</td>
 			</tr>
 			</tbody>
 		</table>
diff --git a/src/components/tasks/partials/repeatAfter.vue b/src/components/tasks/partials/repeatAfter.vue
index e0e7b2009..147441555 100644
--- a/src/components/tasks/partials/repeatAfter.vue
+++ b/src/components/tasks/partials/repeatAfter.vue
@@ -48,11 +48,11 @@
 							@change="updateData"
 							:disabled="disabled || undefined"
 						>
-							<option value="hours">{{ $t('time.hours') }}</option>
-							<option value="days">{{ $t('time.days') }}</option>
-							<option value="weeks">{{ $t('time.weeks') }}</option>
-							<option value="months">{{ $t('time.months') }}</option>
-							<option value="years">{{ $t('time.years') }}</option>
+							<option value="hours">{{ $tc('time.hours', 2) }}</option>
+							<option value="days">{{ $tc('time.days', 2) }}</option>
+							<option value="weeks">{{ $tc('time.weeks', 2) }}</option>
+							<option value="months">{{ $tc('time.months', 2) }}</option>
+							<option value="years">{{ $tc('time.years', 2) }}</option>
 						</select>
 					</div>
 				</div>
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index 0dd088dbc..43206c594 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -589,20 +589,13 @@
     }
   },
   "time": {
-    "seconds": "Seconds",
-    "second": "Second",
-    "minutes": "Minutes",
-    "minute": "Minute",
-    "hours": "Hours",
-    "hour": "Hour",
-    "days": "Days",
-    "day": "Day",
-    "weeks": "Weeks",
-    "week": "Week",
-    "months": "Months",
-    "month": "Month",
-    "years": "Years",
-    "year": "Year"
+    "seconds": "Second | Seconds",
+    "minutes": "Minute | Minutes",
+    "hours": "Hour | Hours",
+    "days": "Day | Days",
+    "weeks": "Week | Weeks",
+    "months": "Month | Months",
+    "years": "Year | Years"
   },
   "task": {
     "task": "Task",
diff --git a/src/views/user/settings/General.vue b/src/views/user/settings/General.vue
index c6305a81a..bc3cffb8c 100644
--- a/src/views/user/settings/General.vue
+++ b/src/views/user/settings/General.vue
@@ -44,16 +44,16 @@
 				<div class="control select">
 					<select v-model="defaultReminderAmountType">
 						<option value="minutes">
-							{{ $t('time.minute' + (defaultReminderAmount === 1 ? '' : 's')) }}
+							{{ $tc('time.minutes', defaultReminderAmount) }}
 						</option>
 						<option value="hours">
-							{{ $t('time.hour' + (defaultReminderAmount === 1 ? '' : 's')) }}
+							{{ $tc('time.hours', defaultReminderAmount) }}
 						</option>
 						<option value="days">
-							{{ $t('time.day' + (defaultReminderAmount === 1 ? '' : 's')) }}
+							{{ $tc('time.days', defaultReminderAmount) }}
 						</option>
 						<option value="months">
-							{{ $t('time.month' + (defaultReminderAmount === 1 ? '' : 's')) }}
+							{{ $tc('time.months', defaultReminderAmount) }}
 						</option>
 					</select>
 				</div>