From: <nat...@us...> - 2011-02-18 17:07:24
|
Author: nathangray Date: Fri Feb 18 18:07:16 2011 New Revision: 33853 URL: http://www.egroupware.org/viewvc/egroupware?rev=33853&view=rev Log: Change display of placeholder tags from 2432...2432 to {{...}} Modified: trunk/timesheet/inc/class.timesheet_hooks.inc.php trunk/timesheet/inc/class.timesheet_merge.inc.php Modified: trunk/timesheet/inc/class.timesheet_hooks.inc.php URL: http://www.egroupware.org/viewvc/egroupware/trunk/timesheet/inc/class.timesheet_hooks.inc.php?rev=33853&r1=33852&r2=33853&view=diff ============================================================================== --- trunk/timesheet/inc/class.timesheet_hooks.inc.php (original) +++ trunk/timesheet/inc/class.timesheet_hooks.inc.php Fri Feb 18 18:07:16 2011 @@ -173,7 +173,7 @@ 'label' => 'Default document to insert entries', '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').' '. - 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', 'run_lang' => false, 'xmlrpc' => True, @@ -185,7 +185,7 @@ 'label' => 'Directory with documents to insert entries', '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')).' '. - 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', 'run_lang' => false, 'xmlrpc' => True, Modified: trunk/timesheet/inc/class.timesheet_merge.inc.php URL: http://www.egroupware.org/viewvc/egroupware/trunk/timesheet/inc/class.timesheet_merge.inc.php?rev=33853&r1=33852&r2=33853&view=diff ============================================================================== --- trunk/timesheet/inc/class.timesheet_merge.inc.php (original) +++ trunk/timesheet/inc/class.timesheet_merge.inc.php Fri Feb 18 18:07:16 2011 @@ -141,7 +141,7 @@ $n++; } 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"; $n++; } @@ -149,7 +149,7 @@ echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>"; 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>'; @@ -158,7 +158,7 @@ foreach($pm_merge->projectmanager_fields as $name => $label) { 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"; $n++; } @@ -171,14 +171,14 @@ '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.'), '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.'), - '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'), - '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'), + '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'), + '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'), + 'LETTERPREFIXCUSTOM' => lang('Example {{LETTERPREFIXCUSTOM n_prefix title n_family}} - Example: Mr Dr. James Miller'), ) 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"; |