From 5b4fe9176e528e6ab2052f3702da03112ab9be45 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Thu, 8 Sep 2022 14:26:24 +0200
Subject: [PATCH] feat: unify time units and use the same ones everywhere

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

diff --git a/src/components/date/datemathHelp.vue b/src/components/date/datemathHelp.vue
index 4e4319ed..eeda712f 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('input.datemathHelp.units.seconds') }}</td>
+				<td>{{ $t('time.seconds') }}</td>
 			</tr>
 			<tr>
 				<td><code>m</code></td>
-				<td>{{ $t('input.datemathHelp.units.minutes') }}</td>
+				<td>{{ $t('time.minutes') }}</td>
 			</tr>
 			<tr>
 				<td><code>h</code></td>
-				<td>{{ $t('input.datemathHelp.units.hours') }}</td>
+				<td>{{ $t('time.hours') }}</td>
 			</tr>
 			<tr>
 				<td><code>H</code></td>
-				<td>{{ $t('input.datemathHelp.units.hours') }}</td>
+				<td>{{ $t('time.hours') }}</td>
 			</tr>
 			<tr>
 				<td><code>d</code></td>
-				<td>{{ $t('input.datemathHelp.units.days') }}</td>
+				<td>{{ $t('time.days') }}</td>
 			</tr>
 			<tr>
 				<td><code>w</code></td>
-				<td>{{ $t('input.datemathHelp.units.weeks') }}</td>
+				<td>{{ $t('time.weeks') }}</td>
 			</tr>
 			<tr>
 				<td><code>M</code></td>
-				<td>{{ $t('input.datemathHelp.units.months') }}</td>
+				<td>{{ $t('time.months') }}</td>
 			</tr>
 			<tr>
 				<td><code>y</code></td>
-				<td>{{ $t('input.datemathHelp.units.years') }}</td>
+				<td>{{ $t('time.years') }}</td>
 			</tr>
 			</tbody>
 		</table>
diff --git a/src/components/tasks/partials/repeatAfter.vue b/src/components/tasks/partials/repeatAfter.vue
index e416e2a6..e0e7b200 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('task.repeat.hours') }}</option>
-							<option value="days">{{ $t('task.repeat.days') }}</option>
-							<option value="weeks">{{ $t('task.repeat.weeks') }}</option>
-							<option value="months">{{ $t('task.repeat.months') }}</option>
-							<option value="years">{{ $t('task.repeat.years') }}</option>
+							<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>
 						</select>
 					</div>
 				</div>
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index cf5b4550..0dd088db 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -551,19 +551,16 @@
       "fromto": "{from} to {to}",
       "ranges": {
         "today": "Today",
-        
         "thisWeek": "This Week",
         "restOfThisWeek": "The Rest of This Week",
         "nextWeek": "Next Week",
         "next7Days": "Next 7 Days",
         "lastWeek": "Last Week",
-        
         "thisMonth": "This Month",
         "restOfThisMonth": "The Rest of This Month",
         "nextMonth": "Next Month",
         "next30Days": "Next 30 Days",
         "lastMonth": "Last Month",
-        
         "thisYear": "This Year",
         "restOfThisYear": "The Rest of This Year"
       }
@@ -580,15 +577,6 @@
       "roundDay": "Round down to the nearest day",
       "supportedUnits": "Supported time units are:",
       "someExamples": "Some examples of time expressions:",
-      "units": {
-        "seconds": "Seconds",
-        "minutes": "Minutes",
-        "hours": "Hours",
-        "days": "Days",
-        "weeks": "Weeks",
-        "months": "Months",
-        "years": "Years"
-      },
       "examples": {
         "now": "Right now",
         "in24h": "In 24h",
@@ -600,6 +588,22 @@
       }
     }
   },
+  "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"
+  },
   "task": {
     "task": "Task",
     "new": "Create a new task",
diff --git a/src/views/user/settings/General.vue b/src/views/user/settings/General.vue
index 34f0adb9..ef86589b 100644
--- a/src/views/user/settings/General.vue
+++ b/src/views/user/settings/General.vue
@@ -43,21 +43,17 @@
 				</div>
 				<div class="control select">
 					<select v-model="defaultReminderAmountType">
-						<option value="minutes">{{
-								$t('task.repeat.minute' + (defaultReminderAmount === 1 ? '' : 's'))
-							}}
+						<option value="minutes">
+							{{ $t('time.minute' + (defaultReminderAmount === 1 ? '' : 's')) }}
 						</option>
-						<option value="hours">{{
-								$t('task.repeat.hour' + (defaultReminderAmount === 1 ? '' : 's'))
-							}}
+						<option value="hours">
+							{{ $t('time.hour' + (defaultReminderAmount === 1 ? '' : 's')) }}
 						</option>
-						<option value="days">{{
-								$t('task.repeat.day' + (defaultReminderAmount === 1 ? '' : 's'))
-							}}
+						<option value="days">
+							{{ $t('time.day' + (defaultReminderAmount === 1 ? '' : 's')) }}
 						</option>
-						<option value="months">{{
-								$t('task.repeat.month' + (defaultReminderAmount === 1 ? '' : 's'))
-							}}
+						<option value="months">
+							{{ $t('time.month' + (defaultReminderAmount === 1 ? '' : 's')) }}
 						</option>
 					</select>
 				</div>