diff --git a/include/ajax.tasks.php b/include/ajax.tasks.php index cd85cf613cbf696280ae79182946d6c9e6b46fea..77038e4c52af0e509bfd8462b468988e9bc6cd1b 100644 --- a/include/ajax.tasks.php +++ b/include/ajax.tasks.php @@ -130,8 +130,11 @@ class TasksAjaxAPI extends AjaxController { $note = array( 'title' => __('Task Created From Thread Entry'), - 'note' => __('Task ' . $taskLink . - '<br /> Thread Entry: ' . $entryLink) + 'note' => sprintf(__( + // %1$s is the task ID number and %2$s is the thread + // entry date + 'Task %1$s<br/> Thread Entry: %2$s'), + $taskLink, $entryLink) ); $originalTask->postNote($note, $errors, $thisstaff); @@ -143,7 +146,7 @@ class TasksAjaxAPI extends AjaxController { $note = array( 'title' => __('Task Created From Thread Entry'), - 'note' => __('This Task was created from Task ' . $taskLink)); + 'note' => sprintf(__('This Task was created from Task %1$s'), $taskLink)); $task->postNote($note, $errors, $thisstaff); } diff --git a/include/ajax.tickets.php b/include/ajax.tickets.php index 099d9ecafe64ac75e6edd163bcf4c15a31ba30d7..3b26b91fea5bae8ca62ee1f0d4a11d906f6a424d 100644 --- a/include/ajax.tickets.php +++ b/include/ajax.tickets.php @@ -1499,8 +1499,11 @@ function refer($tid, $target=null) { $note = array( 'title' => __('Task Created From Thread Entry'), - 'body' => __('Task ' . $taskLink . - '<br /> Thread Entry: ' . $entryLink) + 'body' => sprintf(__( + // %1$s is the task ID number and %2$s is the thread + // entry date + 'Task %1$s<br/> Thread Entry: %2$s'), + $taskLink, $entryLink) ); $ticket->logNote($note['title'], $note['body'], $thisstaff); @@ -1512,7 +1515,8 @@ function refer($tid, $target=null) { $note = array( 'title' => __('Task Created From Thread Entry'), - 'note' => __('This Task was created from Ticket ' . $ticketLink)); + 'note' => sprintf(__('This Task was created from Ticket %1$s', $ticketLink)) + ); $task->postNote($note, $errors, $thisstaff); } diff --git a/include/class.ticket.php b/include/class.ticket.php index a3f33f0521c2bb510b7e6a24fd07145c6b14b577..0ac205d138a8210b8b114e77c5ebdfd05df01bbd 100644 --- a/include/class.ticket.php +++ b/include/class.ticket.php @@ -3955,8 +3955,10 @@ implements RestrictedAccess, Threadable, Searchable { $note = array( 'title' => __('Ticket Created From Thread Entry'), - 'body' => sprintf(__('This Ticket was created from %s '. $link), - $oldTicket ? 'Ticket' : 'Task') + 'body' => sprintf(__( + // %1$s is the word Ticket or Task, %2$s will be a link to it + 'This Ticket was created from %1$s %2$s'), + $oldTicket ? __('Ticket') : __('Task'), $link) ); $ticket->logNote($note['title'], $note['body'], $thisstaff); @@ -3973,13 +3975,15 @@ implements RestrictedAccess, Threadable, Searchable { $ticketNote = array( 'title' => __('Ticket Created From Thread Entry'), - 'body' => __('Ticket ' . $ticketLink). - '<br /> Thread Entry: ' . $entryLink); + 'body' => sprintf(__('Ticket %1$s<br/> Thread Entry: %2$s'), + $ticketLink, $entryLink) + ); $taskNote = array( 'title' => __('Ticket Created From Thread Entry'), - 'note' => __('Ticket ' . $ticketLink). - '<br /> Thread Entry: ' . $entryLink); + 'note' => sprintf(__('Ticket %1$s<br/> Thread Entry: %2$s'), + $ticketLink, $entryLink) + ); if ($oldTicket) $oldTicket->logNote($ticketNote['title'], $ticketNote['body'], $thisstaff);