Improve notifications

- Translate subtask status
- Translate internal link labels
- Add link to tasks and projects in overdue notifications

1 files changed, 3 insertions, 2 deletions

diff --git a/app/Template/notification/subtask_update.php b/app/Template/notification/subtask_update.php
index 0c235942..a6c4e9cc 100644
--- a/app/Template/notification/subtask_update.php
+++ b/app/Template/notification/subtask_update.php
@@ -4,18 +4,19 @@
 
 <ul>
     <li><?= t('Title:') ?> <?= $this->text->e($subtask['title']) ?></li>
-    <li><?= t('Status:') ?> <?= $this->text->e($subtask['status_name']) ?></li>
+    <li><?= t('Status:') ?> <?= t($subtask['status_name']) ?></li>
     <li><?= t('Assignee:') ?> <?= $this->text->e($subtask['name'] ?: $subtask['username'] ?: '?') ?></li>
+    <?php if (! empty($subtask['time_spent']) || ! empty($subtask['time_estimated'])): ?>
     <li>
         <?= t('Time tracking:') ?>
         <?php if (! empty($subtask['time_spent'])): ?>
             <strong><?= $this->text->e($subtask['time_spent']).'h' ?></strong> <?= t('spent') ?>
         <?php endif ?>
-
         <?php if (! empty($subtask['time_estimated'])): ?>
             <strong><?= $this->text->e($subtask['time_estimated']).'h' ?></strong> <?= t('estimated') ?>
         <?php endif ?>
     </li>
+    <?php endif ?>
 </ul>
 
 <?= $this->render('notification/footer', array('task' => $task)) ?>
\ No newline at end of file