local-it/vikunja-frontend
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

feat: unify time units and use the same ones everywhere

Browse source
This commit is contained in:
kolaente 2022-09-08 14:26:24 +02:00
parent 3d5f50ccd4
commit 5b4fe9176e
No known key found for this signature in database
GPG key ID: F40E70337AB24C9B
4 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/components/date/datemathHelp.vue
View file

@ -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>

10
src/components/tasks/partials/repeatAfter.vue
View file

@ -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>

28
src/i18n/lang/en.json
View file

@ -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",

20
src/views/user/settings/General.vue
View file

@ -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>