diff options
Diffstat (limited to 'app/Template')
| -rw-r--r-- | app/Template/event/comment_create.php | 5 | ||||
| -rw-r--r-- | app/Template/event/comment_update.php | 5 | ||||
| -rw-r--r-- | app/Template/event/subtask_create.php | 5 | ||||
| -rw-r--r-- | app/Template/event/subtask_update.php | 5 | ||||
| -rw-r--r-- | app/Template/event/task_assignee_change.php | 8 | ||||
| -rw-r--r-- | app/Template/event/task_close.php | 5 | ||||
| -rw-r--r-- | app/Template/event/task_create.php | 5 | ||||
| -rw-r--r-- | app/Template/event/task_move_column.php | 6 | ||||
| -rw-r--r-- | app/Template/event/task_move_position.php | 7 | ||||
| -rw-r--r-- | app/Template/event/task_open.php | 5 | ||||
| -rw-r--r-- | app/Template/event/task_update.php | 5 |
11 files changed, 46 insertions, 15 deletions
diff --git a/app/Template/event/comment_create.php b/app/Template/event/comment_create.php index ee985ed1..fd046fd1 100644 --- a/app/Template/event/comment_create.php +++ b/app/Template/event/comment_create.php @@ -1,5 +1,8 @@ <p class="activity-title"> - <?= e('%s commented the task <a href="?controller=task&action=show&task_id=%d">#%d</a>', $this->e($author), $task_id, $task_id) ?> + <?= e('%s commented the task %s', + $this->e($author), + $this->a(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + ) ?> </p> <div class="activity-description"> <em><?= $this->e($task['title']) ?></em><br/> diff --git a/app/Template/event/comment_update.php b/app/Template/event/comment_update.php index 93418159..7149bacf 100644 --- a/app/Template/event/comment_update.php +++ b/app/Template/event/comment_update.php @@ -1,5 +1,8 @@ <p class="activity-title"> - <?= e('%s updated a comment on the task <a href="?controller=task&action=show&task_id=%d">#%d</a>', $this->e($author), $task_id, $task_id) ?> + <?= e('%s updated a comment on the task %s', + $this->e($author), + $this->a(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + ) ?> </p> <div class="activity-description"> <em><?= $this->e($task['title']) ?></em><br/> diff --git a/app/Template/event/subtask_create.php b/app/Template/event/subtask_create.php index 3572031f..1cc7585c 100644 --- a/app/Template/event/subtask_create.php +++ b/app/Template/event/subtask_create.php @@ -1,5 +1,8 @@ <p class="activity-title"> - <?= e('%s created a subtask for the task <a href="?controller=task&action=show&task_id=%d">#%d</a>', $this->e($author), $task_id, $task_id) ?> + <?= e('%s created a subtask for the task %s', + $this->e($author), + $this->a(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + ) ?> </p> <div class="activity-description"> <p><em><?= $this->e($task['title']) ?></em></p> diff --git a/app/Template/event/subtask_update.php b/app/Template/event/subtask_update.php index 0adc8ff5..be06f7f5 100644 --- a/app/Template/event/subtask_update.php +++ b/app/Template/event/subtask_update.php @@ -1,5 +1,8 @@ <p class="activity-title"> - <?= e('%s updated a subtask for the task <a href="?controller=task&action=show&task_id=%d">#%d</a>', $this->e($author), $task_id, $task_id) ?> + <?= e('%s updated a subtask for the task %s', + $this->e($author), + $this->a(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + ) ?> </p> <div class="activity-description"> <p><em><?= $this->e($task['title']) ?></em></p> diff --git a/app/Template/event/task_assignee_change.php b/app/Template/event/task_assignee_change.php index e9815853..6eac412b 100644 --- a/app/Template/event/task_assignee_change.php +++ b/app/Template/event/task_assignee_change.php @@ -1,11 +1,9 @@ <p class="activity-title"> - <?= e( - '%s change the assignee of the task <a href="?controller=task&action=show&task_id=%d">#%d</a> to %s', + <?= e('%s changed the assignee of the task %s to %s', $this->e($author), - $task_id, - $task_id, + $this->a(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), $this->e($task['assignee_name'] ?: $task['assignee_username']) - ) ?> + ) ?> </p> <p class="activity-description"> <em><?= $this->e($task['title']) ?></em> diff --git a/app/Template/event/task_close.php b/app/Template/event/task_close.php index 6ab476bd..b5ad4d1d 100644 --- a/app/Template/event/task_close.php +++ b/app/Template/event/task_close.php @@ -1,5 +1,8 @@ <p class="activity-title"> - <?= e('%s closed the task <a href="?controller=task&action=show&task_id=%d">#%d</a>', $this->e($author), $task_id, $task_id) ?> + <?= e('%s closed the task %s', + $this->e($author), + $this->a(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + ) ?> </p> <p class="activity-description"> <em><?= $this->e($task['title']) ?></em> diff --git a/app/Template/event/task_create.php b/app/Template/event/task_create.php index 36bd4713..de9a7e0d 100644 --- a/app/Template/event/task_create.php +++ b/app/Template/event/task_create.php @@ -1,5 +1,8 @@ <p class="activity-title"> - <?= e('%s created the task <a href="?controller=task&action=show&task_id=%d">#%d</a>', $this->e($author), $task_id, $task_id) ?> + <?= e('%s created the task %s', + $this->e($author), + $this->a(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + ) ?> </p> <p class="activity-description"> <em><?= $this->e($task['title']) ?></em> diff --git a/app/Template/event/task_move_column.php b/app/Template/event/task_move_column.php index 9c5f54dd..e56e92d7 100644 --- a/app/Template/event/task_move_column.php +++ b/app/Template/event/task_move_column.php @@ -1,5 +1,9 @@ <p class="activity-title"> - <?= e('%s moved the task <a href="?controller=task&action=show&task_id=%d">#%d</a> to the column "%s"', $this->e($author), $task_id, $task_id, $this->e($task['column_title'])) ?> + <?= e('%s moved the task %s to the column "%s"', + $this->e($author), + $this->a(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), + $this->e($task['column_title']) + ) ?> </p> <p class="activity-description"> <em><?= $this->e($task['title']) ?></em> diff --git a/app/Template/event/task_move_position.php b/app/Template/event/task_move_position.php index 86e09953..412a9401 100644 --- a/app/Template/event/task_move_position.php +++ b/app/Template/event/task_move_position.php @@ -1,5 +1,10 @@ <p class="activity-title"> - <?= e('%s moved the task <a href="?controller=task&action=show&task_id=%d">#%d</a> to the position #%d in the column "%s"', $this->e($author), $task_id, $task_id, $task['position'], $this->e($task['column_title'])) ?> + <?= e('%s moved the task %s to the position #%d in the column "%s"', + $this->e($author), + $this->a(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), + $task['position'], + $this->e($task['column_title']) + ) ?> </p> <p class="activity-description"> <em><?= $this->e($task['title']) ?></em> diff --git a/app/Template/event/task_open.php b/app/Template/event/task_open.php index cdcb907c..353f8dac 100644 --- a/app/Template/event/task_open.php +++ b/app/Template/event/task_open.php @@ -1,5 +1,8 @@ <p class="activity-title"> - <?= e('%s open the task <a href="?controller=task&action=show&task_id=%d">#%d</a>', $this->e($author), $task_id, $task_id) ?> + <?= e('%s opened the task %s', + $this->e($author), + $this->a(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + ) ?> </p> <p class="activity-description"> <em><?= $this->e($task['title']) ?></em> diff --git a/app/Template/event/task_update.php b/app/Template/event/task_update.php index 34b96257..24b17446 100644 --- a/app/Template/event/task_update.php +++ b/app/Template/event/task_update.php @@ -1,5 +1,8 @@ <p class="activity-title"> - <?= e('%s updated the task <a href="?controller=task&action=show&task_id=%d">#%d</a>', $this->e($author), $task_id, $task_id) ?> + <?= e('%s updated the task %s', + $this->e($author), + $this->a(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + ) ?> </p> <p class="activity-description"> <em><?= $this->e($task['title']) ?></em> |