From 7a39e5e9b99687924b48a0a10df8c831c5ea27cc Mon Sep 17 00:00:00 2001
From: Mathieu Lutfy <mathieu@bidon.ca>
Date: Sun, 8 May 2016 17:30:35 -0400
Subject: [PATCH] CRM-18518: ts() string fixes.

---
 CRM/Report/Form/Mailing/Clicks.php            | 2 +-
 ang/crmMailing/BlockReview.html               | 2 +-
 ang/crmMailing/BlockTracking.html             | 2 +-
 ang/crmMailing/EmailBodyCtrl/tokenAlert.html  | 3 +--
 ang/crmMailingAB/EditCtrl/report.html         | 4 ++--
 tests/phpunit/WebTest/Mailing/MailingTest.php | 2 +-
 xml/schema/Financial/FinancialTrxn.xml        | 2 +-
 xml/templates/civicrm_data.tpl                | 2 +-
 8 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/CRM/Report/Form/Mailing/Clicks.php b/CRM/Report/Form/Mailing/Clicks.php
index d8bdf6cf2e..3fd5e8e0e2 100644
--- a/CRM/Report/Form/Mailing/Clicks.php
+++ b/CRM/Report/Form/Mailing/Clicks.php
@@ -292,7 +292,7 @@ class CRM_Report_Form_Mailing_Clicks extends CRM_Report_Form {
     }
 
     $chartInfo = array(
-      'legend' => ts('Mail Clickthrough Report'),
+      'legend' => ts('Mail Click-Through Report'),
       'xname' => ts('Mailing'),
       'yname' => ts('Clicks'),
       'xLabelAngle' => 20,
diff --git a/ang/crmMailing/BlockReview.html b/ang/crmMailing/BlockReview.html
index 25ef8f163f..6a2e2aad3d 100644
--- a/ang/crmMailing/BlockReview.html
+++ b/ang/crmMailing/BlockReview.html
@@ -35,7 +35,7 @@ Required vars: mailing
         </div>
       </div>
       <div crm-ui-field="{title: ts('Tracking')}">
-        <span crm-mailing-review-bool crm-on="mailing.url_tracking=='1'" crm-title="ts('Click Throughs')"></span>
+        <span crm-mailing-review-bool crm-on="mailing.url_tracking=='1'" crm-title="ts('Click-Throughs')"></span>
         <span crm-mailing-review-bool crm-on="mailing.open_tracking=='1'" crm-title="ts('Opens')"></span>
       </div>
       <div crm-ui-field="{title: ts('Responding')}">
diff --git a/ang/crmMailing/BlockTracking.html b/ang/crmMailing/BlockTracking.html
index f6da0acd2e..a4ed95e0e3 100644
--- a/ang/crmMailing/BlockTracking.html
+++ b/ang/crmMailing/BlockTracking.html
@@ -4,7 +4,7 @@ Required vars: mailing
 -->
 <div class="crm-block" ng-form="subform" crm-ui-id-scope>
   <div class="crm-group">
-    <div crm-ui-field="{name: 'subform.url_tracking', title: ts('Track Click Throughs'), help: hs('url_tracking')}" crm-layout="checkbox">
+    <div crm-ui-field="{name: 'subform.url_tracking', title: ts('Track Click-Throughs'), help: hs('url_tracking')}" crm-layout="checkbox">
       <input crm-ui-id="subform.url_tracking" name="url_tracking" type="checkbox" ng-model="mailing.url_tracking" ng-true-value="'1'" ng-false-value="'0'" />
     </div>
     <div crm-ui-field="{name: 'subform.open_tracking', title: ts('Track Opens'), help: hs('open_tracking')}" crm-layout="checkbox">
diff --git a/ang/crmMailing/EmailBodyCtrl/tokenAlert.html b/ang/crmMailing/EmailBodyCtrl/tokenAlert.html
index 1e35c92bc2..71bffaf198 100644
--- a/ang/crmMailing/EmailBodyCtrl/tokenAlert.html
+++ b/ang/crmMailing/EmailBodyCtrl/tokenAlert.html
@@ -10,8 +10,7 @@
 </div>
 
 <p ng-show="missing['action.optOut']">
-  {{ts('The mailing must allow recipients to (a) unsubscribe from the mailing-list or (b) completely opt-out from all
-  mailings. Please insert an unsubscribe or opt-out token.')}}
+  {{ts('The mailing must allow recipients to (a) unsubscribe from the mailing-list or (b) completely opt-out from all mailings. Please insert an unsubscribe or opt-out token.')}}
 </p>
 
 <div ng-show="missing['action.optOut'] && insertable">
diff --git a/ang/crmMailingAB/EditCtrl/report.html b/ang/crmMailingAB/EditCtrl/report.html
index 73d7988b8a..273f2f8bd8 100644
--- a/ang/crmMailingAB/EditCtrl/report.html
+++ b/ang/crmMailingAB/EditCtrl/report.html
@@ -82,7 +82,7 @@
         <a
           class="crm-hover-button action-item"
           ng-href="{{statUrl(am.mailing, statType, 'report')}}"
-          title="{{ts('Reports for  \'%1\'', {1: statType.title})}}"
+          title="{{ts('Reports for \'%1\'', {1: statType.title})}}"
           crm-icon="clipboard"
           ></a>
       </td>
@@ -150,7 +150,7 @@
     <tr>
       <td>{{ts('Tracking')}}</td>
       <td ng-repeat="am in getActiveMailings()">
-        <div crm-mailing-review-bool crm-on="am.mailing.url_tracking=='1'" crm-title="ts('Click Throughs')"></div>
+        <div crm-mailing-review-bool crm-on="am.mailing.url_tracking=='1'" crm-title="ts('Click-Throughs')"></div>
         <div crm-mailing-review-bool crm-on="am.mailing.open_tracking=='1'" crm-title="ts('Opens')"></div>
       </td>
       <td ng-show="abtest.ab.status == 'Testing'"></td>
diff --git a/tests/phpunit/WebTest/Mailing/MailingTest.php b/tests/phpunit/WebTest/Mailing/MailingTest.php
index 282434d5cc..854bdbf79c 100644
--- a/tests/phpunit/WebTest/Mailing/MailingTest.php
+++ b/tests/phpunit/WebTest/Mailing/MailingTest.php
@@ -468,7 +468,7 @@ class WebTest_Mailing_MailingTest extends CiviSeleniumTestCase {
         ),
       ),
       'Click-throughs' => array(
-        'report' => array('report_name' => 'Mail Clickthroughs', 'Mailing' => "Mailing $mailingName Webtest"),
+        'report' => array('report_name' => 'Mail Click-Throughs', 'Mailing' => "Mailing $mailingName Webtest"),
         'search' => array(
           'Mailing Name IN' => "\"Mailing {$mailingName} Webtest",
           'Mailing: Trackable URL Clicks -' => "Clicked",
diff --git a/xml/schema/Financial/FinancialTrxn.xml b/xml/schema/Financial/FinancialTrxn.xml
index f3e264a16b..eb4dba07df 100644
--- a/xml/schema/Financial/FinancialTrxn.xml
+++ b/xml/schema/Financial/FinancialTrxn.xml
@@ -180,7 +180,7 @@
   </index>
   <field>
     <name>trxn_result_code</name>
-    <title>Transaction result Code</title>
+    <title>Transaction Result Code</title>
     <type>varchar</type>
     <length>255</length>
     <comment>processor result code</comment>
diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl
index 94cf45a7da..eff7f199e9 100644
--- a/xml/templates/civicrm_data.tpl
+++ b/xml/templates/civicrm_data.tpl
@@ -624,7 +624,7 @@ VALUES
   (@option_group_id_report, {localize}'{ts escape="sql"}Mail Bounce Report{/ts}'{/localize}, 'Mailing/bounce', 'CRM_Report_Form_Mailing_Bounce', NULL, 0, NULL, 34, {localize}'{ts escape="sql"}Bounce Report for mailings{/ts}'{/localize}, 0, 0, 1, @mailCompId, NULL),
   (@option_group_id_report, {localize}'{ts escape="sql"}Mail Summary Report{/ts}'{/localize}, 'Mailing/summary', 'CRM_Report_Form_Mailing_Summary', NULL, 0, NULL, 35, {localize}'{ts escape="sql"}Summary statistics for mailings{/ts}'{/localize}, 0, 0, 1, @mailCompId, NULL),
   (@option_group_id_report, {localize}'{ts escape="sql"}Mail Opened Report{/ts}'{/localize}, 'Mailing/opened', 'CRM_Report_Form_Mailing_Opened', NULL, 0, NULL, 36, {localize}'{ts escape="sql"}Display contacts who opened emails from a mailing{/ts}'{/localize}, 0, 0, 1, @mailCompId, NULL),
-  (@option_group_id_report, {localize}'{ts escape="sql"}Mail Clickthrough Report{/ts}'{/localize}, 'Mailing/clicks', 'CRM_Report_Form_Mailing_Clicks', NULL, 0, NULL, 37, {localize}'{ts escape="sql"}Display clicks from each mailing{/ts}'{/localize}, 0, 0, 1, @mailCompId, NULL),
+  (@option_group_id_report, {localize}'{ts escape="sql"}Mail Click-Through Report{/ts}'{/localize}, 'Mailing/clicks', 'CRM_Report_Form_Mailing_Clicks', NULL, 0, NULL, 37, {localize}'{ts escape="sql"}Display clicks from each mailing{/ts}'{/localize}, 0, 0, 1, @mailCompId, NULL),
   (@option_group_id_report, {localize}'{ts escape="sql"}Contact Logging Report (Summary){/ts}'{/localize}, 'logging/contact/summary', 'CRM_Report_Form_Contact_LoggingSummary', NULL, 0, NULL, 38, {localize}'{ts escape="sql"}Contact modification report for the logging infrastructure (summary).{/ts}'{/localize}, 0, 0, 0, NULL, NULL),
   (@option_group_id_report, {localize}'{ts escape="sql"}Contact Logging Report (Detail){/ts}'{/localize}, 'logging/contact/detail', 'CRM_Report_Form_Contact_LoggingDetail', NULL, 0, NULL, 39, {localize}'{ts escape="sql"}Contact modification report for the logging infrastructure (detail).{/ts}'{/localize}, 0, 0, 0, NULL, NULL),
   (@option_group_id_report, {localize}'{ts escape="sql"}Contribute Logging Report (Summary){/ts}'{/localize}, 'logging/contribute/summary', 'CRM_Report_Form_Contribute_LoggingSummary', NULL, 0, NULL, 40, {localize}'{ts escape="sql"}Contribute modification report for the logging infrastructure (summary).{/ts}'{/localize}, 0, 0, 0, @contributeCompId, NULL),
-- 
2.25.1