From 56cd0d57792223d9972509627535ace2dd51af6a Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Fri, 18 Feb 2011 16:59:52 +0000 Subject: [PATCH] Change display of placeholder tags from 2432...2432 to {{...}} --- .../inc/class.addressbook_hooks.inc.php | 4 ++-- .../inc/class.addressbook_merge.inc.php | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/addressbook/inc/class.addressbook_hooks.inc.php b/addressbook/inc/class.addressbook_hooks.inc.php index c113c0129d..67224c2795 100644 --- a/addressbook/inc/class.addressbook_hooks.inc.php +++ b/addressbook/inc/class.addressbook_hooks.inc.php @@ -257,7 +257,7 @@ class addressbook_hooks 'label' => 'Default document to insert contacts', 'name' => 'default_document', 'help' => lang('If you specify a document (full vfs path) here, addressbook displays an extra document icon for each address. That icon allows to download the specified document with the contact data inserted.').' '. - lang('The document can contain placeholder like $$n_fn$$, to be replaced with the contact data (%1full list of placeholder names%2).','','').' '. + lang('The document can contain placeholder like {{n_fn}}, 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, @@ -269,7 +269,7 @@ class addressbook_hooks 'label' => 'Directory with documents to insert contacts', 'name' => 'document_dir', 'help' => lang('If you specify a directory (full vfs path) here, addressbook displays an action for each document. That action allows to download the specified document with the contact data inserted.').' '. - lang('The document can contain placeholder like $$n_fn$$, to be replaced with the contact data (%1full list of placeholder names%2).','','').' '. + lang('The document can contain placeholder like {{n_fn}}, 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/addressbook/inc/class.addressbook_merge.inc.php b/addressbook/inc/class.addressbook_merge.inc.php index cab9ed2ad2..920f49eb64 100644 --- a/addressbook/inc/class.addressbook_merge.inc.php +++ b/addressbook/inc/class.addressbook_merge.inc.php @@ -143,11 +143,11 @@ class addressbook_merge extends bo_merge $n++; } if (!($n&1)) echo ''; - echo '$$'.$name.'$$'.$label.''; + echo '{{'.$name.'}}'.$label.''; if($name == 'cat_id') { if ($n&1) echo "\n"; - echo '$$categories$$'.lang('Category path').''; + echo '{{categories}}'.lang('Category path').''; $n++; } if ($n&1) echo "\n"; @@ -157,7 +157,7 @@ class addressbook_merge extends bo_merge echo '

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

"; foreach($this->contacts->customfields as $name => $field) { - echo '$$#'.$name.'$$'.$field['label']."\n"; + echo '{{#'.$name.'}}'.$field['label']."\n"; } echo '

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

"; @@ -168,14 +168,14 @@ class addressbook_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"; } $GLOBALS['egw']->translation->add_app('calendar'); @@ -208,7 +208,7 @@ class addressbook_merge extends bo_merge $n++; } if (!($n&1)) echo ''; - echo '$$calendar/#/'.$name.'$$'.$label.''; + echo '{{calendar/#/'.$name.'}}'.$label.''; if ($n&1) echo "\n"; $n++; }