i18n: Localize status on ticket queue pages

include/class.list.php

@@ -1035,6 +1035,11 @@ class TicketStatus  extends VerySimpleModel implements CustomListItem {
         $T = CustomDataTranslation::translate($tag);
         return $T != $tag ? $T : $this->get($subtag);
     }
+    static function getLocalById($id, $subtag, $default) {
+        $tag = _H(sprintf('status.%s.%s', $subtag, $id));
+        $T = CustomDataTranslation::translate($tag);
+        return $T != $tag ? $T : $default;
+    }
 
     function getConfiguration() {
 

include/client/tickets.inc.php

@@ -82,7 +82,7 @@ $negorder=$order=='-'?'ASC':'DESC'; //Negate the sorting
 
 $tickets->order_by($order.$order_by);
 $tickets->values(
-    'ticket_id', 'number', 'created', 'isanswered', 'source', 'status__id',
+    'ticket_id', 'number', 'created', 'isanswered', 'source', 'status_id',
     'status__state', 'status__name', 'cdata__subject', 'dept_id',
     'dept__name', 'dept__ispublic', 'user__default_email__address'
 );
@@ -143,6 +143,7 @@ $tickets->values(
             $subject = Format::truncate($subject_field->display(
                 $subject_field->to_php($T['cdata__subject']) ?: $T['cdata__subject']
             ), 40);
+            $status = TicketStatus::getLocalById($T['status_id'], 'value', $T['status__name']);
             if (false) // XXX: Reimplement attachment count support
                 $subject.='  &nbsp;&nbsp;<span class="Icon file"></span>';
 
@@ -158,7 +159,7 @@ $tickets->values(
                     href="tickets.php?id=<?php echo $T['ticket_id']; ?>"><?php echo $ticketNumber; ?></a>
                 </td>
                 <td>&nbsp;<?php echo Format::date($T['created']); ?></td>
-                <td>&nbsp;<?php echo $T['status__name']; ?></td>
+                <td>&nbsp;<?php echo $status; ?></td>
                 <td>
                     <a href="tickets.php?id=<?php echo $T['ticket_id']; ?>"><?php echo $subject; ?></a>
                 </td>

include/staff/tickets.inc.php

@@ -108,7 +108,7 @@ $tickets->annotate(array(
 
 // Select pertinent columns
 // ------------------------------------------------------------
-$tickets->values('lock__lock_id', 'staff_id', 'isoverdue', 'team_id', 'ticket_id', 'number', 'cdata__subject', 'user__default_email__address', 'source', 'cdata__:priority__priority_color', 'cdata__:priority__priority_desc', 'status__name', 'status__state', 'dept_id', 'dept__name', 'user__name', 'lastupdate', 'collab_count');
+$tickets->values('lock__lock_id', 'staff_id', 'isoverdue', 'team_id', 'ticket_id', 'number', 'cdata__subject', 'user__default_email__address', 'source', 'cdata__:priority__priority_color', 'cdata__:priority__priority_desc', 'status_id', 'status__name', 'status__state', 'dept_id', 'dept__name', 'user__name', 'lastupdate', 'collab_count');
 
 // Apply requested quick filter
 
@@ -322,7 +322,7 @@ $_SESSION[':Q:tickets'] = $tickets;
                         Format::truncate($un, 22, strpos($un, '@'))); ?>&nbsp;</td>
                 <?php
                 if($search && !$status){
-                    $displaystatus=ucfirst($T['status__name']);
+                    $displaystatus=TicketStatus::getLocalById($T['status_id'], 'value', $T['status__name']);
                     if(!strcasecmp($T['status__state'],'open'))
                         $displaystatus="<b>$displaystatus</b>";
                     echo "<td>$displaystatus</td>";