vikunja
/
frontend
Archived
6
39
Fork 49
Code Issues 1 Pull Requests 4 Projects Releases 26 Activity

WIP: feat: add default reminder for tasks with a due date #2360

Draft
konrad wants to merge 17 commits from feature/add-default-reminder into main
pull from: feature/add-default-reminder
merge into: vikunja:main
Conversation 2 Commits 17 Files Changed 12 +24 -31
4 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2aee048f61 - Show all commits

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

@ -36,35 +36,35 @@
<tbody> <tbody>
<tr> <tr>
<td><code>s</code></td> <td><code>s</code></td>
<td>{{ $t('time.seconds') }}</td> <td>{{ $tc('time.seconds', 2) }}</td>
</tr> </tr>
<tr> <tr>
<td><code>m</code></td> <td><code>m</code></td>
<td>{{ $t('time.minutes') }}</td> <td>{{ $tc('time.minutes', 2) }}</td>
</tr> </tr>
<tr> <tr>
<td><code>h</code></td> <td><code>h</code></td>
<td>{{ $t('time.hours') }}</td> <td>{{ $tc('time.hours', 2) }}</td>
</tr> </tr>
<tr> <tr>
<td><code>H</code></td> <td><code>H</code></td>
<td>{{ $t('time.hours') }}</td> <td>{{ $tc('time.hours', 2) }}</td>
</tr> </tr>
<tr> <tr>
<td><code>d</code></td> <td><code>d</code></td>
<td>{{ $t('time.days') }}</td> <td>{{ $tc('time.days', 2) }}</td>
</tr> </tr>
<tr> <tr>
<td><code>w</code></td> <td><code>w</code></td>
<td>{{ $t('time.weeks') }}</td> <td>{{ $tc('time.weeks', 2) }}</td>
</tr> </tr>
<tr> <tr>
<td><code>M</code></td> <td><code>M</code></td>
<td>{{ $t('time.months') }}</td> <td>{{ $tc('time.months', 2) }}</td>
</tr> </tr>
<tr> <tr>
<td><code>y</code></td> <td><code>y</code></td>
<td>{{ $t('time.years') }}</td> <td>{{ $tc('time.years', 2) }}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

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

@ -48,11 +48,11 @@
@change="updateData" @change="updateData"
:disabled="disabled || undefined" :disabled="disabled || undefined"
> >
<option value="hours">{{ $t('time.hours') }}</option> <option value="hours">{{ $tc('time.hours', 2) }}</option>
<option value="days">{{ $t('time.days') }}</option> <option value="days">{{ $tc('time.days', 2) }}</option>
<option value="weeks">{{ $t('time.weeks') }}</option> <option value="weeks">{{ $tc('time.weeks', 2) }}</option>
<option value="months">{{ $t('time.months') }}</option> <option value="months">{{ $tc('time.months', 2) }}</option>
<option value="years">{{ $t('time.years') }}</option> <option value="years">{{ $tc('time.years', 2) }}</option>
</select> </select>
</div> </div>
</div> </div>

21
src/i18n/lang/en.json
View File

@ -589,20 +589,13 @@
} }
}, },
"time": { "time": {
konrad marked this conversation as resolved Outdated
dpschen commented 2022-09-14 14:15:30 +00:00
Outdated
Review
Copy Link

Use vue-i18n pluralisation feature.
Or didn't you use that to be more because of crowdin?

Use [vue-i18n pluralisation](https://vue-i18n.intlify.dev/guide/essentials/pluralization.html) feature. Or didn't you use that to be more because of crowdin?
konrad commented 2022-09-29 16:24:27 +00:00
Outdated
Review
Copy Link

I actually just forgot about that feature :) will change it.

I actually just forgot about that feature :) will change it.
👍 1
konrad commented 2022-09-29 16:30:50 +00:00
Outdated
Review
Copy Link

Done.

Done.
"seconds": "Seconds", "seconds": "Second | Seconds",
"second": "Second", "minutes": "Minute | Minutes",
"minutes": "Minutes", "hours": "Hour | Hours",
"minute": "Minute", "days": "Day | Days",
"hours": "Hours", "weeks": "Week | Weeks",
"hour": "Hour", "months": "Month | Months",
"days": "Days", "years": "Year | Years"
"day": "Day",
"weeks": "Weeks",
"week": "Week",
"months": "Months",
"month": "Month",
"years": "Years",
"year": "Year"
}, },
"task": { "task": {
"task": "Task", "task": "Task",

8
src/views/user/settings/General.vue
View File

@ -44,16 +44,16 @@
<div class="control select"> <div class="control select">
<select v-model="defaultReminderAmountType"> <select v-model="defaultReminderAmountType">
<option value="minutes"> <option value="minutes">
{{ $t('time.minute' + (defaultReminderAmount === 1 ? '' : 's')) }} {{ $tc('time.minutes', defaultReminderAmount) }}
konrad marked this conversation as resolved Outdated
dpschen commented 2022-09-14 14:19:09 +00:00
Outdated
Review
Copy Link

In case we don't use vue-i18n pluralisation feature we shouldn't use local messages that can't be precompiled (see: https://vue-i18n.intlify.dev/guide/advanced/optimization.html#optimization).

{{ defaultReminderAmount === 1 ? $t('time.minute') : $t('time.minutes') }}
In case we don't use vue-i18n pluralisation feature we shouldn't use local messages that can't be precompiled (see: https://vue-i18n.intlify.dev/guide/advanced/optimization.html#optimization). ```ts {{ defaultReminderAmount === 1 ? $t('time.minute') : $t('time.minutes') }} ```
</option> </option>
<option value="hours"> <option value="hours">
{{ $t('time.hour' + (defaultReminderAmount === 1 ? '' : 's')) }} {{ $tc('time.hours', defaultReminderAmount) }}
</option> </option>
<option value="days"> <option value="days">
{{ $t('time.day' + (defaultReminderAmount === 1 ? '' : 's')) }} {{ $tc('time.days', defaultReminderAmount) }}
</option> </option>
<option value="months"> <option value="months">
{{ $t('time.month' + (defaultReminderAmount === 1 ? '' : 's')) }} {{ $tc('time.months', defaultReminderAmount) }}
</option> </option>
</select> </select>
</div> </div>