From 6c68db9f8948f5245cb3ed871f7331cc942bef34 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 16 Nov 2014 19:33:40 -0500
Subject: [PATCH] CRM-15603 - Misc string fixes

---
 CRM/Event/Form/Registration/ParticipantConfirm.php | 2 +-
 CRM/Member/Form/MembershipType.php                 | 2 +-
 CRM/Pledge/BAO/Pledge.php                          | 1 +
 CRM/Report/Page/Instance.php                       | 2 +-
 templates/CRM/Pledge/Form/Pledge.tpl               | 2 +-
 templates/CRM/Pledge/Form/PledgeView.tpl           | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CRM/Event/Form/Registration/ParticipantConfirm.php b/CRM/Event/Form/Registration/ParticipantConfirm.php
index caf7d31ab6..de9337ca67 100644
--- a/CRM/Event/Form/Registration/ParticipantConfirm.php
+++ b/CRM/Event/Form/Registration/ParticipantConfirm.php
@@ -201,7 +201,7 @@ class CRM_Event_Form_Registration_ParticipantConfirm extends CRM_Event_Form_Regi
         $statusMessage = ts("%1 Event registration(s) have been cancelled.", array(1 => count($participantIds)));
       }
       else {
-        $statusMessage = ts("Your event registration has been cancelled.");
+        $statusMessage = ts("Your Event Registration has been cancelled.");
       }
 
       if (!empty($results['mailedParticipants'])) {
diff --git a/CRM/Member/Form/MembershipType.php b/CRM/Member/Form/MembershipType.php
index ebe231973a..7380b15d2d 100644
--- a/CRM/Member/Form/MembershipType.php
+++ b/CRM/Member/Form/MembershipType.php
@@ -228,7 +228,7 @@ class CRM_Member_Form_MembershipType extends CRM_Member_Form_MembershipConfig {
     }
 
     if (($params['minimum_fee'] > 0 ) && !$params['financial_type_id'] ) {
-      $errors['financial_type_id'] = ts('Please enter the financial type.');
+      $errors['financial_type_id'] = ts('Please enter the financial Type.');
     }
 
     if (empty($params['duration_interval']) and $params['duration_unit'] != 'lifetime') {
diff --git a/CRM/Pledge/BAO/Pledge.php b/CRM/Pledge/BAO/Pledge.php
index 1aed6a8ae7..5d18a9734d 100644
--- a/CRM/Pledge/BAO/Pledge.php
+++ b/CRM/Pledge/BAO/Pledge.php
@@ -653,6 +653,7 @@ GROUP BY  currency
     );
     $config = CRM_Core_Config::singleton();
 
+    // FIXME: Translate
     $details = 'Total Amount ' . CRM_Utils_Money::format($params['total_pledge_amount'], CRM_Utils_Array::value('currency', $params)) . ' To be paid in ' . $params['installments'] . ' installments of ' . CRM_Utils_Money::format($params['scheduled_amount'], CRM_Utils_Array::value('currency', $params)) . ' every ' . $params['frequency_interval'] . ' ' . $params['frequency_unit'] . '(s)';
 
     if (!$activity->find()) {
diff --git a/CRM/Report/Page/Instance.php b/CRM/Report/Page/Instance.php
index 98808bfa99..d68a48d2a5 100644
--- a/CRM/Report/Page/Instance.php
+++ b/CRM/Report/Page/Instance.php
@@ -72,7 +72,7 @@ class CRM_Report_Page_Instance extends CRM_Core_Page {
     else {
       $templateInfo = CRM_Core_OptionGroup::getRowValues('report_template', "{$optionVal}", 'value');
       if (empty($templateInfo)) {
-        CRM_Core_Session::setStatus(ts('Could not find template for this report instance.'), ts('Template Not Found'), 'error');
+        CRM_Core_Session::setStatus(ts('Could not find template for the instance.'), ts('Template Not Found'), 'error');
         return;
       }
 
diff --git a/templates/CRM/Pledge/Form/Pledge.tpl b/templates/CRM/Pledge/Form/Pledge.tpl
index c4d2b4dbd9..6fba237e83 100644
--- a/templates/CRM/Pledge/Form/Pledge.tpl
+++ b/templates/CRM/Pledge/Form/Pledge.tpl
@@ -109,7 +109,7 @@
                 <span class="description">{ts 1=$email}Automatically email an acknowledgment of this pledge to %1?{/ts}</span></td></tr>
             {/if}
       {elseif $context eq 'standalone' and $outBound_option != 2 }
-                <tr id="acknowledgment-receipt" style="display:none;"><td class="label">{$form.is_acknowledge.label}</td><td>{$form.is_acknowledge.html} <span class="description">{ts}Automatically email an acknowledgment of this pledge to {/ts}<span id="email-address"></span>?</span></td></tr>
+                <tr id="acknowledgment-receipt" style="display:none;"><td class="label">{$form.is_acknowledge.label}</td><td>{$form.is_acknowledge.html} <span class="description">{ts 1='<span id="email-address"></span>'}Automatically email an acknowledgment of this pledge to %1?{/ts}</span></td></tr>
         {/if}
         <tr id="fromEmail" style="display:none;">
             <td class="label">{$form.from_email_address.label}</td>
diff --git a/templates/CRM/Pledge/Form/PledgeView.tpl b/templates/CRM/Pledge/Form/PledgeView.tpl
index 99416468d8..d69b173d0f 100644
--- a/templates/CRM/Pledge/Form/PledgeView.tpl
+++ b/templates/CRM/Pledge/Form/PledgeView.tpl
@@ -39,7 +39,7 @@
             {if $originalPledgeAmount}<div class="messages status no-popup"><div class="icon inform-icon"></div>{ts 1=$originalPledgeAmount|crmMoney:$currency} Pledge total has changed due to payment adjustments. Original pledge amount was %1.{/ts}</div>{/if}
         </td>
      </tr>
-     <tr class="crm-pledge-form-block-installments"><td class="label">{ts}To be paid in{/ts}</td><td>{$installments}{ts} installments of {/ts}{$original_installment_amount|crmMoney:$currency}{ts} every {/ts} {$frequency_interval} {$frequencyUnit}</td></tr>
+     <tr class="crm-pledge-form-block-installments"><td class="label">{ts}To be paid in{/ts}</td><td>{$installments} {ts}installments of{/ts} {$original_installment_amount|crmMoney:$currency} {ts}every{/ts} {$frequency_interval} {$frequencyUnit}</td></tr>
     <tr><td class="label">{ts}Payments are due on the{/ts}</td><td>{$frequency_day} day of the period</td></tr>
 
     {if $start_date}
-- 
2.25.1