From c6554998f1e38f2be7a6955a79f3a139ad924160 Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Fri, 17 Mar 2017 15:44:01 -0400 Subject: [PATCH 1/4] NFC: fix array indentation --- CRM/Contribute/Form/ContributionView.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/CRM/Contribute/Form/ContributionView.php b/CRM/Contribute/Form/ContributionView.php index 1fc13493c9df..05d467bbc810 100644 --- a/CRM/Contribute/Form/ContributionView.php +++ b/CRM/Contribute/Form/ContributionView.php @@ -242,14 +242,13 @@ public function preProcess() { public function buildQuickForm() { $this->addButtons(array( - array( - 'type' => 'cancel', - 'name' => ts('Done'), - 'spacing' => '         ', - 'isDefault' => TRUE, - ), - ) - ); + array( + 'type' => 'cancel', + 'name' => ts('Done'), + 'spacing' => '         ', + 'isDefault' => TRUE, + ), + )); } } From 32b709b4d01d5b1dc269c6b7f9950aa34abadf3d Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Fri, 17 Mar 2017 15:48:15 -0400 Subject: [PATCH 2/4] CRM-20297 CiviContribute: avoid fatal error on line item w/o price set ---------------------------------------- * CRM-20297: Fatal error viewing a contribution having a line item with no price field https://issues.civicrm.org/jira/browse/CRM-20297 --- CRM/Contribute/Form/ContributionView.php | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/CRM/Contribute/Form/ContributionView.php b/CRM/Contribute/Form/ContributionView.php index 05d467bbc810..abf86af52f46 100644 --- a/CRM/Contribute/Form/ContributionView.php +++ b/CRM/Contribute/Form/ContributionView.php @@ -155,8 +155,23 @@ public function preProcess() { if ($id) { $lineItems = array(CRM_Price_BAO_LineItem::getLineItemsByContributionID(($id))); $firstLineItem = reset($lineItems[0]); - $priceSet = civicrm_api3('PriceSet', 'getsingle', array('id' => $firstLineItem['price_set_id'], 'return' => 'is_quick_config, id')); - $displayLineItems = !$priceSet['is_quick_config']; + if (empty($firstLineItem['price_set_id'])) { + // CRM-20297 All we care is that it's not QuickConfig, so no price set + // is no problem. + $displayLineItems = TRUE; + } + else { + try { + $priceSet = civicrm_api3('PriceSet', 'getsingle', array( + 'id' => $firstLineItem['price_set_id'], + 'return' => 'is_quick_config, id', + )); + $displayLineItems = !$priceSet['is_quick_config']; + } + catch (CiviCRM_API3_Exception $e) { + throw new CRM_Core_Exception('Cannot find price set by ID'); + } + } } $this->assign('lineItem', $lineItems); $this->assign('displayLineItems', $displayLineItems); From fa742e4ee5f6de83761b126a2e7a889aad8d4773 Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Fri, 17 Mar 2017 15:58:03 -0400 Subject: [PATCH 3/4] CRM-20297 CiviContribute: hide dash if field label missing ---------------------------------------- * CRM-20297: Fatal error viewing a contribution having a line item with no price field https://issues.civicrm.org/jira/browse/CRM-20297 --- templates/CRM/Price/Form/LineItem.tpl | 2 +- templates/CRM/Price/Page/LineItem.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/CRM/Price/Form/LineItem.tpl b/templates/CRM/Price/Form/LineItem.tpl index a8d0470397e2..4731a0de2b41 100644 --- a/templates/CRM/Price/Form/LineItem.tpl +++ b/templates/CRM/Price/Form/LineItem.tpl @@ -53,7 +53,7 @@ {foreach from=$value item=line} - {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} + {if $line.field_title && $line.html_type neq 'Text'}{$line.field_title} – {$line.label}{else}{$line.label}{/if} {if $line.description}
{$line.description}
{/if} {if $context NEQ "Membership"} {$line.qty} diff --git a/templates/CRM/Price/Page/LineItem.tpl b/templates/CRM/Price/Page/LineItem.tpl index d0ab3de21c18..21f093899a37 100644 --- a/templates/CRM/Price/Page/LineItem.tpl +++ b/templates/CRM/Price/Page/LineItem.tpl @@ -62,7 +62,7 @@ {foreach from=$value item=line} - {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description}
{/if} + {if $line.field_title && $line.html_type neq 'Text'}{$line.field_title} – {$line.label}{else}{$line.label}{/if} {if $line.description}
{$line.description}
{/if} {if $displayLineItemFinancialType} {$line.financial_type} {/if} From 4c030d3397624f8485743774651301b2a22a9923 Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Fri, 17 Mar 2017 16:43:07 -0400 Subject: [PATCH 4/4] NFC: fix bunch of hyphens used as dashes --- .../Contribute/Form/Contribution/Confirm.tpl | 4 +-- .../Form/Contribution/MembershipBlock.tpl | 2 +- .../Contribute/Form/Contribution/ThankYou.tpl | 2 +- .../Form/ContributionPage/Amount.tpl | 6 ++-- .../Form/ContributionPage/Custom.hlp | 2 +- .../Contribute/Form/ContributionPage/PCP.hlp | 2 +- .../Form/ContributionPage/Premium.tpl | 2 +- .../Form/ContributionPage/Settings.hlp | 3 +- .../Contribute/Form/ContributionPage/Tab.hlp | 10 +++--- .../Form/ContributionPage/ThankYou.hlp | 2 +- .../Form/ContributionPage/Widget.tpl | 4 +-- .../CRM/Contribute/Form/ManagePremiums.tpl | 2 +- .../CRM/Contribute/Form/Task/Invoice.hlp | 6 ++-- .../CRM/Contribute/Import/Form/DataSource.hlp | 6 ++-- .../CRM/Contribute/Import/Form/Preview.tpl | 4 +-- .../CRM/Contribute/Page/ContributionPage.hlp | 2 +- .../CRM/Contribute/Page/ContributionPage.tpl | 2 +- .../CRM/Contribute/Page/ContributionSoft.tpl | 6 ++-- .../Contribute/Page/ContributionTotals.tpl | 34 +++++++++---------- 19 files changed, 50 insertions(+), 51 deletions(-) diff --git a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl index 2067f6a0d70d..4da9603128a1 100644 --- a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl +++ b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl @@ -70,7 +70,7 @@ -------------------------------------------
{ts}Total{/ts}: {$amount+$minimum_fee|crmMoney}
{elseif $amount } - {ts}Amount{/ts}: {$amount|crmMoney} {if $amount_level } - {$amount_level} {/if} + {ts}Amount{/ts}: {$amount|crmMoney} {if $amount_level } – {$amount_level} {/if} {else} {$membership_name} {ts}Membership{/ts}: {$minimum_fee|crmMoney} {/if} @@ -79,7 +79,7 @@ {ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney}
{/if} {if $amount} - {if $installments}{ts}Installment Amount{/ts}{else}{ts}Total Amount{/ts}{/if} : {$amount|crmMoney} {if $amount_level } - {$amount_level} {/if} + {if $installments}{ts}Installment Amount{/ts}{else}{ts}Total Amount{/ts}{/if}: {$amount|crmMoney}{if $amount_level } – {$amount_level}{/if} {else} {$membership_name} {ts}Membership{/ts}: {$minimum_fee|crmMoney} {/if} diff --git a/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl b/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl index e6b5fdd3e13d..704d8f1739e0 100644 --- a/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl +++ b/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl @@ -179,7 +179,7 @@ CRM.$(function($) { {$row.name}   {if ($membershipBlock.display_min_fee AND $context EQ "makeContribution") AND $row.minimum_fee GT 0 } {if $is_separate_payment OR ! $form.amount.label} - - {$row.minimum_fee|crmMoney} + – {$row.minimum_fee|crmMoney} {else} {ts 1=$row.minimum_fee|crmMoney}(contribute at least %1 to be eligible for this membership){/ts} {/if} diff --git a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl index a03341619a8b..d5849fc2ba1a 100644 --- a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl +++ b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl @@ -118,7 +118,7 @@ {if $totalTaxAmount} {ts}Tax Amount{/ts}: {$totalTaxAmount|crmMoney}
{/if} - {if $installments}{ts}Installment Amount{/ts}{else}{ts}Amount{/ts}{/if} : {$amount|crmMoney} {if $amount_level } - {$amount_level} {/if} + {if $installments}{ts}Installment Amount{/ts}{else}{ts}Amount{/ts}{/if}: {$amount|crmMoney}{if $amount_level } – {$amount_level}{/if} {/if} {/if} {if $receive_date} diff --git a/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl b/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl index e4e272247b97..6d0b338fecd6 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl @@ -27,7 +27,7 @@ {crmRegion name="contribute-form-contributionpage-amount-main"}
- {ts}Use this form to configure Contribution Amount options. You can give contributors the ability to enter their own contribution amounts - and/or provide a fixed list of amounts. For fixed amounts, you can enter a label for each 'level' of contribution (e.g. Friend, Sustainer, etc.). If you allow people to enter their own dollar amounts, you can also set minimum and maximum values. Depending on your choice of Payment Processor, you may be able to offer a recurring contribution option.{/ts} {docURL page="user/contributions/payment-processors"} + {ts}Use this form to configure Contribution Amount options. You can give contributors the ability to enter their own contribution amounts and/or provide a fixed list of amounts. For fixed amounts, you can enter a label for each 'level' of contribution (e.g. Friend, Sustainer, etc.). If you allow people to enter their own dollar amounts, you can also set minimum and maximum values. Depending on your choice of Payment Processor, you may be able to offer a recurring contribution option.{/ts} {docURL page="user/contributions/payment-processors"}
{include file="CRM/common/formButtons.tpl" location="top"}
{if !$paymentProcessor} @@ -76,7 +76,7 @@ {$form.amount_block_is_active.label} {$form.amount_block_is_active.html}
- {ts}Uncheck this box if you are using this contribution page for membership signup and renewal only - and you do NOT want users to select or enter any additional contribution amounts.{/ts} + {ts}Uncheck this box if you are using this contribution page for membership signup and renewal only – and you do NOT want users to select or enter any additional contribution amounts.{/ts} {$form.price_set_id.label} @@ -423,7 +423,7 @@ function setDateDefaults() { {/literal}{if !$pledge_calendar_date}{literal} cj('#pledge_calendar_date').prop('disabled', 'disabled'); - cj("#pledge_calendar_date").next('input').prop('disabled', 'disabled'); + cj("#pledge_calendar_date").next('input').prop('disabled', 'disabled'); {/literal}{/if} {if !$pledge_calendar_month}{literal} diff --git a/templates/CRM/Contribute/Form/ContributionPage/Custom.hlp b/templates/CRM/Contribute/Form/ContributionPage/Custom.hlp index cf666375f27a..698aab108fb3 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Custom.hlp +++ b/templates/CRM/Contribute/Form/ContributionPage/Custom.hlp @@ -28,7 +28,7 @@ {/htxt} {htxt id="contrib-profile"}

- {ts}If you want collect additional information from contributors, you can include one or two CiviCRM Profiles - which are collections of standard or custom fields - in this contribution page. For example, you may need to collect information about the person (e.g. name and address if these are not already required by your payment processor, interest in subscribing to a newsletter or volunteering). You might also want to collect information specific to this contribution (e.g. target one or several projects or funds to support with this contribution).{/ts} + {ts}If you want collect additional information from contributors, you can include one or two CiviCRM Profiles—which are collections of standard or custom fields—in this contribution page. For example, you may need to collect information about the person (e.g. name and address if these are not already required by your payment processor, interest in subscribing to a newsletter or volunteering). You might also want to collect information specific to this contribution (e.g. target one or several projects or funds to support with this contribution).{/ts}

{ts}Your site may already have profile(s) which were previously created for this purpose, in which case you can re-use them for any number of online contribution pages.{/ts} diff --git a/templates/CRM/Contribute/Form/ContributionPage/PCP.hlp b/templates/CRM/Contribute/Form/ContributionPage/PCP.hlp index 723c2359147d..c98363e1889c 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/PCP.hlp +++ b/templates/CRM/Contribute/Form/ContributionPage/PCP.hlp @@ -51,7 +51,7 @@ {/htxt} {htxt id="id-supporter_profile"} {capture assign="createProfileURL"}{crmURL p="civicrm/admin/uf/group" q="reset=1"}{/capture} -{ts 1=$createProfileURL}This is used to collect or update basic information (e.g. name and email address) from users while they are creating a Personal Campaign Page. The profile you select must be configured with 'Account creation required' (under Profile Settings » Advanced Settings). You must include an Email address field - and you may include any number of other fields in the profile. If you don't yet have an appropriate Profile configured, you will need to create one first, and then return to this form to select it.{/ts} +{ts 1=$createProfileURL}This is used to collect or update basic information (e.g. name and email address) from users while they are creating a Personal Campaign Page. The profile you select must be configured with 'Account creation required' (under Profile Settings » Advanced Settings). You must include an Email address field—and you may include any number of other fields in the profile. If you don't yet have an appropriate Profile configured, you will need to create one first, and then return to this form to select it.{/ts} {/htxt} {htxt id="id-is_tellfriend-title"} diff --git a/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl b/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl index a55e5bf3f8ca..f52afdcfef15 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl @@ -68,7 +68,7 @@ {$form.premiums_intro_text.html}
- {ts}Enter content for the introductory message. This will be displayed below the Premiums section title. You may include HTML formatting tags. You can also include images, as long as they are already uploaded to a server - reference them using complete URLs.{/ts} + {ts}Enter content for the introductory message. This will be displayed below the Premiums section title. You may include HTML formatting tags. You can also include images, as long as they are already uploaded to a server—reference them using complete URLs.{/ts} diff --git a/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp b/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp index 222c7dd68f99..4045fff7a219 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp +++ b/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp @@ -36,7 +36,7 @@ {ts}Intro Content{/ts} {/htxt} {htxt id="id-intro_msg"} -{ts}Enter content for the introductory message. This will be displayed below the page title. You can include images, as long as they are already uploaded to a server - click the "Image" button in the button bar.{/ts} +{ts}Enter content for the introductory message. This will be displayed below the page title. You can include images, as long as they are already uploaded to a server: click the "Image" button in the button bar.{/ts} {/htxt} {htxt id="id-footer_msg-title"} @@ -83,4 +83,3 @@

{ts}When enabled, links allowing people to share this online contribution page with their social network will be displayed (e.g. Facebook "Like", Google+, and Twitter).{/ts}

{ts}Social media links will be included on the Contribution Thank-you page, Tell-a-Friend page (if enabled), and in contribution receipt emails.{/ts}

{/htxt} - diff --git a/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp b/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp index d45d03eb5db2..d7d4b268c47b 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp +++ b/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp @@ -34,7 +34,7 @@ » {ts}Amount{/ts} - {ts}Use this form to configure Contribution Amount options. You can give contributors the ability to enter their own contribution amounts - and/or provide a fixed list of amounts. For fixed amounts, you can enter a label for each 'level' of contribution (e.g. Friend, Sustainer, etc.). If you allow people to enter their own dollar amounts, you can also set minimum and maximum values. Depending on your choice of Payment Processor, you may be able to offer a recurring contribution option.{/ts} + {ts}Use this form to configure Contribution Amount options. You can give contributors the ability to enter their own contribution amounts and/or provide a fixed list of amounts. For fixed amounts, you can enter a label for each 'level' of contribution (e.g. Friend, Sustainer, etc.). If you allow people to enter their own dollar amounts, you can also set minimum and maximum values. Depending on your choice of Payment Processor, you may be able to offer a recurring contribution option.{/ts} » {ts}Memberships{/ts} @@ -42,7 +42,7 @@ » {ts}Thank-you and Receipting{/ts} - {ts}Use this form to configure the thank-you message and receipting options. Contributors will see a confirmation and thank-you page after whenever an online contribution is successfully processed. You provide the content and layout of the thank-you section below. You also control whether an electronic receipt is automatically emailed to each contributor - and can add a custom message to that receipt.{/ts} + {ts}Use this form to configure the thank-you message and receipting options. Contributors will see a confirmation and thank-you page after whenever an online contribution is successfully processed. You provide the content and layout of the thank-you section below. You also control whether an electronic receipt is automatically emailed to each contributor, and you can add a custom message to that receipt.{/ts} » {ts}Tell a Friend{/ts} @@ -52,7 +52,7 @@ » {ts}Include Profiles{/ts} {ts}You may want to collect information from contributors beyond what is required to make a contribution. For example, you may want to inquire about volunteer availability and skills. Add any number of fields to your contribution form by selecting CiviCRM Profiles (collections of fields) to include at the beginning of the page, and/or at the bottom.{/ts}
{capture assign=adminGroupURL}{crmURL p="civicrm/admin/uf/group" q="reset=1&action=browse"}{/capture} -{ts 1=$adminGroupURL}You can use existing CiviCRM Profiles on your page - OR create profile(s) specifically for use in Online Contribution pages. Go to Administer CiviCRM Profiles if you need to review, modify or create profiles (you can come back at any time to select or update the Profile(s) used for this page).{/ts} +{ts 1=$adminGroupURL}You can use existing CiviCRM Profiles on your page or create profile(s) specifically for use in Online Contribution pages. Go to Administer CiviCRM Profiles if you need to review, modify or create profiles (you can come back at any time to select or update the Profile(s) used for this page).{/ts} » {ts}Premiums{/ts} @@ -60,7 +60,7 @@ » {ts}Widget{/ts} - {ts}Widgets allow you and your supporters to easily promote this fund-raising campaign. Widget code can be added to any web page - and will provide a real-time display of current contribution results, and a direct link to this contribution page.{/ts} + {ts}Widgets allow you and your supporters to easily promote this fund-raising campaign. Widget code can be added to any web page. They will provide a real-time display of current contribution results, and a direct link to this contribution page.{/ts} » {ts}Personal Campaign Pages{/ts} @@ -68,7 +68,7 @@ » {ts}Online Contribution{/ts}
({ts}Test-drive{/ts}) - {ts}Test-drive the entire contribution process - including custom fields, confirmation, thank-you page, and receipting. Transactions will be directed to your payment processor's test server. No live financial transactions will be submitted. However, a contact record will be created or updated and a test contribution record will be saved to the database. Use obvious test contact names so you can review and delete these records as needed. Test contributions are not visible on the Contributions tab, but can be viewed by searching for 'Test Contributions' in the CiviContribute search form.{/ts} + {ts}Test-drive the entire contribution process—including custom fields, confirmation, thank-you page, and receipting. Transactions will be directed to your payment processor's test server. No live financial transactions will be submitted. However, a contact record will be created or updated and a test contribution record will be saved to the database. Use obvious test contact names so you can review and delete these records as needed. Test contributions are not visible on the Contributions tab, but can be viewed by searching for 'Test Contributions' in the CiviContribute search form.{/ts} » {ts}Online Contribution{/ts}
({ts}Live{/ts}) diff --git a/templates/CRM/Contribute/Form/ContributionPage/ThankYou.hlp b/templates/CRM/Contribute/Form/ContributionPage/ThankYou.hlp index 816a7e7f9be3..b895be580507 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/ThankYou.hlp +++ b/templates/CRM/Contribute/Form/ContributionPage/ThankYou.hlp @@ -27,7 +27,7 @@ {ts}Thank-you and Receipting{/ts} {/htxt} {htxt id="id_thank"} -

{ts}Use this form to configure the thank-you message and receipting options for this online contribution page. Contributors will see a thank-you page whenever an online contribution is successfully processed. You provide the content and layout of the thank-you section below. You also control whether an electronic receipt is automatically emailed to each contributor - and can add a custom message to that receipt.{/ts}

+

{ts}Use this form to configure the thank-you message and receipting options for this online contribution page. Contributors will see a thank-you page whenever an online contribution is successfully processed. You provide the content and layout of the thank-you section below. You also control whether an electronic receipt is automatically emailed to each contributor, and you can add a custom message to that receipt.{/ts}

{/htxt} {htxt id="id_thankyou-title-title"} diff --git a/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl b/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl index 724e9346d0dd..5265a8420742 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl @@ -33,7 +33,7 @@ {/if}
- {ts}CiviContribute widgets allow you and your supporters to easily promote this fund-raising campaign. Widget code can be added to any web page - and will provide a real-time display of current contribution results, and a direct link to this contribution page.{/ts} {help id="id-intro"} + {ts}CiviContribute widgets allow you and your supporters to easily promote this fund-raising campaign. Widget code can be added to any web page. It will provide a real-time display of current contribution results and a direct link to this contribution page.{/ts} {help id="id-intro"}
{include file="CRM/common/formButtons.tpl" location="top"}
@@ -47,7 +47,7 @@
{$form.button_title.label}{$form.button_title.html}
{$form.about.label} *{$form.about.html} -
{ts}Enter content for the about message. You may include HTML formatting tags. You can also include images, as long as they are already uploaded to a server - reference them using complete URLs.{/ts} +
{ts}Enter content for the about message. You may include HTML formatting tags. You can also include images, as long as they are already uploaded to a server—reference them using complete URLs.{/ts}
diff --git a/templates/CRM/Contribute/Form/ManagePremiums.tpl b/templates/CRM/Contribute/Form/ManagePremiums.tpl index 8fc57cd62678..954b548cbbb8 100644 --- a/templates/CRM/Contribute/Form/ManagePremiums.tpl +++ b/templates/CRM/Contribute/Form/ManagePremiums.tpl @@ -60,7 +60,7 @@

{ts}You can give this premium a picture that will be displayed on the contribution page. Both a 50 x 50 pixel thumbnail image and a 200 x 200 pixel larger image will be displayed. Images must be in GIF, JPEG, or PNG format.{/ts}

-

{ts}You can upload an image from your computer OR enter a URL for an image already on the Web. If you chose to upload an image file, a 'thumbnail' version will be automatically created for you. If you don't have an image available at this time, you may also choose to display a 'No Image Available' icon - by selecting the 'default image'.{/ts}

+

{ts}You can upload an image from your computer OR enter a URL for an image already on the Web. If you chose to upload an image file, a 'thumbnail' version will be automatically created for you. If you don't have an image available at this time, you may also choose to display a 'No Image Available' icon by selecting the 'default image'.{/ts}

{if $thumbnailUrl}{/if} diff --git a/templates/CRM/Contribute/Form/Task/Invoice.hlp b/templates/CRM/Contribute/Form/Task/Invoice.hlp index f24c2a5448b7..6d34a053d275 100644 --- a/templates/CRM/Contribute/Form/Task/Invoice.hlp +++ b/templates/CRM/Contribute/Form/Task/Invoice.hlp @@ -51,13 +51,13 @@ {/htxt} {htxt id="upload-compose"}

{ts}You can use your favorite editor to create content on your local computer and then Upload the files. OR you can Compose content directly on the screen.{/ts}

-

{ts}If you choose to compose on the screen, a basic WYSIWYG (what-you-see-is-what-you-get) editor is provided which you can use create simple HTML messages. However, if you are planning on creating HTML messages with complex layouts - it is best to use an HTML editor on your local computer. Then locate and upload the saved file(s) by clicking the Browse button.{/ts}

+

{ts}If you choose to compose on the screen, a basic WYSIWYG (what-you-see-is-what-you-get) editor is provided which you can use create simple HTML messages. However, if you are planning on creating HTML messages with complex layouts, it is best to use an HTML editor on your local computer. Then locate and upload the saved file(s) by clicking the Browse button.{/ts}

{/htxt} {htxt id="id-message-text-title"} {ts}Text Message{/ts} {/htxt} {htxt id="id-message-text"} -

{ts}You can send your email as a simple text-only message, as an HTML formatted message, or both. Text-only messages are sufficient for most email communication - and some recipients may prefer not to receive HTML formatted messages.{/ts}

-

{ts}HTML messages have more visual impact, allow you to include images, and may be more readable if you are including links to website pages. However, different email programs may interpret HTML formats differently - so use this option cautiously unless you have a template format that has been tested with different web and desktop email programs.{/ts}

+

{ts}You can send your email as a simple text-only message, as an HTML formatted message, or both. Text-only messages are sufficient for most email communication, and some recipients may prefer not to receive HTML formatted messages.{/ts}

+

{ts}HTML messages have more visual impact, allow you to include images, and may be more readable if you are including links to website pages. However, different email programs may interpret HTML formats differently, so use this option cautiously unless you have a template format that has been tested with different web and desktop email programs.{/ts}

{/htxt} diff --git a/templates/CRM/Contribute/Import/Form/DataSource.hlp b/templates/CRM/Contribute/Import/Form/DataSource.hlp index afd32c0d7550..8559bcdba39f 100644 --- a/templates/CRM/Contribute/Import/Form/DataSource.hlp +++ b/templates/CRM/Contribute/Import/Form/DataSource.hlp @@ -29,15 +29,15 @@ {htxt id='upload'}

{ts}Files to be imported must be in the 'comma-separated-values' format (CSV). Most applications will allow you to export records in CSV format. Consult the documentation for your application if you're not sure how to do this.{/ts}

{ts}Contact Records for Contributors{/ts}

-

{ts}Contribution import requires that the Contributors already exist as contact records in your CiviCRM database. If you need to import contributions for contributors who haven't been added to CiviCRM yet - you will do this in 2 steps. First, use Import Contacts to add the contact records. If possible, include a unique 'External ID' for each new contact which you can then use to match contributions to contributors. Then return to this screen and import the contribution records.{/ts}

+

{ts}Contribution import requires that the Contributors already exist as contact records in your CiviCRM database. If you need to import contributions for contributors who haven't been added to CiviCRM yet, you will do this in 2 steps. First, use Import Contacts to add the contact records. If possible, include a unique 'External ID' for each new contact which you can then use to match contributions to contributors. Then return to this screen and import the contribution records.{/ts}

{ts}Matching Contributions to Contributors{/ts}

{ts}Contribution import files must contain data needed to match the contribution to the contributor. This 'matching' can be handled in several different ways:{/ts}

  • {ts}Include the data fields used for contact 'matching' based on your configured Unsupervised Duplicate Matching rules. For the default duplicate matching rules, you would include a column in each row with the contributors' Email Address.{/ts}
  • {ts}If you've stored a unique External Identifier for each contact in CiviCRM, you can include that value as a column in your import file. Contributions will then be matched to contributors using their External ID.{/ts}
    • -
  • {ts}You can include a column with each contributor's Internal Contact ID. This is the unique ID assigned by CiviCRM which is displayed at the bottom of the Contact Summary screen - and can be exported.{/ts}
    • +
  • {ts}You can include a column with each contributor's Internal Contact ID. This is the unique ID assigned by CiviCRM which is displayed at the bottom of the Contact Summary screen and can be exported.{/ts}
-

{ts}Save the CSV file with your contributions and 'contact matching' data to your local hard drive (or an accessible drive on your network) - and you are now ready for step 1 (Upload Data).{/ts}

+

{ts}Save the CSV file with your contributions and 'contact matching' data to your local hard drive (or an accessible drive on your network). Now you are ready for step 1 (Upload Data).{/ts}

{/htxt} {htxt id="id-onDuplicate-title"} diff --git a/templates/CRM/Contribute/Import/Form/Preview.tpl b/templates/CRM/Contribute/Import/Form/Preview.tpl index 7594d9be0149..97a559e2910a 100644 --- a/templates/CRM/Contribute/Import/Form/Preview.tpl +++ b/templates/CRM/Contribute/Import/Form/Preview.tpl @@ -36,13 +36,13 @@ {if $invalidRowCount}

- {ts 1=$invalidRowCount 2=$downloadErrorRecordsUrl}CiviCRM has detected invalid data or formatting errors in %1 records. If you continue, these records will be skipped. OR, you can download a file with just these problem records - Download Errors. Then correct them in the original import file, cancel this import and begin again at step 1.{/ts} + {ts 1=$invalidRowCount 2=$downloadErrorRecordsUrl}CiviCRM has detected invalid data or formatting errors in %1 records. If you continue, these records will be skipped. You can download a file with just these problem records: Download Errors. If you wish, you can then correct them in the original import file, cancel this import, and begin again at step 1.{/ts}

{/if} {if $conflictRowCount}

- {ts 1=$conflictRowCount 2=$downloadConflictRecordsUrl}CiviCRM has detected %1 records with conflicting transaction ids within this data file. If you continue, these records will be skipped. OR, you can download a file with just these problem records - Download Conflicts. Then correct them in the original import file, cancel this import and begin again at step 1.{/ts} + {ts 1=$conflictRowCount 2=$downloadConflictRecordsUrl}CiviCRM has detected %1 records with conflicting transaction ids within this data file. If you continue, these records will be skipped. You can download a file with just these problem records: Download Conflicts. If you wish, you can then correct them in the original import file, cancel this import and begin again at step 1.{/ts}

{/if} diff --git a/templates/CRM/Contribute/Page/ContributionPage.hlp b/templates/CRM/Contribute/Page/ContributionPage.hlp index c8758173a21d..e52c16e6b8ca 100644 --- a/templates/CRM/Contribute/Page/ContributionPage.hlp +++ b/templates/CRM/Contribute/Page/ContributionPage.hlp @@ -28,7 +28,7 @@ {/htxt} {htxt id="id-intro"} {capture assign=newPageURL}{crmURL p='civicrm/admin/contribute/add' q='action=add&reset=1'}{/capture} -

{ts}CiviContribute allows you to create and maintain any number of Online Contribution Pages. You can create different pages for different programs or campaigns - and customize text, amounts, types of information collected from contributors, etc.{/ts}

+

{ts}CiviContribute allows you to create and maintain any number of Online Contribution Pages. You can create different pages for different programs or campaigns, and you can customize text, amounts, types of information collected from contributors, etc.{/ts}

{ts}For existing pages{/ts}:
  • {ts}Click Configure to view and modify settings, amounts, and text for existing pages.{/ts}
    • diff --git a/templates/CRM/Contribute/Page/ContributionPage.tpl b/templates/CRM/Contribute/Page/ContributionPage.tpl index 1424be3addba..93154a1847be 100644 --- a/templates/CRM/Contribute/Page/ContributionPage.tpl +++ b/templates/CRM/Contribute/Page/ContributionPage.tpl @@ -25,7 +25,7 @@ *} {capture assign=newPageURL}{crmURL p='civicrm/admin/contribute/add' q='action=add&reset=1'}{/capture}
    - {ts}CiviContribute allows you to create and maintain any number of Online Contribution Pages. You can create different pages for different programs or campaigns - and customize text, amounts, types of information collected from contributors, etc.{/ts} {help id="id-intro"} + {ts}CiviContribute allows you to create and maintain any number of Online Contribution Pages. You can create different pages for different programs or campaigns, and you can customize text, amounts, types of information collected from contributors, etc.{/ts} {help id="id-intro"}
    {include file="CRM/Contribute/Form/SearchContribution.tpl"} diff --git a/templates/CRM/Contribute/Page/ContributionSoft.tpl b/templates/CRM/Contribute/Page/ContributionSoft.tpl index 0f73b847b91b..62ca07c90794 100644 --- a/templates/CRM/Contribute/Page/ContributionSoft.tpl +++ b/templates/CRM/Contribute/Page/ContributionSoft.tpl @@ -29,12 +29,12 @@
Current Image Thumbnail
{if $softCreditTotals.amount} - + - + {/if} {if $softCreditTotals.cancelAmount} - + {/if}
{ts}Total Soft Credits{/ts} - {$softCreditTotals.amount|crmMoney:$softCreditTotals.currency}{ts}Total Soft Credits{/ts} – {$softCreditTotals.amount|crmMoney:$softCreditTotals.currency}     {ts}Avg Soft Credits{/ts} - {$softCreditTotals.avg|crmMoney:$softCreditTotals.currency}   {ts}Avg Soft Credits{/ts} – {$softCreditTotals.avg|crmMoney:$softCreditTotals.currency}   {ts}Total Cancelled Soft Credits{/ts} - {$softCreditTotals.cancelAmount|crmMoney:$softCreditTotals.currency}   {ts}Total Cancelled Soft Credits{/ts} – {$softCreditTotals.cancelAmount|crmMoney:$softCreditTotals.currency}
diff --git a/templates/CRM/Contribute/Page/ContributionTotals.tpl b/templates/CRM/Contribute/Page/ContributionTotals.tpl index f0e96de246a8..0bc1633179a1 100644 --- a/templates/CRM/Contribute/Page/ContributionTotals.tpl +++ b/templates/CRM/Contribute/Page/ContributionTotals.tpl @@ -29,9 +29,9 @@ {if $annual.count} - {ts}Current Year-to-Date{/ts} - {$annual.amount} -   {ts}# Completed Contributions{/ts} - {$annual.count} -   {ts}Avg Amount{/ts} - {$annual.avg} + {ts}Current Year-to-Date{/ts} – {$annual.amount} +   {ts}# Completed Contributions{/ts} – {$annual.count} +   {ts}Avg Amount{/ts} – {$annual.avg} {if $contributionSummary.cancel.amount}   {/if} @@ -42,29 +42,29 @@ {if $contributionSummary.total.amount} {if $contributionSummary.total.currencyCount gt 1} - {ts}Total{/ts} - {$contributionSummary.total.amount} -   {ts}# Completed{/ts} - {$contributionSummary.total.count} + {ts}Total{/ts} – {$contributionSummary.total.amount} +   {ts}# Completed{/ts} – {$contributionSummary.total.count} - {ts}Avg{/ts} - {$contributionSummary.total.avg} -   {ts}Median{/ts} - {$contributionSummary.total.median} -   {ts}Mode{/ts} - {$contributionSummary.total.mode} + {ts}Avg{/ts} – {$contributionSummary.total.avg} +   {ts}Median{/ts} – {$contributionSummary.total.median} +   {ts}Mode{/ts} – {$contributionSummary.total.mode} {else} - {ts}Total{/ts} - {$contributionSummary.total.amount} -   {ts}# Completed{/ts} - {$contributionSummary.total.count} -   {ts}Avg{/ts} - {$contributionSummary.total.avg} -   {ts}Median{/ts} - {$contributionSummary.total.median} -   {ts}Mode{/ts} - {$contributionSummary.total.mode} + {ts}Total{/ts} – {$contributionSummary.total.amount} +   {ts}# Completed{/ts} – {$contributionSummary.total.count} +   {ts}Avg{/ts} – {$contributionSummary.total.avg} +   {ts}Median{/ts} – {$contributionSummary.total.median} +   {ts}Mode{/ts} – {$contributionSummary.total.mode} {/if} {/if} {if $contributionSummary.cancel.amount} -   {ts}Total Cancelled Amount{/ts} - {$contributionSummary.cancel.amount} +   {ts}Total Cancelled Amount{/ts} – {$contributionSummary.cancel.amount} {/if} {if $contributionSummary.soft_credit.count} - {ts}Total Soft Credit Amount{/ts} - {$contributionSummary.soft_credit.amount} -   {ts}# Completed Soft Credits{/ts} - {$contributionSummary.soft_credit.count} -   {ts}Avg Soft Credit Amount{/ts} - {$contributionSummary.soft_credit.avg} + {ts}Total Soft Credit Amount{/ts} – {$contributionSummary.soft_credit.amount} +   {ts}# Completed Soft Credits{/ts} – {$contributionSummary.soft_credit.count} +   {ts}Avg Soft Credit Amount{/ts} – {$contributionSummary.soft_credit.avg} {/if} {/if}