diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php index d2e173ca2e416420aea4271033209ee1e4a9667a..c1e15703866132c3197a8413cd385fa3585b77d0 100644 --- a/include/staff/ticket-view.inc.php +++ b/include/staff/ticket-view.inc.php @@ -157,7 +157,7 @@ if($ticket->isOverdue()) <table border="0" cellspacing="" cellpadding="4" width="100%"> <tr> <th width="100"><?php echo __('Status');?>:</th> - <td><?php echo mb_convert_case(__($ticket->getStatus()), MB_CASE_TITLE); ?></td> + <td><?php echo $ticket->getStatus(); ?></td> </tr> <tr> <th><?php echo __('Priority');?>:</th> diff --git a/include/upgrader/streams/core/8f99b8bf-b3806687.task.php b/include/upgrader/streams/core/8f99b8bf-b3806687.task.php index 8a6b8d7f58827a7ccd4e6c837264317565554aa5..8c717837e24f0bebaf5ad5796483ba87473d15b7 100644 --- a/include/upgrader/streams/core/8f99b8bf-b3806687.task.php +++ b/include/upgrader/streams/core/8f99b8bf-b3806687.task.php @@ -8,7 +8,9 @@ class SequenceLoader extends MigrationTask { var $description = "Loading initial data for sequences"; function run($max_time) { - $i18n = new Internationalization('en_US'); + global $cfg; + + $i18n = new Internationalization($cfg->get('system_language', 'en_US')); $sequences = $i18n->getTemplate('sequence.yaml')->getData(); foreach ($sequences as $s) { Sequence::create($s)->save(); @@ -16,6 +18,18 @@ class SequenceLoader extends MigrationTask { db_query('UPDATE '.SEQUENCE_TABLE.' SET `next`= ' .'(SELECT MAX(ticket_id)+1 FROM '.TICKET_TABLE.') ' .'WHERE `id`=1'); + + require_once(INCLUDE_DIR . 'class.list.php'); + + $lists = $i18n->getTemplate('list.yaml')->getData(); + foreach ($lists as $l) { + DynamicList::create($l); + } + + $statuses = $i18n->getTemplate('ticket_status.yaml')->getData(); + foreach ($statuses as $s) { + TicketStatus::__create($s); + } } }