From 13a3d2142f2600376f73c5b43f3a4db9d3a3e49d Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Wed, 13 May 2020 14:10:44 -0400 Subject: [PATCH] Add aria-hidden to extant icons --- CRM/Activity/BAO/Activity.php | 2 +- CRM/Activity/Page/AJAX.php | 6 ++-- CRM/Case/BAO/Case.php | 2 +- CRM/Contact/BAO/Relationship.php | 2 +- CRM/Core/BAO/File.php | 18 +++++----- CRM/Core/Controller.php | 4 +-- CRM/Core/Form/Renderer.php | 2 +- CRM/Core/Smarty/plugins/block.crmButton.php | 2 +- CRM/Utils/Check/Component/Schema.php | 4 +-- ang/api4Explorer/Clause.html | 4 +-- ang/api4Explorer/Explorer.html | 20 +++++------ ang/crmCaseType.js | 6 ++-- ang/crmCaseType/activityTypesTable.html | 4 +-- ang/crmCaseType/list.html | 2 +- ang/crmCaseType/sequenceTable.html | 4 +-- ang/crmCaseType/statusTable.html | 2 +- ang/crmCaseType/timelineTable.html | 4 +-- ang/crmCxn/ManageCtrl.html | 2 +- ang/crmMailing/BlockPreview.js | 2 +- ang/crmMailing/EmailBodyCtrl/tokenAlert.html | 10 +++--- ang/crmMailing/Recipients.js | 2 +- ang/crmMailingAB/ListCtrl.html | 4 +-- ang/crmStatusPage/StatusPage.html | 2 +- ang/crmUi.js | 4 +-- ang/crmUi/tabset.html | 2 +- ang/exportui/exportField.html | 2 +- js/crm.datepicker.js | 2 +- js/crm.menubar.js | 2 +- js/jquery/jquery.crmEditable.js | 6 ++-- js/jquery/jquery.crmIconPicker.js | 2 +- js/jquery/jquery.dashboard.js | 2 +- js/view/crm.designer.js | 2 +- templates/CRM/ACL/Page/ACLBasic.tpl | 2 +- templates/CRM/Activity/Form/Activity.tpl | 10 +++--- templates/CRM/Activity/Form/ActivityLinks.tpl | 2 +- templates/CRM/Activity/Form/ActivityView.tpl | 6 ++-- .../CRM/Activity/Import/Form/Preview.tpl | 2 +- templates/CRM/Admin/Form/Options.tpl | 2 +- .../CRM/Admin/Form/Preferences/Display.tpl | 2 +- templates/CRM/Admin/Form/WordReplacements.tpl | 2 +- templates/CRM/Admin/Page/APIExplorer.js | 6 ++-- templates/CRM/Admin/Page/APIExplorer.tpl | 28 +++++++-------- templates/CRM/Admin/Page/Access.tpl | 8 ++--- templates/CRM/Admin/Page/CKEditorConfig.tpl | 4 +-- templates/CRM/Admin/Page/Job.tpl | 2 +- templates/CRM/Admin/Page/JobLog.tpl | 4 +-- templates/CRM/Admin/Page/Navigation.tpl | 2 +- templates/CRM/Admin/Page/OptionGroup.tpl | 2 +- templates/CRM/Admin/Page/Options.tpl | 2 +- .../CRM/Admin/Page/PaymentProcessorType.tpl | 2 +- templates/CRM/Admin/Page/Setting.tpl | 28 +++++++-------- templates/CRM/Badge/Form/Layout.tpl | 4 +-- templates/CRM/Batch/Form/Entry.tpl | 2 +- templates/CRM/Campaign/Form/ResultOptions.tpl | 4 +-- templates/CRM/Campaign/Page/Petition.tpl | 4 +-- templates/CRM/Case/Form/Activity.tpl | 8 ++--- templates/CRM/Case/Form/ActivityView.tpl | 6 ++-- templates/CRM/Case/Form/CaseView.tpl | 22 ++++++------ templates/CRM/Case/Form/Selector.tpl | 2 +- templates/CRM/Case/Page/DashBoard.tpl | 4 +-- templates/CRM/Case/Page/Tab.tpl | 2 +- templates/CRM/Contact/Form/Contact.tpl | 2 +- templates/CRM/Contact/Form/Domain.tpl | 2 +- templates/CRM/Contact/Form/Edit/Address.tpl | 2 +- templates/CRM/Contact/Form/Merge.tpl | 10 +++--- .../Contact/Form/Search/AdvancedCriteria.tpl | 4 +-- .../Form/Search/Criteria/SearchSettings.tpl | 2 +- .../Contact/Form/Search/Custom/FullText.tpl | 14 ++++---- templates/CRM/Contact/Form/Search/Intro.tpl | 4 +-- .../CRM/Contact/Form/Search/ResultTasks.tpl | 8 ++--- templates/CRM/Contact/Form/Search/table.tpl | 2 +- templates/CRM/Contact/Form/Selector.tpl | 2 +- templates/CRM/Contact/Form/Task/Email.tpl | 4 +-- templates/CRM/Contact/Import/Form/Preview.tpl | 4 +-- templates/CRM/Contact/Import/Form/Summary.tpl | 8 ++--- templates/CRM/Contact/Page/CustomSearch.tpl | 2 +- .../CRM/Contact/Page/DashBoardDashlet.tpl | 4 +-- templates/CRM/Contact/Page/Dashlet.tpl | 6 ++-- .../CRM/Contact/Page/DedupeException.tpl | 4 +-- templates/CRM/Contact/Page/DedupeFind.tpl | 16 ++++----- templates/CRM/Contact/Page/Inline/Address.tpl | 4 +-- .../Page/Inline/CommunicationPreferences.tpl | 2 +- .../CRM/Contact/Page/Inline/ContactInfo.tpl | 2 +- .../CRM/Contact/Page/Inline/ContactName.tpl | 2 +- .../CRM/Contact/Page/Inline/Demographics.tpl | 2 +- templates/CRM/Contact/Page/Inline/Email.tpl | 2 +- templates/CRM/Contact/Page/Inline/IM.tpl | 2 +- templates/CRM/Contact/Page/Inline/OpenID.tpl | 2 +- templates/CRM/Contact/Page/Inline/Phone.tpl | 2 +- templates/CRM/Contact/Page/Inline/Website.tpl | 2 +- .../Contact/Page/View/CustomDataFieldView.tpl | 2 +- templates/CRM/Contact/Page/View/Note.tpl | 8 ++--- .../Contact/Page/View/RelationshipPerm.tpl | 4 +-- templates/CRM/Contact/Page/View/Summary.tpl | 2 +- .../CRM/Contribute/Form/AdditionalPayment.tpl | 2 +- .../CRM/Contribute/Form/Contribution.tpl | 4 +-- .../Form/Contribution/PreviewHeader.tpl | 2 +- .../Contribute/Form/Contribution/ThankYou.tpl | 4 +-- .../Contribute/Form/ContributionPage/Tab.hlp | 22 ++++++------ .../Form/ContributionPage/Widget.tpl | 2 +- .../CRM/Contribute/Form/ContributionView.tpl | 16 ++++----- .../CRM/Contribute/Form/PCP/PCPAccount.tpl | 2 +- .../CRM/Contribute/Form/PaymentInfoBlock.tpl | 2 +- templates/CRM/Contribute/Form/SoftCredit.tpl | 2 +- .../CRM/Contribute/Page/ContributionPage.tpl | 2 +- templates/CRM/Contribute/Page/DashBoard.tpl | 2 +- templates/CRM/Contribute/Page/Premium.tpl | 2 +- templates/CRM/Contribute/Page/Tab.tpl | 4 +-- .../CRM/Contribute/Page/UserDashboard.tpl | 2 +- templates/CRM/Core/I18n/Dialog.tpl | 2 +- .../CRM/Core/Page/RecurringEntityPreview.tpl | 2 +- templates/CRM/Custom/Form/Edit/CustomData.tpl | 2 +- templates/CRM/Custom/Form/Field.tpl | 4 +-- templates/CRM/Custom/Form/Optionfields.tpl | 4 +-- templates/CRM/Custom/Page/CustomDataView.tpl | 4 +-- templates/CRM/Dashlet/Page/Blog.tpl | 2 +- templates/CRM/Dashlet/Page/CaseDashboard.tpl | 8 ++--- templates/CRM/Event/Cart/Page/ViewCart.tpl | 4 +-- templates/CRM/Event/Form/EventFees.tpl | 2 +- .../Form/ManageEvent/ConfirmRepeatMode.tpl | 2 +- .../CRM/Event/Form/ManageEvent/EventInfo.tpl | 2 +- .../Event/Form/ManageEvent/Registration.tpl | 16 ++++----- templates/CRM/Event/Form/ManageEvent/Tab.hlp | 20 +++++------ templates/CRM/Event/Form/Participant.tpl | 4 +-- .../Event/Form/ParticipantFeeSelection.tpl | 4 +-- templates/CRM/Event/Form/ParticipantView.tpl | 14 ++++---- .../Event/Form/Registration/PreviewHeader.tpl | 2 +- .../CRM/Event/Form/Registration/ThankYou.tpl | 6 ++-- templates/CRM/Event/Form/Selector.tpl | 4 +-- templates/CRM/Event/Page/DashBoard.tpl | 8 ++--- templates/CRM/Event/Page/EventInfo.tpl | 6 ++-- templates/CRM/Event/Page/List.tpl | 4 +-- templates/CRM/Event/Page/ManageEvent.tpl | 2 +- templates/CRM/Event/Page/Tab.tpl | 4 +-- templates/CRM/Financial/Form/Search.tpl | 2 +- .../CRM/Financial/Page/FinancialAccount.tpl | 4 +-- templates/CRM/Form/attachment.tpl | 6 ++-- templates/CRM/Form/body.tpl | 2 +- templates/CRM/Friend/Form.tpl | 2 +- templates/CRM/Grant/Form/GrantView.tpl | 8 ++--- templates/CRM/Grant/Form/Selector.tpl | 2 +- templates/CRM/Grant/Page/Tab.tpl | 2 +- templates/CRM/Group/Form/Edit.tpl | 8 ++--- templates/CRM/Group/Page/Group.tpl | 4 +-- templates/CRM/Logging/ReportDetail.tpl | 4 +-- templates/CRM/Mailing/Form/ForwardMailing.tpl | 2 +- templates/CRM/Mailing/Page/Event.tpl | 2 +- templates/CRM/Mailing/Page/Report.tpl | 6 ++-- templates/CRM/Member/Form/Membership.tpl | 2 +- templates/CRM/Member/Form/MembershipView.tpl | 8 ++--- templates/CRM/Member/Form/Selector.tpl | 4 +-- templates/CRM/Member/Import/Form/Preview.tpl | 4 +-- templates/CRM/Member/Import/Form/Summary.tpl | 2 +- templates/CRM/Member/Page/Tab.tpl | 4 +-- templates/CRM/PCP/Form/PCPAccount.tpl | 2 +- templates/CRM/PCP/Page/PCPInfo.tpl | 4 +-- templates/CRM/Pledge/Form/Selector.tpl | 2 +- templates/CRM/Pledge/Page/Tab.tpl | 2 +- templates/CRM/Price/Form/OptionFields.tpl | 4 +-- templates/CRM/Profile/Form/Dynamic.tpl | 2 +- templates/CRM/Profile/Page/Listings.tpl | 2 +- .../Page/MultipleRecordFieldsListing.tpl | 4 +-- templates/CRM/Profile/Page/View.tpl | 4 +-- templates/CRM/Report/Form/Actions.tpl | 2 +- templates/CRM/Report/Page/InstanceList.tpl | 6 ++-- templates/CRM/Report/Page/Options.tpl | 4 +-- templates/CRM/Report/Page/TemplateList.tpl | 2 +- templates/CRM/Tag/Form/Tag.tpl | 2 +- templates/CRM/Tag/Page/Tag.tpl | 34 +++++++++---------- templates/CRM/UF/Page/Group.tpl | 8 ++--- templates/CRM/UF/Page/ProfileTemplates.tpl | 10 +++--- templates/CRM/common/CMSPrint.tpl | 2 +- templates/CRM/common/contactFooter.tpl | 2 +- templates/CRM/common/fatal.tpl | 2 +- templates/CRM/common/formButtons.tpl | 4 +-- templates/CRM/common/jcalendar.tpl | 2 +- templates/CRM/common/joomla.tpl | 2 +- templates/CRM/common/success.tpl | 4 +-- .../Contact/Page/View/UserDashBoardTest.php | 2 +- 179 files changed, 421 insertions(+), 419 deletions(-) diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php index 332e8bac87..7dbf51a6e5 100644 --- a/CRM/Activity/BAO/Activity.php +++ b/CRM/Activity/BAO/Activity.php @@ -2587,7 +2587,7 @@ INNER JOIN civicrm_option_group grp ON (grp.id = option_group_id AND grp.name = $activity['DT_RowAttr']['data-entity'] = 'activity'; $activity['DT_RowAttr']['data-id'] = $activityId; - $activity['activity_type'] = (!empty($activityIcons[$values['activity_type_id']]) ? ' ' : '') . $values['activity_type']; + $activity['activity_type'] = (!empty($activityIcons[$values['activity_type_id']]) ? ' ' : '') . $values['activity_type']; $activity['subject'] = $values['subject']; if ($params['contact_id'] == $values['source_contact_id']) { diff --git a/CRM/Activity/Page/AJAX.php b/CRM/Activity/Page/AJAX.php index c7fe505bc4..1b07ef68a3 100644 --- a/CRM/Activity/Page/AJAX.php +++ b/CRM/Activity/Page/AJAX.php @@ -209,7 +209,7 @@ class CRM_Activity_Page_AJAX { } // email column links/icon if ($row['email']) { - $row['email'] = ''; + $row['email'] = ''; } // edit links $row['actions'] = ''; @@ -219,7 +219,7 @@ class CRM_Activity_Page_AJAX { switch ($row['source']) { case 'caseRel': $row['actions'] = '' . - '' . + '' . '' . '' . '' . @@ -228,7 +228,7 @@ class CRM_Activity_Page_AJAX { case 'caseRoles': $row['actions'] = '' . - '' . + '' . ''; break; } diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php index 2f6ec7c95d..5a3f0b8106 100644 --- a/CRM/Case/BAO/Case.php +++ b/CRM/Case/BAO/Case.php @@ -631,7 +631,7 @@ HERESQL; } } if (isset($case['activity_type_id']) && self::checkPermission($actId, 'edit', $case['activity_type_id'], $userID)) { - $casesList[$key]['date'] .= sprintf('', + $casesList[$key]['date'] .= sprintf('', CRM_Utils_System::url('civicrm/case/activity', ['reset' => 1, 'cid' => $case['contact_id'], 'caseid' => $case['case_id'], 'action' => 'update', 'id' => $actId]), ts('Edit activity') ); diff --git a/CRM/Contact/BAO/Relationship.php b/CRM/Contact/BAO/Relationship.php index 53a3454fb9..3dc3b0321c 100644 --- a/CRM/Contact/BAO/Relationship.php +++ b/CRM/Contact/BAO/Relationship.php @@ -1467,7 +1467,7 @@ LEFT JOIN civicrm_country ON (civicrm_address.country_id = civicrm_country.id) if ($values[$rid]['rtype'] == 'b_a') { $replace['clientid'] = $values[$rid]['cid']; } - $values[$rid]['case'] = ''; + $values[$rid]['case'] = ''; } } diff --git a/CRM/Core/BAO/File.php b/CRM/Core/BAO/File.php index e8c2ad6052..c2de586197 100644 --- a/CRM/Core/BAO/File.php +++ b/CRM/Core/BAO/File.php @@ -726,17 +726,19 @@ AND CEF.entity_id = %2"; $fileType == 'image/x-png' || $fileType == 'image/png' ) { - $file_url[$fileID] = " - - - "; + $file_url[$fileID] = << + + +HEREDOC; } // for non image files else { - $file_url[$fileID] = " - - - "; + $file_url[$fileID] = << + + +HEREDOC; } } } diff --git a/CRM/Core/Controller.php b/CRM/Core/Controller.php index 9d9bba46cc..0550fb39f3 100644 --- a/CRM/Core/Controller.php +++ b/CRM/Core/Controller.php @@ -556,8 +556,8 @@ class CRM_Core_Controller extends HTML_QuickForm_Controller { public function addWizardStyle(&$wizard) { $wizard['style'] = [ 'barClass' => '', - 'stepPrefixCurrent' => ' ', - 'stepPrefixPast' => ' ', + 'stepPrefixCurrent' => ' ', + 'stepPrefixPast' => ' ', 'stepPrefixFuture' => ' ', 'subStepPrefixCurrent' => '  ', 'subStepPrefixPast' => '  ', diff --git a/CRM/Core/Form/Renderer.php b/CRM/Core/Form/Renderer.php index f0ce13ae56..8b224a98c2 100644 --- a/CRM/Core/Form/Renderer.php +++ b/CRM/Core/Form/Renderer.php @@ -385,7 +385,7 @@ HEREDOC; // Initially hide if not needed // Note: visibility:hidden prevents layout jumping around unlike display:none $display = $field->getValue() !== NULL ? '' : ' style="visibility:hidden;"'; - $el['html'] .= ' '; + $el['html'] .= ' '; } } diff --git a/CRM/Core/Smarty/plugins/block.crmButton.php b/CRM/Core/Smarty/plugins/block.crmButton.php index 0e1c46a78e..8c5f573a86 100644 --- a/CRM/Core/Smarty/plugins/block.crmButton.php +++ b/CRM/Core/Smarty/plugins/block.crmButton.php @@ -49,7 +49,7 @@ function smarty_block_crmButton($params, $text, &$smarty) { if (strpos($icon, 'fa-') !== 0) { $icon = "fa-$icon"; } - $iconMarkup = "  "; + $iconMarkup = "  "; } // All other params are treated as html attributes CRM_Utils_Array::remove($params, 'icon', 'p', 'q', 'a', 'f', 'h', 'fb', 'fe'); diff --git a/CRM/Utils/Check/Component/Schema.php b/CRM/Utils/Check/Component/Schema.php index fb4d253648..33eef62216 100644 --- a/CRM/Utils/Check/Component/Schema.php +++ b/CRM/Utils/Check/Component/Schema.php @@ -153,8 +153,8 @@ class CRM_Utils_Check_Component_Schema extends CRM_Utils_Check_Component { $fieldName = ' - Deleted - '; } } - $groupEdit = ' '; - $groupConfig = ' '; + $groupEdit = ' '; + $groupConfig = ' '; $html .= "{$id} - {$field['title']} {$groupEdit} {$groupConfig}{$fieldName}"; } diff --git a/ang/api4Explorer/Clause.html b/ang/api4Explorer/Clause.html index 6ccdff2bcd..9f9412e9f7 100644 --- a/ang/api4Explorer/Clause.html +++ b/ang/api4Explorer/Clause.html @@ -1,7 +1,7 @@ {{ data.label || data.op + ' group' }} *
@@ -10,7 +10,7 @@ {{ data.type }} {{ data.op }} - +
diff --git a/ang/api4Explorer/Explorer.html b/ang/api4Explorer/Explorer.html index 173604ef83..c688ea3b9a 100644 --- a/ang/api4Explorer/Explorer.html +++ b/ang/api4Explorer/Explorer.html @@ -8,7 +8,7 @@

- + {{:: ts('Bootstrap theme not found.') }}

{{:: ts('This screen may not work correctly without a bootstrap-based theme such as Shoreditch installed.') }}

@@ -48,15 +48,15 @@ - +
select *
- + - +
@@ -90,7 +90,7 @@ - +
@@ -113,9 +113,9 @@ groupBy *
- + - +
@@ -128,13 +128,13 @@ orderBy *
- + - +
@@ -151,7 +151,7 @@ - +
diff --git a/ang/crmCaseType.js b/ang/crmCaseType.js index 0b97432237..c8b836b385 100644 --- a/ang/crmCaseType.js +++ b/ang/crmCaseType.js @@ -138,9 +138,9 @@ link: function(scope, element, attrs) { element.addClass('crm-editable crm-editable-enabled'); var titleLabel = $(element).find('span'); - var penIcon = $('').prependTo(element); - var saveButton = $('').appendTo(element); - var cancelButton = $('').appendTo(element); + var penIcon = $('').prependTo(element); + var saveButton = $('').appendTo(element); + var cancelButton = $('').appendTo(element); $('button', element).wrapAll(' diff --git a/ang/crmCaseType/sequenceTable.html b/ang/crmCaseType/sequenceTable.html index ef62fb06b5..4ee780edd2 100644 --- a/ang/crmCaseType/sequenceTable.html +++ b/ang/crmCaseType/sequenceTable.html @@ -14,10 +14,10 @@ Required vars: activitySet - + - + {{ activity.name }} diff --git a/ang/crmCaseType/statusTable.html b/ang/crmCaseType/statusTable.html index e7dfd9eb21..085241e22f 100644 --- a/ang/crmCaseType/statusTable.html +++ b/ang/crmCaseType/statusTable.html @@ -28,7 +28,7 @@ Required vars: selectedStatuses - {{:: ts('New Status') }} + {{:: ts('New Status') }} diff --git a/ang/crmCaseType/timelineTable.html b/ang/crmCaseType/timelineTable.html index 76113a1208..e25351d782 100644 --- a/ang/crmCaseType/timelineTable.html +++ b/ang/crmCaseType/timelineTable.html @@ -19,10 +19,10 @@ Required vars: activitySet - + - + {{activity.label}} diff --git a/ang/crmCxn/ManageCtrl.html b/ang/crmCxn/ManageCtrl.html index 78509a0601..2e84994ec6 100644 --- a/ang/crmCxn/ManageCtrl.html +++ b/ang/crmCxn/ManageCtrl.html @@ -115,6 +115,6 @@
- + {{:: ts('No available applications') }}
diff --git a/ang/crmMailing/BlockPreview.js b/ang/crmMailing/BlockPreview.js index 5e582dc056..334e15d440 100644 --- a/ang/crmMailing/BlockPreview.js +++ b/ang/crmMailing/BlockPreview.js @@ -48,7 +48,7 @@ markup += ''; markup = '

' + ts('A test message will be sent to %1 people:', {1: count}) + '

' + markup; if (!count) { - markup = '
' + + markup = '
' + (data.contact.count ? ts('None of the contacts in this group have an email address.') : ts('Group is empty.')) + '
'; } diff --git a/ang/crmMailing/EmailBodyCtrl/tokenAlert.html b/ang/crmMailing/EmailBodyCtrl/tokenAlert.html index 81e52e1737..46e03827ee 100644 --- a/ang/crmMailing/EmailBodyCtrl/tokenAlert.html +++ b/ang/crmMailing/EmailBodyCtrl/tokenAlert.html @@ -4,7 +4,7 @@

- {{:: ts('Address') }} + {{:: ts('Address') }}
@@ -24,18 +24,18 @@ - {{:: ts('Unsubscribe') }} + {{:: ts('Unsubscribe') }} - {{:: ts('Unsubscribe') }} + {{:: ts('Unsubscribe') }} - {{:: ts('Opt-out') }} + {{:: ts('Opt-out') }} - {{:: ts('Opt-out') }} + {{:: ts('Opt-out') }} diff --git a/ang/crmMailing/Recipients.js b/ang/crmMailing/Recipients.js index 4203d4a3c8..0d39cde49e 100644 --- a/ang/crmMailing/Recipients.js +++ b/ang/crmMailing/Recipients.js @@ -99,7 +99,7 @@ if (option.entity_type != 'civicrm_mailing' && isMandatory(option.entity_id)) { spanClass = 'crmMailing-mandatory'; } - return ' ' + item.text + ''; + return ' ' + item.text + ''; } function validate() { diff --git a/ang/crmMailingAB/ListCtrl.html b/ang/crmMailingAB/ListCtrl.html index 61104cd856..0d5c1499e8 100644 --- a/ang/crmMailingAB/ListCtrl.html +++ b/ang/crmMailingAB/ListCtrl.html @@ -52,12 +52,12 @@ Required vars: mailingABList
- + {{:: ts('You have no A/B mailings') }}

- {{:: ts('New A/B Test') }} + {{:: ts('New A/B Test') }}
diff --git a/ang/crmStatusPage/StatusPage.html b/ang/crmStatusPage/StatusPage.html index bf252cbeb1..dfdfbdf24b 100644 --- a/ang/crmStatusPage/StatusPage.html +++ b/ang/crmStatusPage/StatusPage.html @@ -14,7 +14,7 @@ >

- + {{status.title}}
diff --git a/ang/crmUi.js b/ang/crmUi.js index c5b6c426d2..7482999091 100644 --- a/ang/crmUi.js +++ b/ang/crmUi.js @@ -919,7 +919,7 @@ return; } if (attrs.crmIcon.substring(0,3) == 'fa-') { - $(element).prepend(' '); + $(element).prepend(' '); } else { $(element).prepend(' '); @@ -1051,7 +1051,7 @@ // set a custom title (i.e., it has an initial title of "CiviCRM"). See the // global variables pageTitle and documentTitle. // Example (same title for both):

{{ts('Hello')}}

- // Example (separate document title):

{{ts('Hello')}}

+ // Example (separate document title):

{{ts('Hello')}}

.directive('crmPageTitle', function($timeout) { return { scope: { diff --git a/ang/crmUi/tabset.html b/ang/crmUi/tabset.html index 6bb45711f0..9a17d97e1b 100644 --- a/ang/crmUi/tabset.html +++ b/ang/crmUi/tabset.html @@ -2,7 +2,7 @@
  • - + {{tab.$parent.$eval(tab.crmTitle)}} {{tab.count}} diff --git a/ang/exportui/exportField.html b/ang/exportui/exportField.html index 7ae919749c..25d1bfb84e 100644 --- a/ang/exportui/exportField.html +++ b/ang/exportui/exportField.html @@ -1,5 +1,5 @@
    - +
    diff --git a/js/crm.datepicker.js b/js/crm.datepicker.js index e1a15f85d0..95663c0949 100644 --- a/js/crm.datepicker.js +++ b/js/crm.datepicker.js @@ -29,7 +29,7 @@ type = hasDatepicker ? 'text' : 'number'; if (settings.allowClear !== undefined ? settings.allowClear : !$dataField.is('.required, [required]')) { - $clearLink = $('') + $clearLink = $('') .insertAfter($dataField); } if (settings.time !== false) { diff --git a/js/crm.menubar.js b/js/crm.menubar.js index f2eed05316..1d4f753838 100644 --- a/js/crm.menubar.js +++ b/js/crm.menubar.js @@ -238,7 +238,7 @@ e.preventDefault(); CRM.menubar.togglePosition(); }) - .append('
  • '); + .append('
  • '); CRM.menubar.position = CRM.cache.get('menubarPosition', CRM.menubar.position); } $('body').addClass('crm-menubar-visible crm-menubar-' + CRM.menubar.position); diff --git a/js/jquery/jquery.crmEditable.js b/js/jquery/jquery.crmEditable.js index b68b27f0a2..7d0da65ba1 100644 --- a/js/jquery/jquery.crmEditable.js +++ b/js/jquery/jquery.crmEditable.js @@ -108,10 +108,10 @@ var settings = { tooltip: $i.data('tooltip') || ts('Click to edit'), - placeholder: $i.data('placeholder') || '', + placeholder: $i.data('placeholder') || '', onblur: 'cancel', - cancel: '', - submit: '', + cancel: '', + submit: '', cssclass: 'crm-editable-form', data: getData, onreset: restoreContainer diff --git a/js/jquery/jquery.crmIconPicker.js b/js/jquery/jquery.crmIconPicker.js index 19f50f6b22..2cc4bd536c 100644 --- a/js/jquery/jquery.crmIconPicker.js +++ b/js/jquery/jquery.crmIconPicker.js @@ -90,7 +90,7 @@ '
    ' + '' + '' + - '' + + '' + '
    ' + '
    ' ); diff --git a/js/jquery/jquery.dashboard.js b/js/jquery/jquery.dashboard.js index b757e27f6c..4191285449 100644 --- a/js/jquery/jquery.dashboard.js +++ b/js/jquery/jquery.dashboard.js @@ -364,7 +364,7 @@ // Adds controls to a widget. id is for internal use and image file name in images/dashboard/ (a .gif). widget.addControl = function(id, control) { - var markup = ''; + var markup = ''; control.element = $(markup).prependTo($('.widget-controls', widget.element)).click(control.callback); }; diff --git a/js/view/crm.designer.js b/js/view/crm.designer.js index 9d43b92bf0..b00a2964f1 100644 --- a/js/view/crm.designer.js +++ b/js/view/crm.designer.js @@ -675,7 +675,7 @@ }); var form1 = CRM.loadForm(url) .on('crmFormLoad', function() { - $(this).prepend('
    ' + ts('Note: This will modify the field system-wide, not just in this profile form.') + '
    '); + $(this).prepend('
    ' + ts('Note: This will modify the field system-wide, not just in this profile form.') + '
    '); }); }, onChangeIsDuplicate: function(model, value, options) { diff --git a/templates/CRM/ACL/Page/ACLBasic.tpl b/templates/CRM/ACL/Page/ACLBasic.tpl index 1c3787efd0..8ecb0eee8a 100644 --- a/templates/CRM/ACL/Page/ACLBasic.tpl +++ b/templates/CRM/ACL/Page/ACLBasic.tpl @@ -39,7 +39,7 @@ {if $action ne 1 and $action ne 2}
    - {ts}Add ACL{/ts} + {ts}Add ACL{/ts}
    {/if}
diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl index a013a7cb74..a6f20a3450 100644 --- a/templates/CRM/Activity/Form/Activity.tpl +++ b/templates/CRM/Activity/Form/Activity.tpl @@ -80,12 +80,12 @@ {if $action neq 4} {if !$form.target_contact_id.frozen} - + {/if} {if $activityAssigneeNotification}
- {ts}A copy of this activity will be emailed to each Assignee.{/ts} {help id="sent_copy_email"} + {ts}A copy of this activity will be emailed to each Assignee.{/ts} {help id="sent_copy_email"} {/if} {/if} @@ -244,7 +244,7 @@ {if ($context eq 'fulltext' || $context eq 'search') && $searchKey} {assign var='urlParams' value="reset=1&atype=$atype&action=update&reset=1&id=$entityID&cid=$contactId&context=$context&key=$searchKey"} {/if} - {ts}Edit{/ts} + {ts}Edit{/ts} {/if} {if call_user_func(array('CRM_Core_Permission','check'), 'delete activities')} @@ -252,11 +252,11 @@ {if ($context eq 'fulltext' || $context eq 'search') && $searchKey} {assign var='urlParams' value="reset=1&atype=$atype&action=delete&reset=1&id=$entityID&cid=$contactId&context=$context&key=$searchKey"} {/if} - {ts}Delete{/ts} + {ts}Delete{/ts} {/if} {/if} {if $action eq 4 and $context != 'case' and call_user_func(array('CRM_Case_BAO_Case','checkPermission'), $activityId, 'File On Case', $atype)} - {ts}File on Case{/ts} + {ts}File on Case{/ts} {include file="CRM/Case/Form/ActivityToCase.tpl"} {/if} {include file="CRM/common/formButtons.tpl" location="bottom"} diff --git a/templates/CRM/Activity/Form/ActivityLinks.tpl b/templates/CRM/Activity/Form/ActivityLinks.tpl index 1b734956cc..689b4e3cf1 100644 --- a/templates/CRM/Activity/Form/ActivityLinks.tpl +++ b/templates/CRM/Activity/Form/ActivityLinks.tpl @@ -43,7 +43,7 @@ {foreach from=$activityTypes key=k item=act}
  • - {$act.label} + {$act.label}
    • {/foreach} diff --git a/templates/CRM/Activity/Form/ActivityView.tpl b/templates/CRM/Activity/Form/ActivityView.tpl index c33de36008..4f68416e21 100644 --- a/templates/CRM/Activity/Form/ActivityView.tpl +++ b/templates/CRM/Activity/Form/ActivityView.tpl @@ -22,7 +22,7 @@ {/if} {if $values.mailingId} - {ts}With Contact{/ts}{ts}Mailing Report{/ts} + {ts}With Contact{/ts}{ts}Mailing Report{/ts} {/if} @@ -84,7 +84,7 @@ {$mailingReport.mailing.body_text|mb_truncate:30|escape|nl2br}
    {if $values.mailingId} - {ts}View complete message{/ts} + {ts}View complete message{/ts} {/if} @@ -97,7 +97,7 @@ {$mailingReport.mailing.body_html|mb_truncate:30|escape|nl2br}
    {if $values.mailingId} - {ts}View complete message{/ts} + {ts}View complete message{/ts} {/if} diff --git a/templates/CRM/Activity/Import/Form/Preview.tpl b/templates/CRM/Activity/Import/Form/Preview.tpl index f4deaeeeba..5b846a62cc 100644 --- a/templates/CRM/Activity/Import/Form/Preview.tpl +++ b/templates/CRM/Activity/Import/Form/Preview.tpl @@ -48,7 +48,7 @@ {$invalidRowCount} {ts}Rows with invalid data in one or more fields. These rows will be skipped (not imported).{/ts} {if $invalidRowCount} -
    {ts}Download Errors{/ts}
    +
    {ts}Download Errors{/ts}
    {/if} diff --git a/templates/CRM/Admin/Form/Options.tpl b/templates/CRM/Admin/Form/Options.tpl index b41ad148ab..2a566c9b65 100644 --- a/templates/CRM/Admin/Form/Options.tpl +++ b/templates/CRM/Admin/Form/Options.tpl @@ -58,7 +58,7 @@ {$form.value.label} {$form.value.html}
    {if $action == 2} - {ts}Changing the Value field will unlink records which have been marked with this option. This change can not be undone except by restoring the previous value.{/ts} + {ts}Changing the Value field will unlink records which have been marked with this option. This change can not be undone except by restoring the previous value.{/ts} {/if} diff --git a/templates/CRM/Admin/Form/Preferences/Display.tpl b/templates/CRM/Admin/Form/Preferences/Display.tpl index 2f86a7039d..049a5ebf99 100644 --- a/templates/CRM/Admin/Form/Preferences/Display.tpl +++ b/templates/CRM/Admin/Form/Preferences/Display.tpl @@ -162,7 +162,7 @@ {$form.editor_id.html}   - + {$form.ckeditor_config.html} diff --git a/templates/CRM/Admin/Form/WordReplacements.tpl b/templates/CRM/Admin/Form/WordReplacements.tpl index 1ae4182ddc..ead2551283 100644 --- a/templates/CRM/Admin/Form/WordReplacements.tpl +++ b/templates/CRM/Admin/Form/WordReplacements.tpl @@ -45,7 +45,7 @@ {/section} -     {ts}Add row{/ts} +     {ts}Add row{/ts} diff --git a/templates/CRM/Admin/Page/APIExplorer.js b/templates/CRM/Admin/Page/APIExplorer.js index 7b8e83d499..4d6df95b2b 100644 --- a/templates/CRM/Admin/Page/APIExplorer.js +++ b/templates/CRM/Admin/Page/APIExplorer.js @@ -200,10 +200,10 @@ var $row = $('tr:last-child', '#api-params'); $('.api-chain-entity', $row).crmSelect2({ formatSelection: function(item) { - return ' API ' + + return ' API ' + ($(item.element).hasClass('strikethrough') ? '' + item.text + '' : item.text); }, - placeholder: ' ' + ts('Entity'), + placeholder: ' ' + ts('Entity'), allowClear: false, escapeMarkup: function(m) {return m;} }) @@ -677,7 +677,7 @@ .addClass('crm-error') .css('width', '82%') .attr('title', msg) - .before(' ') + .before(' ') .tooltip(); } } diff --git a/templates/CRM/Admin/Page/APIExplorer.tpl b/templates/CRM/Admin/Page/APIExplorer.tpl index 7234f9f13d..1e1b8eb497 100644 --- a/templates/CRM/Admin/Page/APIExplorer.tpl +++ b/templates/CRM/Admin/Page/APIExplorer.tpl @@ -210,13 +210,13 @@
    @@ -263,9 +263,9 @@
    @@ -286,7 +286,7 @@
    - +
    @@ -350,9 +350,9 @@ @@ -399,7 +399,7 @@ - + @@ -407,7 +407,7 @@ @@ -444,7 +444,7 @@
      <% _.forEach(joins, function(join, name) { %>
    • class="join-enabled"<% } if(join.disabled) { %>class="join-not-available"<% }%>> - +
    - {ts}Add New Scheduled Job{/ts} + {ts}Add New Scheduled Job{/ts}
    {/if} diff --git a/templates/CRM/Admin/Page/JobLog.tpl b/templates/CRM/Admin/Page/JobLog.tpl index d3547dd037..12b1b687b7 100644 --- a/templates/CRM/Admin/Page/JobLog.tpl +++ b/templates/CRM/Admin/Page/JobLog.tpl @@ -18,7 +18,7 @@ {/if}
    - {ts}Back to Scheduled Jobs Listing{/ts} + {ts}Back to Scheduled Jobs Listing{/ts}
    {if $rows} @@ -59,6 +59,6 @@ {/if}
    - {ts}Back to Scheduled Jobs Listing{/ts} + {ts}Back to Scheduled Jobs Listing{/ts}

    diff --git a/templates/CRM/Admin/Page/Navigation.tpl b/templates/CRM/Admin/Page/Navigation.tpl index 76b9f95112..b101137c5b 100644 --- a/templates/CRM/Admin/Page/Navigation.tpl +++ b/templates/CRM/Admin/Page/Navigation.tpl @@ -29,7 +29,7 @@
    {* TODO: fa-broom would be better, but not implemented yet. https://github.com/FortAwesome/Font-Awesome/issues/239 *} - {ts}Cleanup reports menu{/ts} + {ts}Cleanup reports menu{/ts}
    diff --git a/templates/CRM/Admin/Page/OptionGroup.tpl b/templates/CRM/Admin/Page/OptionGroup.tpl index 87ddaf9846..ca9abf7251 100644 --- a/templates/CRM/Admin/Page/OptionGroup.tpl +++ b/templates/CRM/Admin/Page/OptionGroup.tpl @@ -13,7 +13,7 @@ {else}
    {ts}CiviCRM stores configurable choices for various drop-down fields as 'option groups'. You can click Options to view the available choices.{/ts} -

    {ts}WARNING: Many option groups are used programatically and values should be added or modified with caution.{/ts}

    +

    {ts}WARNING: Many option groups are used programatically and values should be added or modified with caution.{/ts}

    {/if} diff --git a/templates/CRM/Admin/Page/Options.tpl b/templates/CRM/Admin/Page/Options.tpl index ce99ca6434..1ecc70b42f 100644 --- a/templates/CRM/Admin/Page/Options.tpl +++ b/templates/CRM/Admin/Page/Options.tpl @@ -115,7 +115,7 @@ {foreach from=$rows item=row} {if !empty($hasIcons)} - + {/if} {if $showComponent} {$row.component_name} diff --git a/templates/CRM/Admin/Page/PaymentProcessorType.tpl b/templates/CRM/Admin/Page/PaymentProcessorType.tpl index 0526f251a7..7580755844 100644 --- a/templates/CRM/Admin/Page/PaymentProcessorType.tpl +++ b/templates/CRM/Admin/Page/PaymentProcessorType.tpl @@ -45,7 +45,7 @@ {if $action ne 1 and $action ne 2}
    - {ts}New Payment Processor{/ts} + {ts}New Payment Processor{/ts} {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
    {/if} diff --git a/templates/CRM/Admin/Page/Setting.tpl b/templates/CRM/Admin/Page/Setting.tpl index aece1126fa..fe2a904ad5 100644 --- a/templates/CRM/Admin/Page/Setting.tpl +++ b/templates/CRM/Admin/Page/Setting.tpl @@ -13,72 +13,72 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - +
    {ts}Enable Components{/ts} {ts}Enable Components{/ts} {ts}Enable CiviContribute, CiviPledge, CiviEvent, CiviMember, CiviMail, CiviCase, CiviReport and/or CiviGrant components.{/ts}
    {ts}Site Preferences{/ts} {ts}Site Preferences{/ts} {ts}Configure screen and form elements for Viewing Contacts, Editing Contacts, Advanced Search, Contact Dashboard and WYSIWYG Editor.{/ts}
    {ts}Directories{/ts} {ts}Directories{/ts} {ts}Configure directories in your file system for temporary uploads, images, custom files and custom templates.{/ts}
    {ts}Resource URLs{/ts} {ts}Resource URLs{/ts} {ts}URLs used to access CiviCRM resources (CSS files, Javascript files, images, etc.). Enable secure URLs.{/ts}
    {ts}Outbound Email (SMTP/Sendmail){/ts} {ts}Outbound Email (SMTP/Sendmail){/ts} {ts}Settings for outbound email - either SMTP server, port and authentication or Sendmail path and argument.{/ts}
    {ts}Mapping and Geocoding{/ts} {ts}Mapping and Geocoding{/ts} {ts}Configure a mapping provider (e.g. Google or Yahoo) to display maps for contact addresses and event locations.{/ts}
    {ts}Payment Processors{/ts} {ts}Payment Processors{/ts} {ts}Select and configure one or more payment processing services for online contributions, events and / or membership fees.{/ts}
    {ts}Localization{/ts} {ts}Localization{/ts} {ts}Localization settings include user language, default currency and available countries for address input.{/ts}
    {ts}Address Settings{/ts} {ts}Address Settings{/ts} {ts}Format addresses in mailing labels, input forms and screen display. Configure optional Address Standardization provider.{/ts}
    {ts}Search Settings{/ts} {ts}Search Settings{/ts} {ts}Configure Contact Search behavior.{/ts}
    {ts}Date Formats{/ts} {ts}Date Formats{/ts} {ts}Configure input and display formats for Date fields.{/ts}
    {ts 1=$config->userFramework}%1 Integration Settings{/ts} {ts 1=$config->userFramework}%1 Integration Settings{/ts} {ts 1=$config->userFramework}%1 version and user table name.{/ts}
    {ts}Miscellaneous Settings{/ts} {ts}Miscellaneous Settings{/ts} {ts}Dashboard caching time, move to trash / undelete, change logging, version checking and reCAPTCHA (prevents automated abuse of public forms).{/ts}
    {ts}Debugging{/ts} {ts}Debugging{/ts} {ts}Enable debugging features including display of template variables and backtracing.{/ts}
    diff --git a/templates/CRM/Badge/Form/Layout.tpl b/templates/CRM/Badge/Form/Layout.tpl index da1b73149e..3aeda9184f 100644 --- a/templates/CRM/Badge/Form/Layout.tpl +++ b/templates/CRM/Badge/Form/Layout.tpl @@ -36,7 +36,7 @@ @@ -56,7 +56,7 @@
    {$form.image_1.html} - +
    {ts}Click above and select a file by double clicking on it.{/ts}
    diff --git a/templates/CRM/Batch/Form/Entry.tpl b/templates/CRM/Batch/Form/Entry.tpl index e7f3043697..70c0a1c350 100644 --- a/templates/CRM/Batch/Form/Entry.tpl +++ b/templates/CRM/Batch/Form/Entry.tpl @@ -20,7 +20,7 @@ {if $batchAmountMismatch}
    - {ts}Total for amounts entered below does not match the expected batch total.{/ts} + {ts}Total for amounts entered below does not match the expected batch total.{/ts}
    {$form._qf_Entry_upload_force.html} diff --git a/templates/CRM/Campaign/Form/ResultOptions.tpl b/templates/CRM/Campaign/Form/ResultOptions.tpl index b94652962c..32b4ae8c59 100644 --- a/templates/CRM/Campaign/Form/ResultOptions.tpl +++ b/templates/CRM/Campaign/Form/ResultOptions.tpl @@ -43,7 +43,7 @@
    {$form.image_2.html} - +
    {ts}Click above and select a file by double clicking on it.{/ts}
    {if $index GT 1} - + {/if} @@ -60,7 +60,7 @@ {/section}
    {ts}If you need additional options - you can add them after you Save your current entries.{/ts} diff --git a/templates/CRM/Campaign/Page/Petition.tpl b/templates/CRM/Campaign/Page/Petition.tpl index 85f4423274..595c8582e7 100644 --- a/templates/CRM/Campaign/Page/Petition.tpl +++ b/templates/CRM/Campaign/Page/Petition.tpl @@ -12,7 +12,7 @@ {if $surveys}
    - {ts}Add Survey{/ts} + {ts}Add Survey{/ts}
    {include file="CRM/common/enableDisableApi.tpl"} @@ -55,6 +55,6 @@ {/if}
    - {ts}Add Survey{/ts} + {ts}Add Survey{/ts}
    diff --git a/templates/CRM/Case/Form/Activity.tpl b/templates/CRM/Case/Form/Activity.tpl index 8a97d5d358..7df7770d70 100644 --- a/templates/CRM/Case/Form/Activity.tpl +++ b/templates/CRM/Case/Form/Activity.tpl @@ -18,7 +18,7 @@ {if $action eq 8 or $action eq 32768 }
    -   +   {if $action eq 8} {* activityTypeName means label here not name, but it's ok because label is desired here (dev/core#1116-ok-label) *} {ts 1=$activityTypeName}Click Delete to move this "%1" activity to the Trash.{/ts} @@ -75,7 +75,7 @@ {if $action eq 1 or $action eq 2}
    - {ts}With other contact(s){/ts} + {ts}With other contact(s){/ts} {/if} @@ -87,7 +87,7 @@ {$form.target_contact_id.html}
    - {if not $multiClient}{ts}With client{/ts}{else}{ts}With client(s){/ts}{/if} + {if not $multiClient}{ts}With client{/ts}{else}{ts}With client(s){/ts}{/if} @@ -110,7 +110,7 @@ {$form.assignee_contact_id.html} {if $activityAssigneeNotification}
    - {ts}A copy of this activity will be emailed to each Assignee.{/ts} + {ts}A copy of this activity will be emailed to each Assignee.{/ts} {/if} diff --git a/templates/CRM/Case/Form/ActivityView.tpl b/templates/CRM/Case/Form/ActivityView.tpl index 3000153af7..9bc3c3d781 100644 --- a/templates/CRM/Case/Form/ActivityView.tpl +++ b/templates/CRM/Case/Form/ActivityView.tpl @@ -36,9 +36,9 @@ {if $smarty.foreach.report.first AND ( $activityID OR $parentID OR $latestRevisionID )} {* Add a cell to first row with links to prior revision listing and Prompted by (parent) as appropriate *} {$row.value} - {if $activityID} {ts}List all revisions{/ts}{if !$latestRevisionID}
    {ts}(this is the current revision){/ts}{/if}
    {/if} - {if $latestRevisionID} {ts}View current revision{/ts}
    {ts}(this is not the current revision){/ts}
    {/if} - {if $parentID} {ts}Prompted by{/ts}{/if} + {if $activityID} {ts}List all revisions{/ts}{if !$latestRevisionID}
    {ts}(this is the current revision){/ts}{/if}
    {/if} + {if $latestRevisionID} {ts}View current revision{/ts}
    {ts}(this is not the current revision){/ts}
    {/if} + {if $parentID} {ts}Prompted by{/ts}{/if} {else} {if $row.label eq 'Details'}{$row.value|crmStripAlternatives|nl2br|purify}{elseif $row.type eq 'Date'}{$row.value|crmDate}{else}{$row.value}{/if} diff --git a/templates/CRM/Case/Form/CaseView.tpl b/templates/CRM/Case/Form/CaseView.tpl index 524da11842..86e23f57af 100644 --- a/templates/CRM/Case/Form/CaseView.tpl +++ b/templates/CRM/Case/Form/CaseView.tpl @@ -27,7 +27,7 @@ {$client.display_name}{if not $smarty.foreach.clients.last},   {/if} {/foreach} - +
    @@ -45,7 +45,7 @@ {foreach from=$caseRoles.client item=client} - {$client.display_name}{if $client.email}{crmAPI var='email_type_id' entity='OptionValue' action='getsingle' return="value" name="Email" option_group_id="activity_type"}{/if} + {$client.display_name}{if $client.email}{crmAPI var='email_type_id' entity='OptionValue' action='getsingle' return="value" name="Email" option_group_id="activity_type"}{/if} {if $client.phone} @@ -69,13 +69,13 @@ {ts}Subject{/ts}: {$caseDetails.case_subject} - {ts}Type{/ts}: {$caseDetails.case_type}  + {ts}Type{/ts}: {$caseDetails.case_type}  - {ts}Status{/ts}: {$caseDetails.case_status}  + {ts}Status{/ts}: {$caseDetails.case_status}  - {ts}Open Date{/ts}: {$caseDetails.case_start_date|crmDate}  + {ts}Open Date{/ts}: {$caseDetails.case_start_date|crmDate}  {ts}ID{/ts}: {$caseID} @@ -103,15 +103,15 @@

    {if $hasAccessToAllCases} - {ts}Print Report{/ts} + {ts}Print Report{/ts} {/if} {if !empty($exportDoc)} - {ts}Export Document{/ts} + {ts}Export Document{/ts} {/if} {if $mergeCases} - {ts}Merge Case{/ts} + {ts}Merge Case{/ts} {$form._qf_CaseView_next_merge_case.html} {$form.merge_case_id.html} @@ -119,7 +119,7 @@ {/if} {if call_user_func(array('CRM_Core_Permission','giveMeAllACLs'))} - {ts}Assign to Another Client{/ts} + {ts}Assign to Another Client{/ts} {/if}

    @@ -136,7 +136,7 @@ {if $hasAccessToAllCases}
    - {ts}Add new role{/ts} + {ts}Add new role{/ts}
    {$form.role_type.label}
    @@ -219,7 +219,7 @@ {if !empty($globalGroupInfo.id)}
    - {ts 1=$globalGroupInfo.title}Add members to %1{/ts} + {ts 1=$globalGroupInfo.title}Add members to %1{/ts}
    diff --git a/templates/CRM/Case/Form/Selector.tpl b/templates/CRM/Case/Form/Selector.tpl index fb306ba85f..e84e64afbb 100644 --- a/templates/CRM/Case/Form/Selector.tpl +++ b/templates/CRM/Case/Form/Selector.tpl @@ -61,7 +61,7 @@ {* Dashboard only lists 10 most recent cases. *} {if $context EQ 'dashboard' and $limit and $pager->_totalItems GT $limit } - {ts}Find more cases{/ts}... + {ts}Find more cases{/ts}... {/if} diff --git a/templates/CRM/Case/Page/DashBoard.tpl b/templates/CRM/Case/Page/DashBoard.tpl index 9d83c4c0f1..f8bcfce4db 100644 --- a/templates/CRM/Case/Page/DashBoard.tpl +++ b/templates/CRM/Case/Page/DashBoard.tpl @@ -18,9 +18,9 @@
    {if $newClient and $allowToAddNewCase} - {ts}Add Case{/ts} + {ts}Add Case{/ts} {/if} - {ts}Find My Cases{/ts} + {ts}Find My Cases{/ts}
    {if $myCases} diff --git a/templates/CRM/Case/Page/Tab.tpl b/templates/CRM/Case/Page/Tab.tpl index 971157d0f3..047fd3dc37 100644 --- a/templates/CRM/Case/Page/Tab.tpl +++ b/templates/CRM/Case/Page/Tab.tpl @@ -44,7 +44,7 @@ call_user_func(array('CRM_Core_Permission','check'), 'add cases') ) AND $allowToAddNewCase}
    - {ts}Add Case{/ts} + {ts}Add Case{/ts}
    {/if} diff --git a/templates/CRM/Contact/Form/Contact.tpl b/templates/CRM/Contact/Form/Contact.tpl index f69d5afb2b..2acbff7dcc 100644 --- a/templates/CRM/Contact/Form/Contact.tpl +++ b/templates/CRM/Contact/Form/Contact.tpl @@ -16,7 +16,7 @@ {/if}
    {if call_user_func(array('CRM_Core_Permission','check'), 'administer CiviCRM') } - + {/if} {ts}Expand all tabs{/ts}
    diff --git a/templates/CRM/Contact/Form/Domain.tpl b/templates/CRM/Contact/Form/Domain.tpl index 870dbd0544..258107b9b8 100644 --- a/templates/CRM/Contact/Form/Domain.tpl +++ b/templates/CRM/Contact/Form/Domain.tpl @@ -46,7 +46,7 @@ {if ($action eq 4)}
    - {ts}Edit Domain Information{/ts} + {ts}Edit Domain Information{/ts}
    {/if} {if !($action eq 4)} diff --git a/templates/CRM/Contact/Form/Edit/Address.tpl b/templates/CRM/Contact/Form/Edit/Address.tpl index 05e1c38222..0181f55f95 100644 --- a/templates/CRM/Contact/Form/Edit/Address.tpl +++ b/templates/CRM/Contact/Form/Edit/Address.tpl @@ -65,7 +65,7 @@ {if $className eq 'CRM_Contact_Form_Contact'} {/if} diff --git a/templates/CRM/Contact/Form/Merge.tpl b/templates/CRM/Contact/Form/Merge.tpl index 9b56d73ec7..6c2902a06b 100644 --- a/templates/CRM/Contact/Form/Merge.tpl +++ b/templates/CRM/Contact/Form/Merge.tpl @@ -31,24 +31,24 @@
    - {if $prev} {ts}Previous{/ts}{/if} - {if $next}{ts}Next{/ts} {/if} + {if $prev} {ts}Previous{/ts}{/if} + {if $next}{ts}Next{/ts} {/if} - + {ts}Flip between original and duplicate contacts.{/ts}
    - + {ts}Mark this pair as not a duplicate.{/ts}
    - + {ts}Show/hide rows with the same data on each contact record.{/ts}
    diff --git a/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl b/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl index 99f5d2e0ed..8c7807c4b0 100644 --- a/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl +++ b/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl @@ -67,7 +67,7 @@ CRM.$(function($) { var body = $('.crm-accordion-body.' + id); if (header.length > 0 && body.length > 0 && !body.html()) { body.html('
    {/literal}{ts escape='js'}Loading{/ts}{literal}...
    '); - header.append('{/literal}{literal}'); + header.append('{/literal}{literal}'); header.addClass('active'); CRM.loadPage(url, {target: body, block: false}); } @@ -126,7 +126,7 @@ CRM.$(function($) { {include file="CRM/common/formButtons.tpl" location="bottom"}
    - +  {ts}Reset Form{/ts}
    diff --git a/templates/CRM/Contact/Form/Search/Criteria/SearchSettings.tpl b/templates/CRM/Contact/Form/Search/Criteria/SearchSettings.tpl index 47a34fcb0d..c835f8c263 100644 --- a/templates/CRM/Contact/Form/Search/Criteria/SearchSettings.tpl +++ b/templates/CRM/Contact/Form/Search/Criteria/SearchSettings.tpl @@ -11,7 +11,7 @@
    - + {ts}Reset Form{/ts}
    diff --git a/templates/CRM/Contact/Form/Search/Custom/FullText.tpl b/templates/CRM/Contact/Form/Search/Custom/FullText.tpl index 1db51eadf1..6a7d8b516a 100644 --- a/templates/CRM/Contact/Form/Search/Custom/FullText.tpl +++ b/templates/CRM/Contact/Form/Search/Custom/FullText.tpl @@ -62,7 +62,7 @@ {if !$table and $summary.addShowAllLink.Contact}
     {ts}View all results for contacts{/ts} + title="{ts}View all results for contacts{/ts}"> {ts}View all results for contacts{/ts}
    {/if} {* note we using location="below" because we don't want to use rows per page for now. And therefore don't put location="bottom" for now. *} {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if} @@ -125,7 +125,7 @@ {if !$table and $summary.addShowAllLink.Activity}
     {ts}View all results for activities{/ts} + title="{ts}View all results for activities{/ts}"> {ts}View all results for activities{/ts}
    {/if} {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if} @@ -182,7 +182,7 @@ {if !$table and $summary.addShowAllLink.Case}
     {ts}View all results for cases{/ts} + title="{ts}View all results for cases{/ts}"> {ts}View all results for cases{/ts}
    {/if} {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if} @@ -236,7 +236,7 @@ {if !$table and $summary.addShowAllLink.Contribution}
     {ts}View all results for contributions{/ts} + title="{ts}View all results for contributions{/ts}"> {ts}View all results for contributions{/ts}
    {/if} {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if} @@ -293,7 +293,7 @@ {if !$table and $summary.addShowAllLink.Participant}
     {ts}View all results for participants{/ts} + title="{ts}View all results for participants{/ts}"> {ts}View all results for participants{/ts}
    {/if} {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if} {* END Actions/Results section *} @@ -349,7 +349,7 @@ {if !$table and $summary.addShowAllLink.Membership}
     {ts}View all results for memberships{/ts} + title="{ts}View all results for memberships{/ts}"> {ts}View all results for memberships{/ts}
    {/if} {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if} @@ -395,7 +395,7 @@ {if !$table and $summary.addShowAllLink.File}
     {ts}View all results for files{/ts} + title="{ts}View all results for files{/ts}"> {ts}View all results for files{/ts}
    {/if} {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if} {* END Actions/Results section *} diff --git a/templates/CRM/Contact/Form/Search/Intro.tpl b/templates/CRM/Contact/Form/Search/Intro.tpl index 8ee7f07c71..d5d791c3b8 100644 --- a/templates/CRM/Contact/Form/Search/Intro.tpl +++ b/templates/CRM/Contact/Form/Search/Intro.tpl @@ -20,7 +20,7 @@ {capture assign=editSmartGroupURL}{crmURL p="civicrm/contact/search/advanced" q="reset=1&ssID=`$ssID`"}{/capture} {/if}
    - {ts 1=$group.title}Edit Smart Group Search Criteria for %1{/ts} + {ts 1=$group.title}Edit Smart Group Search Criteria for %1{/ts} {help id="id-edit-smartGroup"}
    {/if} @@ -28,7 +28,7 @@ {if $permissionedForGroup} {capture assign=addMembersURL}{crmURL q="context=amtg&amtgID=`$group.id`&reset=1"}{/capture}
    - {ts 1=$group.title}Add Contacts to %1{/ts} + {ts 1=$group.title}Add Contacts to %1{/ts} {if $ssID}{help id="id-add-to-smartGroup"}{/if}
    {/if} diff --git a/templates/CRM/Contact/Form/Search/ResultTasks.tpl b/templates/CRM/Contact/Form/Search/ResultTasks.tpl index 3dfd9d9eb0..1e3e0df3cc 100644 --- a/templates/CRM/Contact/Form/Search/ResultTasks.tpl +++ b/templates/CRM/Contact/Form/Search/ResultTasks.tpl @@ -18,9 +18,9 @@
    {if $action eq 256} - {ts}Advanced Search{/ts}
    + {ts}Advanced Search{/ts}
    {if $context eq 'search'} {* Only show Search Builder link for basic search. *} - {ts}Search Builder{/ts}
    + {ts}Search Builder{/ts}
    {/if} {if $context eq 'smog'} {help id="id-smog-criteria" group_id=$group.id group_title=$group.title ssID=$ssID ssMappingID=$ssMappingID permissionedForGroup=$permissionedForGroup} @@ -30,9 +30,9 @@ {help id="id-basic-criteria"} {/if} {elseif $action eq 512} - {ts}Search Builder{/ts}
    + {ts}Search Builder{/ts}
    {elseif $action eq 8192} - {ts}Advanced Search{/ts}
    + {ts}Advanced Search{/ts}
    {/if}
    diff --git a/templates/CRM/Contact/Form/Search/table.tpl b/templates/CRM/Contact/Form/Search/table.tpl index beedaa55d7..b3c094596d 100644 --- a/templates/CRM/Contact/Form/Search/table.tpl +++ b/templates/CRM/Contact/Form/Search/table.tpl @@ -25,7 +25,7 @@ {$form.value[$x][$i].html|crmAddClass:'required'} {if $i gt 0 or $x gt 1} -   +   {/if} diff --git a/templates/CRM/Contact/Form/Selector.tpl b/templates/CRM/Contact/Form/Selector.tpl index 1f34763c9f..0641bebefb 100644 --- a/templates/CRM/Contact/Form/Selector.tpl +++ b/templates/CRM/Contact/Form/Selector.tpl @@ -10,7 +10,7 @@ {include file="CRM/common/pager.tpl" location="top"} {include file="CRM/common/pagerAToZ.tpl"} - {ts}Reset all selections{/ts} + {ts}Reset all selections{/ts} diff --git a/templates/CRM/Contact/Form/Task/Email.tpl b/templates/CRM/Contact/Form/Task/Email.tpl index 9d1bf5989d..0ab5a8930e 100644 --- a/templates/CRM/Contact/Form/Task/Email.tpl +++ b/templates/CRM/Contact/Form/Task/Email.tpl @@ -30,14 +30,14 @@ diff --git a/templates/CRM/Contact/Import/Form/Preview.tpl b/templates/CRM/Contact/Import/Form/Preview.tpl index d47f3de8f8..15b30f1fbc 100644 --- a/templates/CRM/Contact/Import/Form/Preview.tpl +++ b/templates/CRM/Contact/Import/Form/Preview.tpl @@ -48,7 +48,7 @@ @@ -59,7 +59,7 @@ diff --git a/templates/CRM/Contact/Import/Form/Summary.tpl b/templates/CRM/Contact/Import/Form/Summary.tpl index f4937d1a99..0b3577e65c 100644 --- a/templates/CRM/Contact/Import/Form/Summary.tpl +++ b/templates/CRM/Contact/Import/Form/Summary.tpl @@ -75,7 +75,7 @@ @@ -86,7 +86,7 @@ @@ -97,7 +97,7 @@ @@ -108,7 +108,7 @@ diff --git a/templates/CRM/Contact/Page/CustomSearch.tpl b/templates/CRM/Contact/Page/CustomSearch.tpl index 1198b63dd2..4d9a9600d6 100644 --- a/templates/CRM/Contact/Page/CustomSearch.tpl +++ b/templates/CRM/Contact/Page/CustomSearch.tpl @@ -16,7 +16,7 @@ {if $rows} {foreach from=$rows item=customTitle key=csid}
    - {$customTitle} + {$customTitle}
    {/foreach} {else} diff --git a/templates/CRM/Contact/Page/DashBoardDashlet.tpl b/templates/CRM/Contact/Page/DashBoardDashlet.tpl index 694dc6cb08..54b2634077 100644 --- a/templates/CRM/Contact/Page/DashBoardDashlet.tpl +++ b/templates/CRM/Contact/Page/DashBoardDashlet.tpl @@ -13,11 +13,11 @@ {$communityMessages}
    - {ts}Configure Your Dashboard{/ts} + {ts}Configure Your Dashboard{/ts} - {ts}Refresh Dashboard Data{/ts} + {ts}Refresh Dashboard Data{/ts}
    diff --git a/templates/CRM/Contact/Page/Dashlet.tpl b/templates/CRM/Contact/Page/Dashlet.tpl index 91256848cf..fa1dcfa47c 100644 --- a/templates/CRM/Contact/Page/Dashlet.tpl +++ b/templates/CRM/Contact/Page/Dashlet.tpl @@ -16,7 +16,7 @@
    {foreach from=$availableDashlets item=row key=dashID}
    -
    {$row.label}{if $admin and !$row.is_reserved} {/if}
    +
    {$row.label}{if $admin and !$row.is_reserved} {/if}
    {/foreach}
    @@ -27,7 +27,7 @@
    {foreach from=$contactDashlets.0 item=row key=dashID}
    -
    {$row.label}{if $admin and !$row.is_reserved} {/if}
    +
    {$row.label}{if $admin and !$row.is_reserved} {/if}
    {/foreach}
    @@ -35,7 +35,7 @@
    {foreach from=$contactDashlets.1 item=row key=dashID}
    -
    {$row.label}{if $admin and !$row.is_reserved} {/if}
    +
    {$row.label}{if $admin and !$row.is_reserved} {/if}
    {/foreach}
    diff --git a/templates/CRM/Contact/Page/DedupeException.tpl b/templates/CRM/Contact/Page/DedupeException.tpl index a493541615..2c69cc063c 100644 --- a/templates/CRM/Contact/Page/DedupeException.tpl +++ b/templates/CRM/Contact/Page/DedupeException.tpl @@ -21,7 +21,7 @@
    {$form.cc_id.label} {$form.cc_id.html} - +
    {$form.bcc_id.label} {$form.bcc_id.html} - +
    {$invalidRowCount} {ts}Rows with invalid data in one or more fields (for example, invalid email address formatting). These rows will be skipped (not imported).{/ts} {if $invalidRowCount} -
    {ts}Download Errors{/ts}
    +
    {ts}Download Errors{/ts}
    {/if}
    {$conflictRowCount} {ts}Rows with conflicting email addresses within this file. These rows will be skipped (not imported).{/ts} {if $conflictRowCount} -
    {ts}Download Conflicts{/ts}
    +
    {ts}Download Conflicts{/ts}
    {/if}
    {$invalidRowCount} {ts}Rows with invalid data in one or more fields (for example, invalid email address formatting). These rows will be skipped (not imported).{/ts} {if $invalidRowCount} -
    {ts}Download Errors{/ts}
    +
    {ts}Download Errors{/ts}
    {/if}
    {$unMatchCount} {ts}Rows with mismatched contact IDs... (NOT updated).{/ts} {if $unMatchCount} - <
    {ts}Download Mismatched Contacts{/ts}
    + <
    {ts}Download Mismatched Contacts{/ts}
    {/if}
    {$conflictRowCount} {ts}Rows with conflicting email addresses (NOT imported).{/ts} {if $conflictRowCount} -
    {ts}Download Conflicts{/ts}
    +
    {ts}Download Conflicts{/ts}
    {/if}
    {$duplicateRowCount} {ts}Rows which are duplicates of existing CiviCRM contact records.{/ts} {$dupeActionString} {if $duplicateRowCount} -
    {ts}Download Duplicates{/ts}
    +
    {ts}Download Duplicates{/ts}
    {/if}

    - +
    @@ -60,7 +60,7 @@ { $exception.$contact2name } - {ts}Remove Exception{/ts} + {ts}Remove Exception{/ts} diff --git a/templates/CRM/Contact/Page/DedupeFind.tpl b/templates/CRM/Contact/Page/DedupeFind.tpl index d285385846..9f811b99d2 100644 --- a/templates/CRM/Contact/Page/DedupeFind.tpl +++ b/templates/CRM/Contact/Page/DedupeFind.tpl @@ -107,31 +107,31 @@ {elseif $context eq 'conflicts'} {if call_user_func(array('CRM_Core_Permission','check'), 'force merge duplicate contacts')} {capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge" q="`$urlQuery`&action=map&mode=aggressive" a=1}{/capture} - {ts}Force Merge Selected Duplicates{/ts} + {ts}Force Merge Selected Duplicates{/ts} {capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge" q="`$urlQuery`&action=map" a=1}{/capture} - {ts}Safe Merge Selected Duplicates{/ts} + {ts}Safe Merge Selected Duplicates{/ts} {/if} {capture assign=backURL}{crmURL p="civicrm/contact/dedupefind" q="`$urlQuery`&action=update&selected=0" a=1}{/capture} - {ts}List All Duplicates{/ts} + {ts}List All Duplicates{/ts} {else} {capture assign=backURL}{crmURL p="civicrm/contact/dedupefind" q="`$urlQuery`&action=renew" a=1}{/capture} - {ts}Refresh Duplicates{/ts} + {ts}Refresh Duplicates{/ts} {capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge" q="`$urlQuery`&action=map" a=1}{/capture} - {ts}Batch Merge Selected Duplicates{/ts} + {ts}Batch Merge Selected Duplicates{/ts} {capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge" q=$urlQuery a=1}{/capture} - {ts}Batch Merge All Duplicates{/ts} + {ts}Batch Merge All Duplicates{/ts} - {ts}Flip Selected Duplicates{/ts} + {ts}Flip Selected Duplicates{/ts} {capture assign=backURL}{crmURL p="civicrm/contact/deduperules" q="reset=1" a=1}{/capture} - {ts}Done{/ts} + {ts}Done{/ts} {/if}
    diff --git a/templates/CRM/Contact/Page/Inline/Address.tpl b/templates/CRM/Contact/Page/Inline/Address.tpl index fc0bb61c5a..8861f0ba0f 100644 --- a/templates/CRM/Contact/Page/Inline/Address.tpl +++ b/templates/CRM/Contact/Page/Inline/Address.tpl @@ -12,7 +12,7 @@
    {if $permission EQ 'edit'}
    - {if $add}{ts}Edit address{/ts}{else}{ts}Add address{/ts}{/if} + {if $add}{ts}Edit address{/ts}{else}{ts}Add address{/ts}{/if}
    {/if} {if !$add} @@ -31,7 +31,7 @@ !empty($add.geo_code_2) AND is_numeric($add.geo_code_2) } -
    {ts}Map{/ts} +
    {ts}Map{/ts} {/if}
    diff --git a/templates/CRM/Contact/Page/Inline/CommunicationPreferences.tpl b/templates/CRM/Contact/Page/Inline/CommunicationPreferences.tpl index bacf3cad18..1093e03c92 100644 --- a/templates/CRM/Contact/Page/Inline/CommunicationPreferences.tpl +++ b/templates/CRM/Contact/Page/Inline/CommunicationPreferences.tpl @@ -12,7 +12,7 @@
    {if $permission EQ 'edit'}
    - {ts}Edit communication preferences{/ts} + {ts}Edit communication preferences{/ts}
    {/if}
    diff --git a/templates/CRM/Contact/Page/Inline/ContactInfo.tpl b/templates/CRM/Contact/Page/Inline/ContactInfo.tpl index 9c76fe0673..e6f23db339 100644 --- a/templates/CRM/Contact/Page/Inline/ContactInfo.tpl +++ b/templates/CRM/Contact/Page/Inline/ContactInfo.tpl @@ -12,7 +12,7 @@
    {if $permission EQ 'edit'}
    - {ts}Edit info{/ts} + {ts}Edit info{/ts}
    {/if} diff --git a/templates/CRM/Contact/Page/Inline/ContactName.tpl b/templates/CRM/Contact/Page/Inline/ContactName.tpl index 715c7c5bb9..f32f169cf7 100644 --- a/templates/CRM/Contact/Page/Inline/ContactName.tpl +++ b/templates/CRM/Contact/Page/Inline/ContactName.tpl @@ -11,7 +11,7 @@
    {if $permission EQ 'edit'}
    - {ts}Edit name{/ts} + {ts}Edit name{/ts}
    {/if} diff --git a/templates/CRM/Contact/Page/Inline/Demographics.tpl b/templates/CRM/Contact/Page/Inline/Demographics.tpl index 3746377aaf..dee1ed5c2d 100644 --- a/templates/CRM/Contact/Page/Inline/Demographics.tpl +++ b/templates/CRM/Contact/Page/Inline/Demographics.tpl @@ -11,7 +11,7 @@
    {if $permission EQ 'edit'}
    - {ts}Edit demographics{/ts} + {ts}Edit demographics{/ts}
    {/if}
    diff --git a/templates/CRM/Contact/Page/Inline/Email.tpl b/templates/CRM/Contact/Page/Inline/Email.tpl index bb5323097d..ee977d4314 100644 --- a/templates/CRM/Contact/Page/Inline/Email.tpl +++ b/templates/CRM/Contact/Page/Inline/Email.tpl @@ -12,7 +12,7 @@
    {if $permission EQ 'edit'}
    - {if empty($email)}{ts}Add email{/ts}{else}{ts}Add or edit email{/ts}{/if} + {if empty($email)}{ts}Add email{/ts}{else}{ts}Add or edit email{/ts}{/if}
    {/if} {if empty($email)} diff --git a/templates/CRM/Contact/Page/Inline/IM.tpl b/templates/CRM/Contact/Page/Inline/IM.tpl index 120589befe..1dc0675caf 100644 --- a/templates/CRM/Contact/Page/Inline/IM.tpl +++ b/templates/CRM/Contact/Page/Inline/IM.tpl @@ -12,7 +12,7 @@
    {if $permission EQ 'edit'}
    - {if empty($im)}{ts}Add IM{/ts}{else}{ts}Add or edit IM{/ts}{/if} + {if empty($im)}{ts}Add IM{/ts}{else}{ts}Add or edit IM{/ts}{/if}
    {/if} {if empty($im)} diff --git a/templates/CRM/Contact/Page/Inline/OpenID.tpl b/templates/CRM/Contact/Page/Inline/OpenID.tpl index 9fa4ead72e..2964d8c46f 100644 --- a/templates/CRM/Contact/Page/Inline/OpenID.tpl +++ b/templates/CRM/Contact/Page/Inline/OpenID.tpl @@ -12,7 +12,7 @@
    {if $permission EQ 'edit'}
    - {if empty($openid)}{ts}Add OpenID{/ts}{else}{ts}Add or edit OpenID{/ts}{/if} + {if empty($openid)}{ts}Add OpenID{/ts}{else}{ts}Add or edit OpenID{/ts}{/if}
    {/if} {if empty($openid)} diff --git a/templates/CRM/Contact/Page/Inline/Phone.tpl b/templates/CRM/Contact/Page/Inline/Phone.tpl index 8388f4aee3..953fa202e4 100644 --- a/templates/CRM/Contact/Page/Inline/Phone.tpl +++ b/templates/CRM/Contact/Page/Inline/Phone.tpl @@ -12,7 +12,7 @@
    {if $permission EQ 'edit'}
    - {if empty($phone)}{ts}Add phone{/ts}{else}{ts}Add or edit phone{/ts}{/if} + {if empty($phone)}{ts}Add phone{/ts}{else}{ts}Add or edit phone{/ts}{/if}
    {/if} {if empty($phone)} diff --git a/templates/CRM/Contact/Page/Inline/Website.tpl b/templates/CRM/Contact/Page/Inline/Website.tpl index 79e1b75819..d509655b4d 100644 --- a/templates/CRM/Contact/Page/Inline/Website.tpl +++ b/templates/CRM/Contact/Page/Inline/Website.tpl @@ -12,7 +12,7 @@
    {if $permission EQ 'edit'}
    - {if empty($website)}{ts}Add website{/ts}{else}{ts}Add or edit website{/ts}{/if} + {if empty($website)}{ts}Add website{/ts}{else}{ts}Add or edit website{/ts}{/if}
    {/if} {if empty($website)} diff --git a/templates/CRM/Contact/Page/View/CustomDataFieldView.tpl b/templates/CRM/Contact/Page/View/CustomDataFieldView.tpl index 50cf674c88..e9042f2157 100644 --- a/templates/CRM/Contact/Page/View/CustomDataFieldView.tpl +++ b/templates/CRM/Contact/Page/View/CustomDataFieldView.tpl @@ -11,7 +11,7 @@
    {if $permission EQ 'edit'}
    - {ts}Edit{/ts} + {ts}Edit{/ts}
    {/if} diff --git a/templates/CRM/Contact/Page/View/Note.tpl b/templates/CRM/Contact/Page/View/Note.tpl index 5ff7c4c761..6e8c11ab7f 100644 --- a/templates/CRM/Contact/Page/View/Note.tpl +++ b/templates/CRM/Contact/Page/View/Note.tpl @@ -84,7 +84,7 @@ {if ($permission EQ 'edit' OR $canAddNotes) AND ($action eq 16)}
    - {ts}Add Note{/ts} + {ts}Add Note{/ts}
    {/if} @@ -204,13 +204,13 @@ {if $note.comment_count} - + + {else} - + {/if} diff --git a/templates/CRM/Contact/Page/View/RelationshipPerm.tpl b/templates/CRM/Contact/Page/View/RelationshipPerm.tpl index c23ed1df1f..709b0265c8 100644 --- a/templates/CRM/Contact/Page/View/RelationshipPerm.tpl +++ b/templates/CRM/Contact/Page/View/RelationshipPerm.tpl @@ -24,8 +24,8 @@ {/if} - - + + {if !$displayText} {$permText} diff --git a/templates/CRM/Contact/Page/View/Summary.tpl b/templates/CRM/Contact/Page/View/Summary.tpl index 2fd815c233..bad21b98b2 100644 --- a/templates/CRM/Contact/Page/View/Summary.tpl +++ b/templates/CRM/Contact/Page/View/Summary.tpl @@ -110,7 +110,7 @@ {foreach from=$allTabs key=tabName item=tabValue}
  • - + {$tabValue.title} {if empty($tabValue.hideCount)}{$tabValue.count}{/if} diff --git a/templates/CRM/Contribute/Form/AdditionalPayment.tpl b/templates/CRM/Contribute/Form/AdditionalPayment.tpl index 9148cf7498..d3403fae9b 100644 --- a/templates/CRM/Contribute/Form/AdditionalPayment.tpl +++ b/templates/CRM/Contribute/Form/AdditionalPayment.tpl @@ -29,7 +29,7 @@ {/if} {if $paymentType eq 'owed'}
    - {ts}submit credit card payment{/ts} + {ts}submit credit card payment{/ts}
    {/if} {/if} diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl index 8024fb0d96..b94bcdb332 100644 --- a/templates/CRM/Contribute/Form/Contribution.tpl +++ b/templates/CRM/Contribute/Form/Contribution.tpl @@ -50,7 +50,7 @@ {else} {capture assign=ccModeLink}{crmURL p='civicrm/contact/view/contribution' q="reset=1&action=add&context=standalone&mode=live"}{/capture} {/if} - {ts}submit credit card contribution{/ts} + {ts}submit credit card contribution{/ts}
    • {/if}
    @@ -148,7 +148,7 @@ {if !$isUsePaymentBlock && $contactId && $contribID && $contributionMode EQ null && $contribution_status_id eq 2} {capture assign=payNowLink}{crmURL p='civicrm/contact/view/contribution' q="reset=1&action=update&id=`$contribID`&cid=`$contactId`&context=`$context`&mode=live"}{/capture} - {ts}Pay with Credit Card{/ts} + {ts}Pay with Credit Card{/ts} {/if} diff --git a/templates/CRM/Contribute/Form/Contribution/PreviewHeader.tpl b/templates/CRM/Contribute/Form/Contribution/PreviewHeader.tpl index 48fd5158f5..fe160753f4 100644 --- a/templates/CRM/Contribute/Form/Contribution/PreviewHeader.tpl +++ b/templates/CRM/Contribute/Form/Contribution/PreviewHeader.tpl @@ -9,7 +9,7 @@ *} {* Displays Test-drive mode header for Contribution pages. *}
    - + {ts}Test-drive Your Contribution Page{/ts}

    {ts}This page is currently running in test-drive mode. Transactions will be sent 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. Refer to your payment processor's documentation for information on values to use for test credit card number, security code, postal code, etc.{/ts}

    diff --git a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl index e4a96cc061..bc238abd49 100644 --- a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl +++ b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl @@ -23,13 +23,13 @@ {* Show link to Tell a Friend (CRM-2153) *} {if $friendText} {if !$linkText}

    {/if} {/if} {* Add button for donor to create their own Personal Campaign page *} {if $linkText}
    - {$linkText} + {$linkText}


    {/if} diff --git a/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp b/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp index f854389cef..74944271f7 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp +++ b/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp @@ -13,49 +13,49 @@ {htxt id="id-configure-contrib-pages"} - + - + - + - + - + - + - + - + - + - + - + diff --git a/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl b/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl index 10b8412329..2f8eb10031 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl @@ -60,7 +60,7 @@
    - {ts}Select Code{/ts} + {ts}Select Code{/ts} {else}
    {ts}The code for adding this widget to web pages will be displayed here after you click Save and Preview.{/ts} diff --git a/templates/CRM/Contribute/Form/ContributionView.tpl b/templates/CRM/Contribute/Form/ContributionView.tpl index 439d97e660..c7e0c8fe9c 100644 --- a/templates/CRM/Contribute/Form/ContributionView.tpl +++ b/templates/CRM/Contribute/Form/ContributionView.tpl @@ -17,10 +17,10 @@ {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=update&context=$context&key=$searchKey"} {/if} - {ts}Edit{/ts} + {ts}Edit{/ts} {if $paymentButtonName} - {ts}{$paymentButtonName}{/ts} + {ts}{$paymentButtonName}{/ts} {/if} {/if} {if (call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviContribute') && call_user_func(array('CRM_Core_Permission', 'check'), "delete contributions of type $financial_type") && $canDelete) || (call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviContribute') && $noACL)} @@ -29,7 +29,7 @@ {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=delete&context=$context&key=$searchKey"} {/if} - {ts}Delete{/ts} + {ts}Delete{/ts} {/if} {include file="CRM/common/formButtons.tpl" location="top"} @@ -38,14 +38,14 @@ {if $invoicing}
    - + {if $contribution_status != 'Refunded' && $contribution_status != 'Cancelled' } {ts}Print Invoice{/ts} {else} {ts}Print Invoice and Credit Note{/ts} {/if} - + {ts}Email Invoice{/ts}
    {/if} @@ -341,9 +341,9 @@ {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=update&context=$context&key=$searchKey"} {/if} - {ts}Edit{/ts} + {ts}Edit{/ts} {if $paymentButtonName} - {ts}{$paymentButtonName}{/ts} + {ts}{$paymentButtonName}{/ts} {/if} {/if} {if (call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviContribute') && call_user_func(array('CRM_Core_Permission', 'check'), "delete contributions of type $financial_type") && $canDelete) || (call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviContribute') && $noACL)} @@ -351,7 +351,7 @@ {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=delete&context=$context&key=$searchKey"} {/if} - {ts}Delete{/ts} + {ts}Delete{/ts} {/if} {include file="CRM/common/formButtons.tpl" location="bottom"}
    diff --git a/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl b/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl index 310a064a56..9914571235 100644 --- a/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl +++ b/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl @@ -16,7 +16,7 @@ {if $profileDisplay}
    - + {ts}Profile is not configured with Email address.{/ts}
    {else} diff --git a/templates/CRM/Contribute/Form/PaymentInfoBlock.tpl b/templates/CRM/Contribute/Form/PaymentInfoBlock.tpl index 4847d464a9..bcb23f9a56 100644 --- a/templates/CRM/Contribute/Form/PaymentInfoBlock.tpl +++ b/templates/CRM/Contribute/Form/PaymentInfoBlock.tpl @@ -41,7 +41,7 @@ {/if} {foreach from=$paymentLinks item=paymentLink} - {ts}{$paymentLink.title}{/ts} + {ts}{$paymentLink.title}{/ts} {/foreach} {/crmRegion} diff --git a/templates/CRM/Contribute/Form/SoftCredit.tpl b/templates/CRM/Contribute/Form/SoftCredit.tpl index 817ad26bc0..824ed7c0e5 100644 --- a/templates/CRM/Contribute/Form/SoftCredit.tpl +++ b/templates/CRM/Contribute/Form/SoftCredit.tpl @@ -28,7 +28,7 @@ {/section}
    {ts}Title and Settings{/ts} {ts}Title and Settings{/ts} {ts}Use this form to edit the page title, financial type (e.g. donation, campaign contribution, etc.), goal amount, introduction, and status (active/inactive) for this online contribution page.{/ts}
    {ts}Amount{/ts} {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}Memberships{/ts} {ts}Memberships{/ts} {ts}Use this form to enable and configure a Membership Signup and Renewal section for this Online Contribution Page. If you're not using this page for membership signup, leave the Enabled box un-checked.{/ts}
    {ts}Thank-you and Receipting{/ts} {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 you can add a custom message to that receipt.{/ts}
    {ts}Tell a Friend{/ts} {ts}Tell a Friend{/ts} {ts}Tell a Friend gives your contributors an easy way to spread the word about this fundraising campaign. The contribution thank-you page will include a link to a form where they can enter their friends' email addresses, along with a personalized message. CiviCRM will record these solicitation activities, and will add the friends to your database.{/ts}
    {ts}Include Profiles{/ts} {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}Premiums{/ts} {ts}Premiums{/ts} {ts}Enable the Premiums section for this Online Contribution Page, and customize the title and introductory message (e.g ...in appreciation of your support, you will be able to select from a number of exciting thank-you gifts...). You can optionally provide a contact email address and/or phone number for inquiries. Then select and review the premiums that you want to offer on this contribution page.{/ts}
    {ts}Widget{/ts} {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. 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} {ts}Personal Campaign Pages{/ts} {ts}Allow constituents to create their own personal fundraising pages linked to this contribution page.{/ts}
    {ts}Online Contribution{/ts}
    ({ts}Test-drive{/ts})    		 {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}Online Contribution{/ts}
    ({ts}Live{/ts})    		 {ts}Online Contribution{/ts}
    ({ts}Live{/ts})    		 {ts}Review your customized LIVE online contribution page here. Use the following URL in links and buttons on any website to send visitors to this live page:{/ts}
    {crmURL a=1 fe=1 p="civicrm/contribute/transact" q="reset=1&id=`$contributionPageID`"}
    - {ts}another soft credit{/ts} + {ts}another soft credit{/ts}
    diff --git a/templates/CRM/Contribute/Page/ContributionPage.tpl b/templates/CRM/Contribute/Page/ContributionPage.tpl index 39ab184744..a4665f8026 100644 --- a/templates/CRM/Contribute/Page/ContributionPage.tpl +++ b/templates/CRM/Contribute/Page/ContributionPage.tpl @@ -16,7 +16,7 @@ {if NOT ($action eq 1 or $action eq 2) } - +
    {ts}Add Contribution Page{/ts} {ts}Add Contribution Page{/ts} {ts}Manage Personal Campaign Pages{/ts} {help id="id-pcp-intro" file="CRM/PCP/Page/PCP.hlp"}
    diff --git a/templates/CRM/Contribute/Page/DashBoard.tpl b/templates/CRM/Contribute/Page/DashBoard.tpl index aed10c2c55..5dfc47df28 100644 --- a/templates/CRM/Contribute/Page/DashBoard.tpl +++ b/templates/CRM/Contribute/Page/DashBoard.tpl @@ -55,7 +55,7 @@ {ts}Manage Contribution Pages{/ts} - {ts}Add Contribution Page{/ts} + {ts}Add Contribution Page{/ts} diff --git a/templates/CRM/Contribute/Page/Premium.tpl b/templates/CRM/Contribute/Page/Premium.tpl index 2c51cce1cf..3737acf5ae 100644 --- a/templates/CRM/Contribute/Page/Premium.tpl +++ b/templates/CRM/Contribute/Page/Premium.tpl @@ -43,7 +43,7 @@
    {if $products}
    - {ts}Offer Another Premium on this Contribution Page{/ts} + {ts}Offer Another Premium on this Contribution Page{/ts}
    {/if}
    diff --git a/templates/CRM/Contribute/Page/Tab.tpl b/templates/CRM/Contribute/Page/Tab.tpl index f154d5d1bf..8f17298405 100644 --- a/templates/CRM/Contribute/Page/Tab.tpl +++ b/templates/CRM/Contribute/Page/Tab.tpl @@ -48,9 +48,9 @@ {if $action eq 16 and $permission EQ 'edit'}
    - {ts}Record Contribution (Check, Cash, EFT ...){/ts} + {ts}Record Contribution (Check, Cash, EFT ...){/ts} {if $newCredit} - {ts}Submit Credit Card Contribution{/ts} + {ts}Submit Credit Card Contribution{/ts} {/if}

    diff --git a/templates/CRM/Contribute/Page/UserDashboard.tpl b/templates/CRM/Contribute/Page/UserDashboard.tpl index eb95300e2b..29ae828479 100644 --- a/templates/CRM/Contribute/Page/UserDashboard.tpl +++ b/templates/CRM/Contribute/Page/UserDashboard.tpl @@ -49,7 +49,7 @@ {if call_user_func(array('CRM_Core_Permission','check'), 'view my invoices') OR call_user_func(array('CRM_Core_Permission','check'), 'access CiviContribute')} - + {if $row.contribution_status_name != 'Refunded' && $row.contribution_status_name != 'Cancelled' } {ts}Print Invoice{/ts} {else} diff --git a/templates/CRM/Core/I18n/Dialog.tpl b/templates/CRM/Core/I18n/Dialog.tpl index 429952a664..a63991513d 100644 --- a/templates/CRM/Core/I18n/Dialog.tpl +++ b/templates/CRM/Core/I18n/Dialog.tpl @@ -9,6 +9,6 @@ *} {if $config->languageLimit && $config->languageLimit|@count >= 2 and $translatePermission } - + {/if} diff --git a/templates/CRM/Core/Page/RecurringEntityPreview.tpl b/templates/CRM/Core/Page/RecurringEntityPreview.tpl index ec36313d52..9b83796ba9 100644 --- a/templates/CRM/Core/Page/RecurringEntityPreview.tpl +++ b/templates/CRM/Core/Page/RecurringEntityPreview.tpl @@ -9,7 +9,7 @@ *} {if !empty($participantData)}
    - + {ts}There are participants registered for repeating events being removed from the set. Those with participants will be converted to standalone events, and those without registration will be deleted.{/ts}
    diff --git a/templates/CRM/Custom/Form/Edit/CustomData.tpl b/templates/CRM/Custom/Form/Edit/CustomData.tpl index 4af5020783..8228791b3c 100644 --- a/templates/CRM/Custom/Form/Edit/CustomData.tpl +++ b/templates/CRM/Custom/Form/Edit/CustomData.tpl @@ -34,7 +34,7 @@ {else} diff --git a/templates/CRM/Custom/Form/Field.tpl b/templates/CRM/Custom/Form/Field.tpl index 83a8dd57e3..f6be9fb9c3 100644 --- a/templates/CRM/Custom/Form/Field.tpl +++ b/templates/CRM/Custom/Form/Field.tpl @@ -27,7 +27,7 @@ {if $action eq 2 and $changeFieldType}
    - + {ts}Change Input Field Type{/ts}
    @@ -63,7 +63,7 @@ {$form.group_id.html}   {ts}Advanced Filter{/ts} {capture assign=searchPreferences}{crmURL p="civicrm/admin/setting/search" q="reset=1"}{/capture} -
    {ts 1=$searchPreferences}If you are planning on using this field in front-end profile, event registration or contribution forms, you should 'Limit List to Group' or configure an 'Advanced Filter' (so that you do not unintentionally expose your entire set of contacts). Users must have either 'access contact reference fields' OR 'access CiviCRM' permission in order to use contact reference autocomplete fields. You can assign 'access contact reference fields' to the anonymous role if you want un-authenticated visitors to use this field. Use Search Preferences - Contact Reference Options to control the fields included in the search results.{/ts} +
    {ts 1=$searchPreferences}If you are planning on using this field in front-end profile, event registration or contribution forms, you should 'Limit List to Group' or configure an 'Advanced Filter' (so that you do not unintentionally expose your entire set of contacts). Users must have either 'access contact reference fields' OR 'access CiviCRM' permission in order to use contact reference autocomplete fields. You can assign 'access contact reference fields' to the anonymous role if you want un-authenticated visitors to use this field. Use Search Preferences - Contact Reference Options to control the fields included in the search results.{/ts}
    diff --git a/templates/CRM/Custom/Form/Optionfields.tpl b/templates/CRM/Custom/Form/Optionfields.tpl index c4cf3c8b31..0b14545951 100644 --- a/templates/CRM/Custom/Form/Optionfields.tpl +++ b/templates/CRM/Custom/Form/Optionfields.tpl @@ -42,7 +42,7 @@
    {if $index GT 1} - + {/if} @@ -61,7 +61,7 @@ {/section}
    {ts}If you need additional options - you can add them after you Save your current entries.{/ts} diff --git a/templates/CRM/Custom/Page/CustomDataView.tpl b/templates/CRM/Custom/Page/CustomDataView.tpl index 3cddab39b4..fafb2fd82d 100644 --- a/templates/CRM/Custom/Page/CustomDataView.tpl +++ b/templates/CRM/Custom/Page/CustomDataView.tpl @@ -24,7 +24,7 @@ {ts 1=$cd_edit.title}Edit %1{/ts}

    + class="button" style="margin-left: 6px;"> {ts 1=$cd_edit.title}Edit %1{/ts}

    {/if} @@ -43,7 +43,7 @@ - {ts}Delete{/ts} + {ts}Delete{/ts}
    {/if} diff --git a/templates/CRM/Dashlet/Page/Blog.tpl b/templates/CRM/Dashlet/Page/Blog.tpl index df8e45a04d..16d33ff2de 100644 --- a/templates/CRM/Dashlet/Page/Blog.tpl +++ b/templates/CRM/Dashlet/Page/Blog.tpl @@ -52,7 +52,7 @@
    {$article.description}
    -

    {ts}read more{/ts}…

    +

    {ts}read more{/ts}…

    {/foreach} diff --git a/templates/CRM/Dashlet/Page/CaseDashboard.tpl b/templates/CRM/Dashlet/Page/CaseDashboard.tpl index 4107849a3f..36811b2db9 100644 --- a/templates/CRM/Dashlet/Page/CaseDashboard.tpl +++ b/templates/CRM/Dashlet/Page/CaseDashboard.tpl @@ -18,7 +18,7 @@ - {ts}New Case{/ts} + {ts}New Case{/ts} @@ -26,19 +26,19 @@ {if $myCases} - {ts}Show ALL Cases with Upcoming Activities{/ts} + {ts}Show ALL Cases with Upcoming Activities{/ts} {else} - {ts}Show My Cases with Upcoming Activities{/ts} + {ts}Show My Cases with Upcoming Activities{/ts} {/if} - {ts}Show My Cases{/ts} + {ts}Show My Cases{/ts} diff --git a/templates/CRM/Event/Cart/Page/ViewCart.tpl b/templates/CRM/Event/Cart/Page/ViewCart.tpl index 65e671ca8b..0cfd2c1db4 100644 --- a/templates/CRM/Event/Cart/Page/ViewCart.tpl +++ b/templates/CRM/Event/Cart/Page/ViewCart.tpl @@ -30,7 +30,7 @@ {/foreach} - {ts}Checkout{/ts} + {ts}Checkout{/ts}
    {/if} - Back to Event List + Back to Event List diff --git a/templates/CRM/Event/Form/EventFees.tpl b/templates/CRM/Event/Form/EventFees.tpl index a786cb2310..355e821caa 100644 --- a/templates/CRM/Event/Form/EventFees.tpl +++ b/templates/CRM/Event/Form/EventFees.tpl @@ -32,7 +32,7 @@ - {ts}Change Selections{/ts} + {ts}Change Selections{/ts} {else} {* New participant *} diff --git a/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl b/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl index 5038b97660..8d48983cc5 100644 --- a/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl +++ b/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl @@ -25,7 +25,7 @@
    {ts 1=$entity_type}Change applies to every %1 in the series.{/ts}
    -
    {ts}Changes to date or time will not be applied to others in the series.{/ts}
    +
    {ts}Changes to date or time will not be applied to others in the series.{/ts}
    {literal} diff --git a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl index ca6cfbc87b..8e1b0645c1 100644 --- a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl +++ b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl @@ -74,7 +74,7 @@ {$form.max_participants.html|crmAddClass:four} {if call_user_func(array('CRM_Core_Permission','check'), 'administer CiviCRM') } - + {/if} diff --git a/templates/CRM/Event/Form/ManageEvent/Registration.tpl b/templates/CRM/Event/Form/ManageEvent/Registration.tpl index 7c60d0a5a0..4858e98032 100644 --- a/templates/CRM/Event/Form/ManageEvent/Registration.tpl +++ b/templates/CRM/Event/Form/ManageEvent/Registration.tpl @@ -12,8 +12,8 @@ width="20%">{if $addProfileBottomAdd }{$form.additional_custom_post_id_multiple[$profileBottomNumAdd].label} {else}{$form.custom_post_id_multiple[$profileBottomNum].label}{/if} {if $addProfileBottomAdd }{$form.additional_custom_post_id_multiple[$profileBottomNumAdd].html}{else}{$form.custom_post_id_multiple[$profileBottomNum].html}{/if} - {ts}remove profile{/ts} -   {ts}add another profile (bottom of page){/ts} + {ts}remove profile{/ts} +   {ts}add another profile (bottom of page){/ts} {if $addProfileBottomAdd }
    {ts}Change this if you want to use a different profile for additional participants.{/ts}
    @@ -140,7 +140,7 @@ {$form.custom_post_id.label} {$form.custom_post_id.html}
    {ts}Include additional fields on this registration form by selecting and configuring a CiviCRM Profile to be included at the bottom of the page.{/ts}
    - {ts}add another profile (bottom of page){/ts} + {ts}add another profile (bottom of page){/ts}
    @@ -154,13 +154,13 @@   - {ts}remove profile{/ts} + {ts}remove profile{/ts}    @@ -185,7 +185,7 @@
    {ts}Change this if you want to use a different profile for additional participants.{/ts}
    - {ts}add another profile (bottom of page){/ts} + {ts}add another profile (bottom of page){/ts}
    @@ -199,12 +199,12 @@   - {ts}remove profile{/ts} + {ts}remove profile{/ts} diff --git a/templates/CRM/Event/Form/ManageEvent/Tab.hlp b/templates/CRM/Event/Form/ManageEvent/Tab.hlp index 00247c78c6..026ceeeda1 100644 --- a/templates/CRM/Event/Form/ManageEvent/Tab.hlp +++ b/templates/CRM/Event/Form/ManageEvent/Tab.hlp @@ -13,54 +13,54 @@ {htxt id="id-configure-events"} - + - + - + - + - + {if !$params.isTemplate} {if $params.participantListingURL} - + {if $config->userSystem->is_drupal} {else} {/if} {else} - + - + {if $params.isOnlineRegistration} - + - + diff --git a/templates/CRM/Event/Form/Participant.tpl b/templates/CRM/Event/Form/Participant.tpl index 2f8fa217b5..069ad4e287 100644 --- a/templates/CRM/Event/Form/Participant.tpl +++ b/templates/CRM/Event/Form/Participant.tpl @@ -106,7 +106,7 @@ } if ( showError ) { - cj('#validate_pricefield').show().html('{/literal} {ts escape='js'}This Option is already full for this event.{/ts}{literal}'); + cj('#validate_pricefield').show().html('{/literal} {ts escape='js'}This Option is already full for this event.{/ts}{literal}'); } else { cj('#validate_pricefield').hide( ).html(''); @@ -175,7 +175,7 @@ {else} {capture assign=ccModeLink}{crmURL p='civicrm/contact/view/participant' q="reset=1&action=add&context=standalone&mode=live"}{/capture} {/if} - {ts}submit credit card event registration{/ts} + {ts}submit credit card event registration{/ts} {/if}
    diff --git a/templates/CRM/Event/Form/ParticipantFeeSelection.tpl b/templates/CRM/Event/Form/ParticipantFeeSelection.tpl index 3aed291cf0..02246d54cb 100644 --- a/templates/CRM/Event/Form/ParticipantFeeSelection.tpl +++ b/templates/CRM/Event/Form/ParticipantFeeSelection.tpl @@ -87,7 +87,7 @@ CRM.$(function($) {
    {include file="CRM/common/formButtons.tpl" location="bottom"}
    {if !$email}
    -  {ts}You will not be able to send an automatic email receipt for this payment because there is no email address recorded for this contact. If you want a receipt to be sent when this payment is recorded, click Cancel and then click Edit from the Summary tab to add an email address before recording the payment.{/ts} +  {ts}You will not be able to send an automatic email receipt for this payment because there is no email address recorded for this contact. If you want a receipt to be sent when this payment is recorded, click Cancel and then click Edit from the Summary tab to add an email address before recording the payment.{/ts}
    {/if}
    {ts}Info & Settings{/ts} {ts}Info & Settings{/ts} {ts}Set event title, type (conference, performance etc.), description, start and end dates, maximum number of participants, and activate the event. Enable the public participant listing feature.{/ts}
    {ts}Location{/ts} {ts}Location{/ts} {ts}Set event location and event contact information (email and phone).{/ts}
    {ts}Fees{/ts} {ts}Fees{/ts} {ts}Determine if the event is free or paid. For paid events, set the payment processor, fee level(s) and discounts. Give online registrants the option to 'pay later' (e.g. mail in a check, call in a credit card, etc.).{/ts}
    {ts}Online Registration{/ts} {ts}Online Registration{/ts} {ts}Determine whether an online registration page is available. If so, configure registration, confirmation and thank you page elements and confirmation email details.{/ts}
    {ts}Tell a Friend{/ts} {ts}Tell a Friend{/ts} {ts}Make it easy for participants to spread the word about this event to friends and colleagues.{/ts}
    {ts}Participant Listing{/ts} {ts}Participant Listing{/ts}{ts 1=$params.participantListingURL}The following URL will display a list of registered participants for this event to users whose role includes "view event participants" permission: %1{/ts}{ts 1=$params.participantListingURL}The following URL will display a list of registered participants for this event: %1{/ts} {ts}Participant Listing{/ts} {ts}Participant Listing{/ts} {ts}Participant Listing is not enabled for this event. You can enable it from{/ts} {ts}Event Information and Settings{/ts}. {/if}
    {ts}Event Info{/ts} {ts}Event Info{/ts} {ts}View the Event Information page as it will be displayed to site visitors.{/ts}
    {ts}Registration{/ts}
    ({ts}test-drive{/ts})    		 {ts}Registration{/ts}
    ({ts}test-drive{/ts})    		 {ts}Test-drive the entire online registration process - including custom fields, confirmation, thank-you page, and receipting. Fee payment 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 participant and contribution records will be saved to the database. Use obvious test contact names so you can review and delete these records as needed.{/ts}
    {ts}Registration{/ts}
    ({ts}live{/ts})    		 {ts}Registration{/ts}
    ({ts}live{/ts})    		 {ts}Review your customized LIVE online event registration page here. Use the following URL in links and buttons on any website to send visitors to this live page{/ts}:
    {crmURL a=1 fe=1 p='civicrm/event/register' q="reset=1&id=`$params.eventId`"}
    @@ -123,7 +123,7 @@ CRM.$(function($) {
    {ts}Total Paid{/ts}
    {$paymentInfo.paid|crmMoney}
    - {ts}view payments{/ts} + {ts}view payments{/ts}
    {ts}Balance Owed{/ts}
    diff --git a/templates/CRM/Event/Form/ParticipantView.tpl b/templates/CRM/Event/Form/ParticipantView.tpl index 64d9e84363..0a49832e64 100644 --- a/templates/CRM/Event/Form/ParticipantView.tpl +++ b/templates/CRM/Event/Form/ParticipantView.tpl @@ -16,14 +16,14 @@ {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=update&context=$context&selectedChild=event&key=$searchKey"} {/if} - {ts}Edit{/ts} + {ts}Edit{/ts} {/if} {if call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviEvent')} {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=delete&context=$context&selectedChild=event"} {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=delete&context=$context&selectedChild=event&key=$searchKey"} {/if} - {ts}Delete{/ts} + {ts}Delete{/ts} {/if} {include file="CRM/common/formButtons.tpl" location="top"} @@ -34,7 +34,7 @@ @@ -99,10 +99,10 @@ @@ -132,14 +132,14 @@ {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=update&context=$context&selectedChild=event&key=$searchKey"} {/if} - {ts}Edit{/ts} + {ts}Edit{/ts} {/if} {if call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviEvent')} {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=delete&context=$context&selectedChild=event"} {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=delete&context=$context&selectedChild=event&key=$searchKey"} {/if} - {ts}Delete{/ts} + {ts}Delete{/ts} {/if} {include file="CRM/common/formButtons.tpl" location="bottom"} diff --git a/templates/CRM/Event/Form/Registration/PreviewHeader.tpl b/templates/CRM/Event/Form/Registration/PreviewHeader.tpl index 8ede044020..395974c33d 100644 --- a/templates/CRM/Event/Form/Registration/PreviewHeader.tpl +++ b/templates/CRM/Event/Form/Registration/PreviewHeader.tpl @@ -9,7 +9,7 @@ *} {* Displays Test-drive mode header for Event Registration pages. *}
    - + {ts}Test-drive Your Event Registration Page{/ts} {ts}This page is currently running in test-drive mode. If this is a paid event, transactions will be sent to your payment processor's test server. No live financial transactions will be submitted. However, a contact record will be created or updated and test event registration and contribution records will be saved to the database. Use obvious test contact names so you can review and delete these records as needed. Refer to your payment processor's documentation for information on values to use for test credit card number, security code, postal code, etc.{/ts}
    diff --git a/templates/CRM/Event/Form/Registration/ThankYou.tpl b/templates/CRM/Event/Form/Registration/ThankYou.tpl index 3fa05ece88..0929bc97c9 100644 --- a/templates/CRM/Event/Form/Registration/ThankYou.tpl +++ b/templates/CRM/Event/Form/Registration/ThankYou.tpl @@ -26,14 +26,14 @@ {* Show link to Tell a Friend (CRM-2153) *} {if $friendText}

    {/if} {* Add button for donor to create their own Personal Campaign page *} {if $pcpLink}
    - {$pcpLinkText} + {$pcpLinkText}


    {/if} @@ -195,7 +195,7 @@ {/if}
    - {ts 1=$event.event_title}Back to "%1" event information{/ts} + {ts 1=$event.event_title}Back to "%1" event information{/ts}
    {if $event.is_public } diff --git a/templates/CRM/Event/Form/Selector.tpl b/templates/CRM/Event/Form/Selector.tpl index 7a0dbeeaf2..e0cdefac6e 100644 --- a/templates/CRM/Event/Form/Selector.tpl +++ b/templates/CRM/Event/Form/Selector.tpl @@ -73,11 +73,11 @@ {if $limit and $pager->_totalItems GT $limit } {if $context EQ 'event_dashboard' } - + {elseif $context eq 'participant' } - + {/if} {/if} diff --git a/templates/CRM/Event/Page/DashBoard.tpl b/templates/CRM/Event/Page/DashBoard.tpl index 01d4a32dd1..5adabbf381 100644 --- a/templates/CRM/Event/Page/DashBoard.tpl +++ b/templates/CRM/Event/Page/DashBoard.tpl @@ -16,8 +16,8 @@ {capture assign=htmlFeed}{crmURL p='civicrm/event/ical' q="reset=1&list=1&html=1" fe=1 a=1}{/capture} {if $eventSummary.total_events} - {ts}Manage Events{/ts} - {ts}New Event{/ts} + {ts}Manage Events{/ts} + {ts}New Event{/ts}
     

    {ts}Event Summary{/ts} {help id="id-event-intro"} @@ -91,7 +91,7 @@ {if $actionColumn}

    {$displayName}
    {include file="CRM/Price/Page/LineItem.tpl" context="Event"} {if call_user_func(array('CRM_Core_Permission','check'), 'edit event participants')} {if $hasPayment or $parentHasPayment} - {ts}Change Selections{/ts} + {ts}Change Selections{/ts} {/if} {if $transferOrCancelLink} - {ts}Transfer or Cancel{/ts} + {ts}Transfer or Cancel{/ts} {/if} {/if}
    {ts}Find more event participants{/ts}...
    {ts}Find more event participants{/ts}...
    {ts}View all events for this contact{/ts}...
    {ts}View all events for this contact{/ts}...
    {if $values.isMap} -  {ts}Map{/ts} +  {ts}Map{/ts}  |  {/if} {if $values.configure} @@ -122,7 +122,7 @@
    {if $eventSummary.total_events GT 10} - + {/if} {else}
    diff --git a/templates/CRM/Event/Page/EventInfo.tpl b/templates/CRM/Event/Page/EventInfo.tpl index a64ccf378c..6bb4cc6d24 100644 --- a/templates/CRM/Event/Page/EventInfo.tpl +++ b/templates/CRM/Event/Page/EventInfo.tpl @@ -12,7 +12,7 @@ {if $registerClosed }
    - +  {ts}Registration is closed for this event{/ts}
    {/if} @@ -23,7 +23,7 @@
  • - +
    diff --git a/templates/CRM/Event/Page/List.tpl b/templates/CRM/Event/Page/List.tpl index 94a2b12913..e5f5fa182f 100644 --- a/templates/CRM/Event/Page/List.tpl +++ b/templates/CRM/Event/Page/List.tpl @@ -11,8 +11,8 @@ {include file="CRM/common/jsortable.tpl"}
    {if $eventCartEnabled} - {ts}View Cart{/ts} - {ts}Checkout{/ts} + {ts}View Cart{/ts} + {ts}Checkout{/ts} {/if} diff --git a/templates/CRM/Event/Page/ManageEvent.tpl b/templates/CRM/Event/Page/ManageEvent.tpl index 8703fc6c49..65c95a62d8 100644 --- a/templates/CRM/Event/Page/ManageEvent.tpl +++ b/templates/CRM/Event/Page/ManageEvent.tpl @@ -20,7 +20,7 @@
    - {ts}Add Event{/ts} + {ts}Add Event{/ts}
    diff --git a/templates/CRM/Event/Page/Tab.tpl b/templates/CRM/Event/Page/Tab.tpl index d1807ecb37..a85621d558 100644 --- a/templates/CRM/Event/Page/Tab.tpl +++ b/templates/CRM/Event/Page/Tab.tpl @@ -28,9 +28,9 @@ {if $action eq 16 and $permission EQ 'edit'}
    - {ts}Add Event Registration{/ts} + {ts}Add Event Registration{/ts} {if $accessContribution and $newCredit} - {ts}Submit Credit Card Event Registration{/ts} + {ts}Submit Credit Card Event Registration{/ts} {/if}

    diff --git a/templates/CRM/Financial/Form/Search.tpl b/templates/CRM/Financial/Form/Search.tpl index 6839b0d0f1..3cc7b90473 100644 --- a/templates/CRM/Financial/Form/Search.tpl +++ b/templates/CRM/Financial/Form/Search.tpl @@ -11,7 +11,7 @@ {* Financial search component. *}
    - {ts}New Accounting Batch{/ts} + {ts}New Accounting Batch{/ts}
    diff --git a/templates/CRM/Financial/Page/FinancialAccount.tpl b/templates/CRM/Financial/Page/FinancialAccount.tpl index 95c8044ac6..711003614e 100644 --- a/templates/CRM/Financial/Page/FinancialAccount.tpl +++ b/templates/CRM/Financial/Page/FinancialAccount.tpl @@ -20,7 +20,7 @@
    {if $action ne 1 and $action ne 2}
    - {ts}Add Financial Account{/ts} + {ts}Add Financial Account{/ts}
    {/if} @@ -62,7 +62,7 @@ {if $action ne 1 and $action ne 2}
    - {ts}Add Financial Account{/ts} + {ts}Add Financial Account{/ts}
    {/if}
    diff --git a/templates/CRM/Form/attachment.tpl b/templates/CRM/Form/attachment.tpl index bbe6bf8a23..687751331d 100644 --- a/templates/CRM/Form/attachment.tpl +++ b/templates/CRM/Form/attachment.tpl @@ -15,7 +15,7 @@ {foreach from=$currentAttachmentInfo key=attKey item=attVal}
    - {$attVal.cleanName} + {$attVal.cleanName} {if $attVal.description} - {$attVal.description}{/if} {if !empty($attVal.tag)}
    @@ -47,7 +47,7 @@ {/if}
    - @@ -68,7 +68,7 @@ - + diff --git a/templates/CRM/Form/body.tpl b/templates/CRM/Form/body.tpl index 07193943f8..40162fb009 100644 --- a/templates/CRM/Form/body.tpl +++ b/templates/CRM/Form/body.tpl @@ -17,7 +17,7 @@ {if ($snippet !== 'json') and !$suppressForm and count($form.errors) gt 0}
    - + {ts}Please correct the following errors in the form fields below:{/ts}
      {foreach from=$form.errors key=errorName item=error} diff --git a/templates/CRM/Friend/Form.tpl b/templates/CRM/Friend/Form.tpl index 35adaaf9ae..3adbc78260 100644 --- a/templates/CRM/Friend/Form.tpl +++ b/templates/CRM/Friend/Form.tpl @@ -16,7 +16,7 @@ {* Add button for donor to create their own Personal Campaign page *} {if $linkText}
      - {$linkText} + {$linkText}


      {/if} diff --git a/templates/CRM/Grant/Form/GrantView.tpl b/templates/CRM/Grant/Form/GrantView.tpl index 97d1b9a64f..c30e777d4c 100644 --- a/templates/CRM/Grant/Form/GrantView.tpl +++ b/templates/CRM/Grant/Form/GrantView.tpl @@ -15,14 +15,14 @@ {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contactId&action=update&context=$context&key=$searchKey"} {/if} - {ts}Edit{/ts} + {ts}Edit{/ts} {/if} {if call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviGrant')} {assign var='urlParams' value="reset=1&id=$id&cid=$contactId&action=delete&context=$context"} {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contactId&action=delete&context=$context&key=$searchKey"} {/if} - {ts}Delete{/ts} + {ts}Delete{/ts} {/if} {include file="CRM/common/formButtons.tpl" location="top"}
    @@ -52,14 +52,14 @@ {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contactId&action=update&context=$context&key=$searchKey"} {/if} - {ts}Edit{/ts} + {ts}Edit{/ts} {/if} {if call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviGrant')} {assign var='urlParams' value="reset=1&id=$id&cid=$contactId&action=delete&context=$context"} {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contactId&action=delete&context=$context&key=$searchKey"} {/if} - {ts}Delete{/ts} + {ts}Delete{/ts} {/if} {include file="CRM/common/formButtons.tpl" location="bottom"} diff --git a/templates/CRM/Grant/Form/Selector.tpl b/templates/CRM/Grant/Form/Selector.tpl index ea4ed83662..d3a1311fbe 100644 --- a/templates/CRM/Grant/Form/Selector.tpl +++ b/templates/CRM/Grant/Form/Selector.tpl @@ -56,7 +56,7 @@ {if ($context EQ 'dashboard') AND $pager->_totalItems GT $limit} - + {/if}
    {$form.attachFile_1.label}{$form.attachFile_1.html} {$form.attachDesc_1.html} + {$form.attachFile_1.html} {$form.attachDesc_1.html}
    {ts}Browse to the file you want to upload.{/ts}{if $maxAttachments GT 1} {ts 1=$maxAttachments}You can have a maximum of %1 attachment(s).{/ts}{/if} {ts 1=$config->maxFileSize}Each file must be less than %1M in size. You can also add a short description.{/ts}
    {$form.attachFile_1.label}{$form.$attachName.html} {$form.$attachDesc.html}{$form.$attachName.html} {$form.$attachDesc.html}
    {$form.$tagElement.label}
    {ts}List more Grants{/ts}...
    {ts}List more Grants{/ts}...
    diff --git a/templates/CRM/Grant/Page/Tab.tpl b/templates/CRM/Grant/Page/Tab.tpl index 1e517ba1f5..8ad0066174 100644 --- a/templates/CRM/Grant/Page/Tab.tpl +++ b/templates/CRM/Grant/Page/Tab.tpl @@ -27,7 +27,7 @@
    {if $action eq 16 and $permission EQ 'edit'}
    - {ts}Add Grant{/ts}

    + {ts}Add Grant{/ts}

    {/if} {if $rows} diff --git a/templates/CRM/Group/Form/Edit.tpl b/templates/CRM/Group/Form/Edit.tpl index 7ed434f69b..42b82ac93e 100644 --- a/templates/CRM/Group/Form/Edit.tpl +++ b/templates/CRM/Group/Form/Edit.tpl @@ -82,15 +82,15 @@
    {include file="CRM/common/formButtons.tpl" location="bottom"}
    {if $action neq 1}
    - {ts}Contacts in this Group{/ts} + {ts}Contacts in this Group{/ts} {if $group.saved_search_id}
    {if $group.mapping_id} - {ts}Edit Smart Group Criteria{/ts} + {ts}Edit Smart Group Criteria{/ts} {elseif $group.search_custom_id} - {ts}Edit Smart Group Criteria{/ts} + {ts}Edit Smart Group Criteria{/ts} {else} - {ts}Edit Smart Group Criteria{/ts} + {ts}Edit Smart Group Criteria{/ts} {/if} {/if} diff --git a/templates/CRM/Group/Page/Group.tpl b/templates/CRM/Group/Page/Group.tpl index c5eaf2861b..f36bfdc743 100644 --- a/templates/CRM/Group/Page/Group.tpl +++ b/templates/CRM/Group/Page/Group.tpl @@ -10,7 +10,7 @@ {* Actions: 1=add, 2=edit, browse=16, delete=8 *} {if $action ne 1 and $action ne 2 and $action ne 8 and $groupPermission eq 1}
    - {ts}Add Group{/ts}
    + {ts}Add Group{/ts}
    {/if} {* action ne add or edit *}
    @@ -31,7 +31,7 @@ {if $action ne 1 and $action ne 2 and $action ne 8 and $groupPermission eq 1}
    - {ts}Add Group{/ts}
    + {ts}Add Group{/ts}
    {/if} {* action ne add or edit *}
    diff --git a/templates/CRM/Logging/ReportDetail.tpl b/templates/CRM/Logging/ReportDetail.tpl index dbe64961a7..63b3e7c1a0 100644 --- a/templates/CRM/Logging/ReportDetail.tpl +++ b/templates/CRM/Logging/ReportDetail.tpl @@ -32,8 +32,8 @@ {/if} {if $layout neq 'overlay'}
    - {ts}Back to Logging Summary{/ts} - {ts}Revert These Changes{/ts} + {ts}Back to Logging Summary{/ts} + {ts}Revert These Changes{/ts}
    {/if}
    diff --git a/templates/CRM/Mailing/Form/ForwardMailing.tpl b/templates/CRM/Mailing/Form/ForwardMailing.tpl index 449d7a33d5..e8e6205d8e 100644 --- a/templates/CRM/Mailing/Form/ForwardMailing.tpl +++ b/templates/CRM/Mailing/Form/ForwardMailing.tpl @@ -21,7 +21,7 @@
    - {ts}Add Membership{/ts} + {ts}Add Membership{/ts} {if $accessContribution and $newCredit} - {ts}Submit Credit Card Membership{/ts}

    + {ts}Submit Credit Card Membership{/ts}

    {else}

    {/if} diff --git a/templates/CRM/PCP/Form/PCPAccount.tpl b/templates/CRM/PCP/Form/PCPAccount.tpl index 1ab7341e59..fb205cad3f 100644 --- a/templates/CRM/PCP/Form/PCPAccount.tpl +++ b/templates/CRM/PCP/Form/PCPAccount.tpl @@ -20,7 +20,7 @@ {if $profileDisplay}
    - + {ts}Profile is not configured with Email address.{/ts}
    {else} diff --git a/templates/CRM/PCP/Page/PCPInfo.tpl b/templates/CRM/PCP/Page/PCPInfo.tpl index f03310b465..450f685bf5 100644 --- a/templates/CRM/PCP/Page/PCPInfo.tpl +++ b/templates/CRM/PCP/Page/PCPInfo.tpl @@ -25,13 +25,13 @@ {foreach from = $links key = k item = v} - {$v.name} + {$v.name}  {$hints.$k} {/foreach} - + {ts}Tip{/ts} - {ts}You must be logged in to your account to access the editing options above. (If you visit this page without logging in, you will be viewing the page in "live" mode - as your visitors and friends see it.){/ts}
    {/if} diff --git a/templates/CRM/Pledge/Form/Selector.tpl b/templates/CRM/Pledge/Form/Selector.tpl index 231074defd..4df4985e81 100644 --- a/templates/CRM/Pledge/Form/Selector.tpl +++ b/templates/CRM/Pledge/Form/Selector.tpl @@ -62,7 +62,7 @@ {* Dashboard only lists 10 most recent pledges. *} {if $context EQ 'dashboard' and $limit and $pager->_totalItems GT $limit } - {ts}Find more pledges{/ts}... + {ts}Find more pledges{/ts}... {/if} diff --git a/templates/CRM/Pledge/Page/Tab.tpl b/templates/CRM/Pledge/Page/Tab.tpl index b143f37b67..38740278c9 100644 --- a/templates/CRM/Pledge/Page/Tab.tpl +++ b/templates/CRM/Pledge/Page/Tab.tpl @@ -24,7 +24,7 @@ {if $action eq 16 and $permission EQ 'edit'}
    - {ts}Add Pledge{/ts} + {ts}Add Pledge{/ts}

    {/if} diff --git a/templates/CRM/Price/Form/OptionFields.tpl b/templates/CRM/Price/Form/OptionFields.tpl index 09a2336d54..80deab4666 100644 --- a/templates/CRM/Price/Form/OptionFields.tpl +++ b/templates/CRM/Price/Form/OptionFields.tpl @@ -41,7 +41,7 @@ {if $index GT 1} - + {/if} @@ -71,7 +71,7 @@ {/section}
    {ts}If you need additional options - you can add them after you Save your current entries.{/ts} diff --git a/templates/CRM/Profile/Form/Dynamic.tpl b/templates/CRM/Profile/Form/Dynamic.tpl index d812cca7af..206ec5444d 100644 --- a/templates/CRM/Profile/Form/Dynamic.tpl +++ b/templates/CRM/Profile/Form/Dynamic.tpl @@ -211,7 +211,7 @@ {if $includeCancelButton} - + {$cancelButtonText} diff --git a/templates/CRM/Profile/Page/Listings.tpl b/templates/CRM/Profile/Page/Listings.tpl index 9fe3e7ea8b..bd02d534e2 100644 --- a/templates/CRM/Profile/Page/Listings.tpl +++ b/templates/CRM/Profile/Page/Listings.tpl @@ -28,7 +28,7 @@
    {ts}Displaying contacts where:{/ts} {include file="CRM/common/displaySearchCriteria.tpl"} - {if $mapURL} {ts}Map these contacts{/ts}{/if} + {if $mapURL} {ts}Map these contacts{/ts}{/if}
    {/if} diff --git a/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl b/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl index 7853199db8..bd740966b6 100644 --- a/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl +++ b/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl @@ -102,10 +102,10 @@
    {if $pageViewType eq 'customDataView'}
    {ts 1=$customGroupTitle}Add %1 Record{/ts} + class="button action-item"> {ts 1=$customGroupTitle}Add %1 Record{/ts} {else} {ts}Add New Record{/ts} + class="button action-item"> {ts}Add New Record{/ts} {/if}

    diff --git a/templates/CRM/Profile/Page/View.tpl b/templates/CRM/Profile/Page/View.tpl index 807f5b5aac..052bffd021 100644 --- a/templates/CRM/Profile/Page/View.tpl +++ b/templates/CRM/Profile/Page/View.tpl @@ -25,10 +25,10 @@ {/foreach}
    {if $listingURL} - {ts}Back to Listings{/ts}     + {ts}Back to Listings{/ts}     {/if} {if $mapURL} - {ts}Map Primary Address{/ts} + {ts}Map Primary Address{/ts} {/if}
    {/if} diff --git a/templates/CRM/Report/Form/Actions.tpl b/templates/CRM/Report/Form/Actions.tpl index 7b00728147..9aee8f6695 100644 --- a/templates/CRM/Report/Form/Actions.tpl +++ b/templates/CRM/Report/Form/Actions.tpl @@ -20,7 +20,7 @@ {include file="CRM/common/tasks.tpl" location="botton"} {if $instanceUrl} -    {ts}Existing report(s) from this template{/ts} +    {ts}Existing report(s) from this template{/ts} {/if} diff --git a/templates/CRM/Report/Page/InstanceList.tpl b/templates/CRM/Report/Page/InstanceList.tpl index 8399ee4b3e..354edd5444 100644 --- a/templates/CRM/Report/Page/InstanceList.tpl +++ b/templates/CRM/Report/Page/InstanceList.tpl @@ -10,7 +10,7 @@ {strip}
    {if $templateUrl} - {$newButton} + {$newButton} {/if} {if $reportUrl} {ts}View All Reports{/ts} @@ -29,7 +29,7 @@ {foreach from=$rows item=row} - +
    {$row.title} {$row.title} {$row.description} {ts}View Results{/ts} @@ -54,7 +54,7 @@
    {if $templateUrl} - {$newButton} + {$newButton} {/if} {if $reportUrl} {ts}View All Reports{/ts} diff --git a/templates/CRM/Report/Page/Options.tpl b/templates/CRM/Report/Page/Options.tpl index 42e6aed765..6cb81d5e18 100644 --- a/templates/CRM/Report/Page/Options.tpl +++ b/templates/CRM/Report/Page/Options.tpl @@ -12,7 +12,7 @@
    {if $action ne 1 and $action ne 2}
    - {ts 1=$GName}Register New %1{/ts} + {ts 1=$GName}Register New %1{/ts}
    {/if} @@ -58,7 +58,7 @@ {if $action ne 1 and $action ne 2}
    - {ts 1=$GName}Register New %1{/ts} + {ts 1=$GName}Register New %1{/ts}
    {/if} diff --git a/templates/CRM/Report/Page/TemplateList.tpl b/templates/CRM/Report/Page/TemplateList.tpl index e73ffe02c7..497157d074 100644 --- a/templates/CRM/Report/Page/TemplateList.tpl +++ b/templates/CRM/Report/Page/TemplateList.tpl @@ -27,7 +27,7 @@ {foreach from=$rows item=row}
    - {$row.title} + {$row.title} {if $row.instanceUrl}
    {ts}Existing Report(s){/ts} diff --git a/templates/CRM/Tag/Form/Tag.tpl b/templates/CRM/Tag/Form/Tag.tpl index 63066cedb1..892ac1a8aa 100644 --- a/templates/CRM/Tag/Form/Tag.tpl +++ b/templates/CRM/Tag/Form/Tag.tpl @@ -87,7 +87,7 @@
    - +
    {include file="CRM/Tag/Form/Tagtree.tpl" level=1}
    diff --git a/templates/CRM/Tag/Page/Tag.tpl b/templates/CRM/Tag/Page/Tag.tpl index 4d4702ea92..e59f24246a 100644 --- a/templates/CRM/Tag/Page/Tag.tpl +++ b/templates/CRM/Tag/Page/Tag.tpl @@ -20,7 +20,7 @@
    • - {ts}Tag Tree{/ts} + {ts}Tag Tree{/ts}
      • {foreach from=$tagsets item=set}
    • @@ -29,7 +29,7 @@ {/foreach} {if call_user_func(array('CRM_Core_Permission','check'), 'administer Tagsets')}
    • - +
      • {/if}
    @@ -38,7 +38,7 @@ {ts}Organize the tag hierarchy by clicking and dragging. Shift-click to select multiple tags to merge/move/delete.{/ts}
    - + {foreach from=$tagsets item=set}
    @@ -463,16 +463,16 @@ <% {rdelim} %>
    " class="button crm-popup"> -   {ts}Add Tag{/ts} +   {ts}Add Tag{/ts} <% if(tagset && adminTagsets) {ldelim} %> " class="button crm-popup tagset-action-update"> -   {ts}Edit Set{/ts} +   {ts}Edit Set{/ts} <% {rdelim} %> <% if(tagset && !length && adminTagsets && (!is_reserved || adminReserved)) {ldelim} %> " class="button crm-popup small-popup tagset-action-delete"> -   {ts}Delete Set{/ts} +   {ts}Delete Set{/ts} <% {rdelim} %>
    @@ -499,7 +499,7 @@ {ts}Used For:{/ts} {literal} - <% if (!data.used_for.length) { %><% } %> + <% if (!data.used_for.length) { %><% } %> <% _.forEach(data.used_for, function(key, i) { %><%- (i ? ', ' : '') + usedFor[key] %><% }) %> @@ -514,26 +514,26 @@
    <% {rdelim} %>
    {ts}Usage Count:{/ts} <%= data.usages %>
    - +
    <% if(!tagset) {ldelim} %> " class="button crm-popup" title="{ts}Create new tag under this one{/ts}"> -   {ts}Add Child{/ts} +   {ts}Add Child{/ts} <% {rdelim} %> " class="button crm-popup" title="{ts}Duplicate this tag{/ts}"> -   {ts}Clone Tag{/ts} +   {ts}Clone Tag{/ts} <% if(!data.is_reserved || adminReserved) {ldelim} %> <% if(tagsetCount) {ldelim} %> -   {ts}Move Tag{/ts} +   {ts}Move Tag{/ts} <% {rdelim} %> <% if(!hasChildren) {ldelim} %> " class="button crm-popup small-popup"> -   {ts}Delete{/ts} +   {ts}Delete{/ts} <% {rdelim} %> <% {rdelim} %> @@ -547,20 +547,20 @@

    * {ts 1="<%= reserved %>"}%1 reserved.{/ts}

    <% {rdelim} %>

    {ts}Total Usage:{/ts} <%= usages %>

    - +
    <% if(!reserved || adminReserved) {ldelim} %> " class="button crm-popup small-popup" title="{ts}Combine tags into one{/ts}"> -   {ts}Merge Tags{/ts} +   {ts}Merge Tags{/ts} <% if(tagsetCount) {ldelim} %> -   {ts}Move Tags{/ts} +   {ts}Move Tags{/ts} <% {rdelim} %> <% if(!hasChildren) {ldelim} %> " class="button crm-popup small-popup"> -   {ts}Delete All{/ts} +   {ts}Delete All{/ts} <% {rdelim} %> <% {rdelim} %> @@ -576,6 +576,6 @@ <% if(typeof description === 'string' && description.length) {ldelim} %>

    <%- description %>

    <% {rdelim} %>
    - +
    diff --git a/templates/CRM/UF/Page/Group.tpl b/templates/CRM/UF/Page/Group.tpl index 91b7b7cc2e..1eb5ee8ef0 100644 --- a/templates/CRM/UF/Page/Group.tpl +++ b/templates/CRM/UF/Page/Group.tpl @@ -26,7 +26,7 @@ Select HTML Code
    -   {ts}Back to Profile Listings{/ts} +   {ts}Back to Profile Listings{/ts}
    @@ -38,7 +38,7 @@
    {if NOT ($action eq 1 or $action eq 2)}
    - {ts}Add Profile{/ts} + {ts}Add Profile{/ts}
    {/if} {if $rows} @@ -90,7 +90,7 @@ {if NOT ($action eq 1 or $action eq 2)}
    - {ts}Add Profile{/ts} + {ts}Add Profile{/ts}
    {/if}
    @@ -135,7 +135,7 @@ {if NOT ($action eq 1 or $action eq 2)}
    - {ts}Add Profile{/ts} + {ts}Add Profile{/ts}
    {/if} diff --git a/templates/CRM/UF/Page/ProfileTemplates.tpl b/templates/CRM/UF/Page/ProfileTemplates.tpl index b5e8a1b400..c6fdeff238 100644 --- a/templates/CRM/UF/Page/ProfileTemplates.tpl +++ b/templates/CRM/UF/Page/ProfileTemplates.tpl @@ -36,7 +36,7 @@
    - +
    {ts}Open All{/ts}  |  {ts}Close All{/ts} @@ -65,8 +65,8 @@ *} @@ -114,7 +114,7 @@