translate more strings

diff --git a/CRM/Case/Form/Case.php b/CRM/Case/Form/Case.php
index 72034835e109cf646ab0e88bb0afd316e0cbf9b6..5f59008df463f5ee90802b168b04d661c1384a68 100644 (file)
--- a/CRM/Case/Form/Case.php
+++ b/CRM/Case/Form/Case.php
@@ -204,9 +204,9 @@ class CRM_Case_Form_Case extends CRM_Core_Form {
     $this->assign('multiClient', $isMultiClient);
 
     if ($this->_action & CRM_Core_Action::DELETE || $this->_action & CRM_Core_Action::RENEW) {
-      $title = 'Delete';
+      $title = ts('Delete');
       if ($this->_action & CRM_Core_Action::RENEW) {
-        $title = 'Restore';
+        $title = ts('Restore');
       }
       $this->addButtons(array(
           array(

diff --git a/CRM/Grant/BAO/Query.php b/CRM/Grant/BAO/Query.php
index ffbbb233af09ec8b281b1ec2b61b8f7d86f363f5..33d5aa03ae27889ac8e28eca454994562262fe0a 100644 (file)
--- a/CRM/Grant/BAO/Query.php
+++ b/CRM/Grant/BAO/Query.php
@@ -208,15 +208,14 @@ class CRM_Grant_BAO_Query extends CRM_Core_BAO_Query {
       case 'grant_report_received':
 
         if ($value == 1) {
-          $yesNo = 'Yes';
+          $yesNo = ts('Yes');
           $query->_where[$grouping][] = "civicrm_grant.grant_report_received $op $value";
         }
         elseif ($value == 0) {
-          $yesNo = 'No';
+          $yesNo = ts('No');
           $query->_where[$grouping][] = "civicrm_grant.grant_report_received IS NULL";
         }
-
-        $query->_qill[$grouping][] = "Grant Report Received = $yesNo ";
+       $query->_qill[$grouping][] = ts('Grant Report Received = %1', array(1 => $yesNo));
         $query->_tables['civicrm_grant'] = $query->_whereTables['civicrm_grant'] = 1;
 
         return;

diff --git a/CRM/Price/Page/Set.php b/CRM/Price/Page/Set.php
index 8bd781b198b73a8e3fa0c61ae7ad5c1e72f93422..d15f19305e9b4084da145f6ec53867c38f4e17bd 100644 (file)
--- a/CRM/Price/Page/Set.php
+++ b/CRM/Price/Page/Set.php
@@ -294,7 +294,7 @@ class CRM_Price_Page_Set extends CRM_Core_Page {
       $actionLinks = self::actionLinks();
       //CRM-10117
       if ($dao->is_reserved) {
-        $actionLinks[CRM_Core_Action::BROWSE]['name'] = 'View Price Fields';
+        $actionLinks[CRM_Core_Action::BROWSE]['name'] = ts('View Price Fields');
       }
       $priceSet[$dao->id]['action'] = CRM_Core_Action::formLink($actionLinks, $action,
         array('sid' => $dao->id),

diff --git a/CRM/Profile/Form.php b/CRM/Profile/Form.php
index 5a0ae26d627292e43f6acede97453eabe76b6b12..09479b1e7405c165bc759299f28fdc20c7ec0b48 100644 (file)
--- a/CRM/Profile/Form.php
+++ b/CRM/Profile/Form.php
@@ -849,7 +849,7 @@ class CRM_Profile_Form extends CRM_Core_Form {
   public static function validateContactActivityProfile($activityId, $contactId, $gid) {
     $errors = array();
     if (!$activityId) {
-      $errors[] = 'Profile is using one or more activity fields, and is missing the activity Id (aid) in the URL.';
+      $errors[] = ts('Profile is using one or more activity fields, and is missing the activity Id (aid) in the URL.');
       return $errors;
     }
 
@@ -858,7 +858,7 @@ class CRM_Profile_Form extends CRM_Core_Form {
     CRM_Activity_BAO_Activity::retrieve($activityParams, $activityDetails);
 
     if (empty($activityDetails)) {
-      $errors[] = 'Invalid Activity Id (aid).';
+      $errors[] = ts('Invalid Activity Id (aid).');
       return $errors;
     }
 
@@ -871,7 +871,7 @@ class CRM_Profile_Form extends CRM_Core_Form {
         !in_array($contactId, $activityDetails['target_contact'])
       )
     ) {
-      $errors[] = 'This activity cannot be edited or viewed via this profile.';
+      $errors[] = ts('This activity cannot be edited or viewed via this profile.');
     }
 
     return $errors;

diff --git a/CRM/Report/Form/Contact/Relationship.php b/CRM/Report/Form/Contact/Relationship.php
index 46eb2e9c8648c67568087bd0387e20b9e1ef8d2b..dd20fba0ea833491e8b6f716e4cff44bbba8f041 100644 (file)
--- a/CRM/Report/Form/Contact/Relationship.php
+++ b/CRM/Report/Form/Contact/Relationship.php
@@ -590,10 +590,10 @@ class CRM_Report_Form_Contact_Relationship extends CRM_Report_Form {
     $isStatusFilter = FALSE;
     $relStatus = NULL;
     if (CRM_Utils_Array::value('is_active_value', $this->_params) == '1') {
-      $relStatus = 'Is equal to Active';
+      $relStatus = ts('Is equal to Active');
     }
     elseif (CRM_Utils_Array::value('is_active_value', $this->_params) == '0') {
-      $relStatus = 'Is equal to Inactive';
+      $relStatus = ts('Is equal to Inactive');
     }
     if (!empty($statistics['filters'])) {
       foreach ($statistics['filters'] as $id => $value) {

diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php
index a6013a82e0b0b1c4941fba53bfe98cd038315f41..2ef86cd5ceb26d690b3ba9a87fa97c446e22e0d2 100644 (file)
--- a/CRM/Report/Form/Contribute/Summary.php
+++ b/CRM/Report/Form/Contribute/Summary.php
@@ -856,7 +856,7 @@ ROUND(AVG({$this->_aliases['civicrm_contribution_soft']}.amount), 2) as civicrm_
         // build the chart.
         $config = CRM_Core_Config::Singleton();
         $graphRows['xname'] = $this->_interval;
-        $graphRows['yname'] = "Amount ({$config->defaultCurrency})";
+        $graphRows['yname'] = ts('Amount (%1)', array(1 => $config->defaultCurrency));
         CRM_Utils_OpenFlashChart::chart($graphRows, $this->_params['charts'], $this->_interval);
         $this->assign('chartType', $this->_params['charts']);
       }

diff --git a/CRM/Report/Form/Contribute/Sybunt.php b/CRM/Report/Form/Contribute/Sybunt.php
index a7996d54d7bf8d041055252909b0ad94102491d1..120a4d80ce58c215fdeaa2481ce6fbf4f0d363b4 100644 (file)
--- a/CRM/Report/Form/Contribute/Sybunt.php
+++ b/CRM/Report/Form/Contribute/Sybunt.php
@@ -560,9 +560,9 @@ class CRM_Report_Form_Contribute_Sybunt extends CRM_Report_Form {
     $graphRows['value'] = $display;
     $config = CRM_Core_Config::Singleton();
     $chartInfo = array(
-      'legend' => 'Sybunt Report',
-      'xname' => 'Year',
-      'yname' => "Amount ({$config->defaultCurrency})",
+      'legend' => ts('Sybunt Report'),
+      'xname' => ts('Year'),
+      'yname' => ts('Amount (%1)', array(1 => $config->defaultCurrency)),
     );
     if ($this->_params['charts']) {
       // build the chart.

diff --git a/CRM/Report/Form/Event/IncomeCountSummary.php b/CRM/Report/Form/Event/IncomeCountSummary.php
index 236938d2ea9873bc409aac39a7340650bcedc2ed..92a4b11c83327d8997caa42e99d785f369e67e5f 100644 (file)
--- a/CRM/Report/Form/Event/IncomeCountSummary.php
+++ b/CRM/Report/Form/Event/IncomeCountSummary.php
@@ -386,16 +386,16 @@ class CRM_Report_Form_Event_IncomeCountSummary extends CRM_Report_Form_Event {
 
       if ((!empty($rows)) && $countEvent != 1) {
         $chartInfo = array(
-          'legend' => 'Participants Summary',
-          'xname' => 'Event',
-          'yname' => 'Total Participants',
+         'legend' => ts('Participants Summary'),
+          'xname' => ts('Event'),
+          'yname' => ts('Total Participants'),
         );
         if (!empty($graphRows)) {
           foreach ($graphRows[$this->_interval] as $key => $val) {
             $graph[$val] = $graphRows['value'][$key];
           }
           $chartInfo['values'] = $graph;
-          $chartInfo['tip'] = 'Participants : #val#';
+          $chartInfo['tip'] =  ts('Participants : %1', array(1 => '#val#'));
           $chartInfo['xLabelAngle'] = 20;
 
           // build the chart.

diff --git a/CRM/Report/Form/Event/Summary.php b/CRM/Report/Form/Event/Summary.php
index 789733b8247cd3d0b0099dcd870397f5fe39f019..c68a9e0d14f405a9613455e4ce6f903c09a1b976 100644 (file)
--- a/CRM/Report/Form/Event/Summary.php
+++ b/CRM/Report/Form/Event/Summary.php
@@ -356,9 +356,9 @@ class CRM_Report_Form_Event_Summary extends CRM_Report_Form_Event {
       if ((!empty($rows)) && $countEvent != 1) {
         $config = CRM_Core_Config::Singleton();
         $chartInfo = array(
-          'legend' => 'Event Summary',
-          'xname' => 'Event',
-          'yname' => "Total Amount ({$config->defaultCurrency})",
+          'legend' => ts('Event Summary'),
+          'xname' => ts('Event'),
+          'yname' => ts('Total Amount (%1)', array(1 => $config->defaultCurrency)),
         );
         if (!empty($graphRows)) {
           foreach ($graphRows[$this->_interval] as $key => $val) {

diff --git a/CRM/Report/Form/Mailing/Bounce.php b/CRM/Report/Form/Mailing/Bounce.php
index e6c23e58b3432153370af301681a95611d38e657..f11991859cf7b502f723f24ae63488dd189b8158 100644 (file)
--- a/CRM/Report/Form/Mailing/Bounce.php
+++ b/CRM/Report/Form/Mailing/Bounce.php
@@ -470,7 +470,7 @@ class CRM_Report_Form_Mailing_Bounce extends CRM_Report_Form {
       // If the email address has been deleted
       if (array_key_exists('civicrm_email_email', $row)) {
         if (empty($rows[$rowNum]['civicrm_email_email'])) {
-          $rows[$rowNum]['civicrm_email_email'] = '<del>Email address deleted</del>';
+          $rows[$rowNum]['civicrm_email_email'] = ts('<del>Email address deleted</del>');
         }
         $entryFound = TRUE;
       }

diff --git a/CRM/Report/Form/Mailing/Clicks.php b/CRM/Report/Form/Mailing/Clicks.php
index 54a2d81022e68770c3920a306d53474545d04b79..be060bd0e0a81c0208dc9270fc2e62a70af8408d 100644 (file)
--- a/CRM/Report/Form/Mailing/Clicks.php
+++ b/CRM/Report/Form/Mailing/Clicks.php
@@ -369,7 +369,7 @@ class CRM_Report_Form_Mailing_Clicks extends CRM_Report_Form {
       // If the email address has been deleted
       if (array_key_exists('civicrm_email_email', $row)) {
         if (empty($rows[$rowNum]['civicrm_email_email'])) {
-          $rows[$rowNum]['civicrm_email_email'] = '<del>Email address deleted</del>';
+          $rows[$rowNum]['civicrm_email_email'] = ts('<del>Email address deleted</del>');
         }
         $entryFound = TRUE;
       }

diff --git a/CRM/Report/Form/Mailing/Detail.php b/CRM/Report/Form/Mailing/Detail.php
index 5fd59ef725818744dc04d1a0c2aa68102e401b01..a79c6b7dda82330717bed0efba8f089d1a0018e7 100644 (file)
--- a/CRM/Report/Form/Mailing/Detail.php
+++ b/CRM/Report/Form/Mailing/Detail.php
@@ -484,7 +484,7 @@ class CRM_Report_Form_Mailing_Detail extends CRM_Report_Form {
       // If the email address has been deleted
       if (array_key_exists('civicrm_email_email', $row)) {
         if (empty($rows[$rowNum]['civicrm_email_email'])) {
-          $rows[$rowNum]['civicrm_email_email'] = '<del>Email address deleted</del>';
+          $rows[$rowNum]['civicrm_email_email'] = ts('<del>Email address deleted</del>');
         }
         $entryFound = TRUE;
       }

diff --git a/CRM/Report/Form/Member/Summary.php b/CRM/Report/Form/Member/Summary.php
index 522357fdcd4abfd5b43b6648e59f2c8ec1c21c8f..a84335b4b03d7f8013cc115fd2517d9c7f05ebc5 100644 (file)
--- a/CRM/Report/Form/Member/Summary.php
+++ b/CRM/Report/Form/Member/Summary.php
@@ -526,9 +526,9 @@ GROUP BY    {$this->_aliases['civicrm_contribution']}.currency
       if ($isMembershipType) {
         $graphRows['value'] = $display;
         $chartInfo = array(
-          'legend' => 'Membership Summary',
-          'xname' => 'Member Since / Member Type',
-          'yname' => 'Fees',
+         'legend' => ts('Membership Summary'),
+          'xname' => ts('Member Since / Member Type'),
+          'yname' => ts('Fees'),
         );
         CRM_Utils_OpenFlashChart::reportChart($graphRows, $this->_params['charts'], $interval, $chartInfo);
       }