diff --git a/include/class.forms.php b/include/class.forms.php index 02758818d28e63519f08b5d6e4dc53e761988478..60aca0e94dbbbec9491b9380f8732e2e7ea1f425 100644 --- a/include/class.forms.php +++ b/include/class.forms.php @@ -811,8 +811,8 @@ class FormField { } function getTranslateTag($subtag) { - return _H(sprintf('field.%s.%s.%s', $subtag, $this->get('id'), - $this->get('form_id', '*internal*'))); + return _H(sprintf('field.%s.%s%s', $subtag, $this->get('id'), + $this->get('form_id') ? '' : '*internal*')); } function getLocal($subtag, $default=false) { $tag = $this->getTranslateTag($subtag); diff --git a/include/client/view.inc.php b/include/client/view.inc.php index d2f55a008414ecd6ed265549f097db4dc2e8a949..2a98a5c72acd99ddf44cd9f5a0fef896ef7dc23d 100644 --- a/include/client/view.inc.php +++ b/include/client/view.inc.php @@ -51,7 +51,7 @@ if ($thisclient && $thisclient->isGuest() <table class="infoTable" cellspacing="1" cellpadding="3" width="100%" border="0"> <tr> <th width="100"><?php echo __('Ticket Status');?>:</th> - <td><?php echo $ticket->getStatus(); ?></td> + <td><?php echo ($S = $ticket->getStatus()) ? $S->getLocalName() : ''; ?></td> </tr> <tr> <th><?php echo __('Department');?>:</th>