Translation for placeholder labels

This commit is contained in:
Nathan Gray 2011-07-05 21:44:21 +00:00
parent 5740888427
commit aab8157907
2 changed files with 3 additions and 1 deletions

View File

@ -63,6 +63,7 @@ abstract class bo_merge
*/ */
function __construct() function __construct()
{ {
translation::add_app('addressbook');
$this->contacts = new addressbook_bo(); $this->contacts = new addressbook_bo();
$this->datetime_format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].' '. $this->datetime_format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].' '.

View File

@ -134,6 +134,7 @@ class infolog_merge extends bo_merge
$n = 0; $n = 0;
$tracking = new infolog_tracking($this->bo); $tracking = new infolog_tracking($this->bo);
$fields = array('info_id' => lang('Infolog ID'), 'pm_id' => lang('Project ID'), 'project' => lang('Project name')) + $tracking->field2label; $fields = array('info_id' => lang('Infolog ID'), 'pm_id' => lang('Project ID'), 'project' => lang('Project name')) + $tracking->field2label;
translation::add_app('projectmanager');
foreach($fields as $name => $label) foreach($fields as $name => $label)
{ {
if (in_array($name,array('custom'))) continue; // dont show them if (in_array($name,array('custom'))) continue; // dont show them
@ -144,7 +145,7 @@ class infolog_merge extends bo_merge
$n++; $n++;
} }
if (!($n&1)) echo '<tr>'; if (!($n&1)) echo '<tr>';
echo '<td>{{'.$name.'}}</td><td>'.$label.'</td>'; echo '<td>{{'.$name.'}}</td><td>'.lang($label).'</td>';
if ($n&1) echo "</tr>\n"; if ($n&1) echo "</tr>\n";
$n++; $n++;
} }