diff --git a/calendar/inc/class.calendar_hooks.inc.php b/calendar/inc/class.calendar_hooks.inc.php index e6f7438d5d..3ef36e588f 100644 --- a/calendar/inc/class.calendar_hooks.inc.php +++ b/calendar/inc/class.calendar_hooks.inc.php @@ -592,7 +592,7 @@ class calendar_hooks '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.',lang('calendar')).' '. - lang('The document can contain placeholder like $$calendar_title$$, to be replaced with the contact data (%1full list of placeholder names%2).','','').' '. + lang('The document can contain placeholder like {{calendar_title}}, to be replaced with the contact data (%1full list of placeholder names%2).','','').' '. lang('At the moment the following document-types are supported:').'*.rtf, *.txt', 'run_lang' => false, 'xmlrpc' => True, @@ -604,7 +604,7 @@ class calendar_hooks 'label' => 'Directory with documents to insert entries', 'name' => 'document_dir', 'help' => lang('If you specify a directory (full vfs path) here, %1 displays an action for each document. That action allows to download the specified document with the infolog data inserted.',lang('calendar')).' '. - lang('The document can contain placeholder like $$calendar_title$$, to be replaced with the contact data (%1full list of placeholder names%2).','','').' '. + lang('The document can contain placeholder like {{calendar_title}}, to be replaced with the contact data (%1full list of placeholder names%2).','','').' '. lang('At the moment the following document-types are supported:').'*.rtf, *.txt', 'run_lang' => false, 'xmlrpc' => True, diff --git a/calendar/inc/class.calendar_merge.inc.php b/calendar/inc/class.calendar_merge.inc.php index 8e1e2dfd13..6390924b55 100644 --- a/calendar/inc/class.calendar_merge.inc.php +++ b/calendar/inc/class.calendar_merge.inc.php @@ -433,7 +433,7 @@ class calendar_merge extends bo_merge $n++; } if (!($n&1)) echo ''; - echo '$$'.$name.'$$'.$label.''; + echo '{{'.$name.'}}'.$label.''; if ($n&1) echo "\n"; $n++; } @@ -442,22 +442,22 @@ class calendar_merge extends bo_merge echo ''.lang('If you select a range (month, week, etc) instead of a list of entries, these extra fields are available').''; foreach(self::$range_tags as $name => $format) { - echo '$$range/'.$name.'$$'.lang($name)."\n"; + echo '{{range/'.$name.'}}'.lang($name)."\n"; } echo '

'.lang('Custom fields').":

"; $custom = config::get_customfields('calendar'); foreach($custom as $name => $field) { - echo '$$#'.$name.'$$'.$field['label']."\n"; + echo '{{#'.$name.'}}'.$field['label']."\n"; } echo '

'.lang('Participant table').":

"; - echo '$$table/participant$$ ... '; - echo '$$name$$'.lang('name').''; - echo '$$role$$'.lang('role').''; - echo '$$quantity$$'.lang('quantity').''; - echo '$$status$$'.lang('status').''; - echo '$$endtable$$'; + echo '{{table/participant}} ... '; + echo '{{name}}'.lang('name').''; + echo '{{role}}'.lang('role').''; + echo '{{quantity}}'.lang('quantity').''; + echo '{{status}}'.lang('status').''; + echo '{{endtable}}'; echo ''; echo '"; @@ -469,16 +469,16 @@ class calendar_merge extends bo_merge ksort($days); foreach($days as $day) { - echo ''; + echo ''; } echo '

'.lang('Day of week tables').":

$$table/'.$day. '$$ ... $$endtable$$
{{table/'.$day. '}} ... {{endtable}}
'; echo '"; foreach(self::$relative as $key => $value) { - echo ''; + echo ''; } - echo ''; + echo ''; echo '

'.lang('Daily tables').":

$$table/'.$value. '$$ ... $$endtable$$
{{table/'.$value. '}} ... {{endtable}}
$$table/day_n$$ ... $$endtable$$1 <= n <= 31
{{table/day_n}} ... {{endtable}}1 <= n <= 31
'; - echo '$$day/date$$'.lang('Date for the day of the week, available for the first entry inside each day of week or daily table inside the selected range.').''; + echo '{{day/date}}'.lang('Date for the day of the week, available for the first entry inside each day of week or daily table inside the selected range.').''; echo '

'.lang('General fields:')."

"; foreach(array( @@ -488,14 +488,14 @@ class calendar_merge extends bo_merge '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 '$$'.$name.'$$'.$label."\n"; + echo '{{'.$name.'}}'.$label."\n"; } echo "\n";