Merge pull request #6205 from Edzelopez/CRM-16835

[civicrm-core.git] / templates / CRM / Admin / Form / Preferences / Address.hlp

diff --git a/templates/CRM/Admin/Form/Preferences/Address.hlp b/templates/CRM/Admin/Form/Preferences/Address.hlp
index 69299fd6a48dcb4dde5b7eedef5431a0bd4e0a36..1a2df34a18a01e1cc9c3cdf9a86b2cae74283c41 100644 (file)
--- a/templates/CRM/Admin/Form/Preferences/Address.hlp
+++ b/templates/CRM/Admin/Form/Preferences/Address.hlp
@@ -1,8 +1,8 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -27,19 +27,15 @@
   {ts}Mailing Label Tokens{/ts}
 {/htxt}
 {htxt id="label-tokens"}
-<p>{ts}Configure mailing labels for your site using tokens, which are replaced by contact field values when the labels are generated.
-Place your cursor within the Mailing Labels box where you want to the token to be inserted. Then click the "Insert Tokens" link
-to see a list of available tokens (including custom fields). Insert the token by clicking the desired token name.{/ts}</p>
+{capture assign="example"}{ldelim}contact.custom_12{rdelim}{/capture}
+<p>{ts}Configure mailing labels for your site using tokens, which are replaced by contact field values when the labels are generated. Place your cursor within the Mailing Labels box where you want to the token to be inserted. Then click the "Insert Tokens" link to see a list of available tokens (including custom fields). Insert the token by clicking the desired token name.{/ts}</p>
 <ul>
   <li>{ts}Address field values are taken from the contact's <strong>primary</strong> location.{/ts}</li>
   <li>{ts 1=&#123;contact.state_province&#125; 2=&#123;contact.state_province_name&#125;}Use the %1 token for state/province abbreviation or %2 for full state/province name.{/ts}</li>
   <li>{ts}Add spaces or punctuation to layout by surrounding them with brackets.{/ts}
     <ul><li>{ts}EXAMPLE:{/ts} {literal}{, }{/literal}</li></ul></li>
   <li>{ts}If you want to include the county in your mailing labels, the <strong>County</strong> checkbox must be checked in the Address Editing section on this screen, and county names must be added to the civicrm_county table in your database.{/ts}</li>
-  <li>{ts}Custom tokens (based on custom data) can be added for organizations as well. These tokens will not be displayed in the list of available tokens,
-  but can be added manually. The format is {literal}{contact.custom_12}{/literal} – where 12 is the ID of the custom data field. To find the custom data field ID,
-  go Administer > Customize Data & Screens > Custom Fields and click ‘edit’ on the field you want to use. Look at the URL. The last part of the URL will
-  be an equal sign and a number (=12). The number (12 in this example) is the id of that custom field.{/ts}</li>
+  <li>{ts 1=$example}Custom tokens (based on custom data) can be added for organizations as well. These tokens will not be displayed in the list of available tokens, but can be added manually. The format is %1 – where 12 is the ID of the custom data field. To find the custom data field ID, go Administer > Customize Data & Screens > Custom Fields and click ‘edit’ on the field you want to use. Look at the URL. The last part of the URL will be an equal sign and a number (=12). The number (12 in this example) is the id of that custom field.{/ts}</li>
 </ul>
 {/htxt}