extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-31 19:19:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change display of placeholder tags from 2432...2432 to {{...}}

Browse Source
This commit is contained in:
Nathan Gray 2011-02-18 17:07:16 +00:00
parent 3296d09385
commit 1280527169
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
timesheet/inc/class.timesheet_hooks.inc.php
View File

@ -173,7 +173,7 @@ class timesheet_hooks
'label' => 'Default document to insert entries', 'label' => 'Default document to insert entries',
'name' => 'default_document', 'name' => 'default_document',
'help' => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the contact data inserted.','timesheet').' '. 'help' => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the contact data inserted.','timesheet').' '.
lang('The document can contain placeholder like $$ts_title$$, to be replaced with the contact data (%1full list of placeholder names%2).','<a href="'.$link.'" target="_blank">','</a>').' '. lang('The document can contain placeholder like {{ts_title}}, to be replaced with the contact data (%1full list of placeholder names%2).','<a href="'.$link.'" target="_blank">','</a>').' '.
lang('At the moment the following document-types are supported:').'*.rtf, *.txt', lang('At the moment the following document-types are supported:').'*.rtf, *.txt',
'run_lang' => false, 'run_lang' => false,
'xmlrpc' => True, 'xmlrpc' => True,
@ -185,7 +185,7 @@ class timesheet_hooks
'label' => 'Directory with documents to insert entries', 'label' => 'Directory with documents to insert entries',
'name' => 'document_dir', 'name' => 'document_dir',
'help' => lang('If you specify a directory (full vfs path) here, eGroupWare displays an action for each document. That action allows to download the specified document with the %1 data inserted.', lang('timesheet')).' '. 'help' => lang('If you specify a directory (full vfs path) here, eGroupWare displays an action for each document. That action allows to download the specified document with the %1 data inserted.', lang('timesheet')).' '.
lang('The document can contain placeholder like $$ts_title$$, to be replaced with the contact data (%1full list of placeholder names%2).','<a href="'.$link.'" target="_blank">','</a>').' '. lang('The document can contain placeholder like {{ts_title}}, to be replaced with the contact data (%1full list of placeholder names%2).','<a href="'.$link.'" target="_blank">','</a>').' '.
lang('At the moment the following document-types are supported:').'*.rtf, *.txt', lang('At the moment the following document-types are supported:').'*.rtf, *.txt',
'run_lang' => false, 'run_lang' => false,
'xmlrpc' => True, 'xmlrpc' => True,

18
timesheet/inc/class.timesheet_merge.inc.php
View File

@ -141,7 +141,7 @@ class timesheet_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>'.$label.'</td>';
if ($n&1) echo "</tr>\n"; if ($n&1) echo "</tr>\n";
$n++; $n++;
} }
@ -149,7 +149,7 @@ class timesheet_merge extends bo_merge
echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>"; echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>";
foreach($this->bo->customfields as $name => $field) foreach($this->bo->customfields as $name => $field)
{ {
echo '<tr><td>$$#'.$name.'$$</td><td colspan="3">'.$field['label']."</td></tr>\n"; echo '<tr><td>{{#'.$name.'}}</td><td colspan="3">'.$field['label']."</td></tr>\n";
} }
echo '<tr><td colspan="4"><h3>'.lang('Project fields').':</h3></td></tr>'; echo '<tr><td colspan="4"><h3>'.lang('Project fields').':</h3></td></tr>';
@ -158,7 +158,7 @@ class timesheet_merge extends bo_merge
foreach($pm_merge->projectmanager_fields as $name => $label) foreach($pm_merge->projectmanager_fields as $name => $label)
{ {
if (!($n&1)) echo '<tr>'; if (!($n&1)) echo '<tr>';
echo '<td>$$ts_project/'.$name.'$$</td><td>'.$label.'</td>'; echo '<td>{{ts_project/'.$name.'}}</td><td>'.$label.'</td>';
if ($n&1) echo "</tr>\n"; if ($n&1) echo "</tr>\n";
$n++; $n++;
} }
@ -171,14 +171,14 @@ class timesheet_merge extends bo_merge
'pagerepeat' => lang('For serial letter use this tag. Put the content, you want to repeat between two Tags.'), 'pagerepeat' => lang('For serial letter use this tag. Put the content, you want to repeat between two Tags.'),
'label' => lang('Use this tag for addresslabels. Put the content, you want to repeat, between two tags.'), 'label' => lang('Use this tag for addresslabels. Put the content, you want to repeat, between two tags.'),
'labelplacement' => lang('Tag to mark positions for address labels'), 'labelplacement' => lang('Tag to mark positions for address labels'),
'IF fieldname' => lang('Example $$IF n_prefix~Mr~Hello Mr.~Hello Ms.$$ - search the field "n_prefix", for "Mr", if found, write Hello Mr., else write Hello Ms.'), 'IF fieldname' => lang('Example {{IF n_prefix~Mr~Hello Mr.~Hello Ms.}} - search the field "n_prefix", for "Mr", if found, write Hello Mr., else write Hello Ms.'),
'NELF' => lang('Example $$NELF role$$ - if field role is not empty, you will get a new line with the value of field role'), 'NELF' => lang('Example {{NELF role}} - if field role is not empty, you will get a new line with the value of field role'),
'NENVLF' => lang('Example $$NELFNV role$$ - if field role is not empty, set a LF without any value of the field'), 'NENVLF' => lang('Example {{NELFNV role}} - if field role is not empty, set a LF without any value of the field'),
'LETTERPREFIX' => lang('Example $$LETTERPREFIX$$ - Gives a letter prefix without double spaces, if the title is emty for example'), 'LETTERPREFIX' => lang('Example {{LETTERPREFIX}} - Gives a letter prefix without double spaces, if the title is emty for example'),
'LETTERPREFIXCUSTOM' => lang('Example $$LETTERPREFIXCUSTOM n_prefix title n_family$$ - Example: Mr Dr. James Miller'), 'LETTERPREFIXCUSTOM' => lang('Example {{LETTERPREFIXCUSTOM n_prefix title n_family}} - Example: Mr Dr. James Miller'),
) as $name => $label) ) as $name => $label)
{ {
echo '<tr><td>$$'.$name.'$$</td><td colspan="3">'.$label."</td></tr>\n"; echo '<tr><td>{{'.$name.'}}</td><td colspan="3">'.$label."</td></tr>\n";
} }
echo "</table>\n"; echo "</table>\n";