From a4237677db50c92d8816144354ccf58428ba3640 Mon Sep 17 00:00:00 2001
From: Jared Hancock <gravydish@gmail.com>
Date: Mon, 4 Feb 2019 19:31:20 -0600
Subject: [PATCH] i18n: Fix untranslatable strings
---
include/ajax.tasks.php | 9 ++++++---
include/ajax.tickets.php | 10 +++++++---
include/class.ticket.php | 16 ++++++++++------
3 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/include/ajax.tasks.php b/include/ajax.tasks.php
index cd85cf613..77038e4c5 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 099d9ecaf..3b26b91fe 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 a3f33f052..0ac205d13 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);
--
GitLab