CRM-16359: Report templates title/description translation.

diff --git a/CRM/Core/OptionGroup.php b/CRM/Core/OptionGroup.php
index 06464c999cfa5fb2aa85e59339329523e411e2c6..7770090bd2bd7a72af7db7dd5be9af361664e53b 100644 (file)
--- a/CRM/Core/OptionGroup.php
+++ b/CRM/Core/OptionGroup.php
@@ -591,12 +591,14 @@ SELECT v.label
    * @param string $field
    * @param string $fieldType
    * @param bool $active
+   * @param bool $localize
+   *   if true, localize the results before returning.
    *
    * @return array
    */
   public static function getRowValues(
     $groupName, $fieldValue, $field = 'name',
-    $fieldType = 'String', $active = TRUE
+    $fieldType = 'String', $active = TRUE, $localize = FALSE
   ) {
     $query = "
 SELECT v.id, v.label, v.value, v.name, v.weight, v.description
@@ -631,6 +633,13 @@ WHERE  v.option_group_id = g.id
         $row[$fld] = $dao->$fld;
       }
     }
+
+    if ($localize) {
+      foreach (array('label', 'description') as $f) {
+        $row[$f] = ts($row[$f]);
+      }
+    }
+
     return $row;
   }
 

diff --git a/CRM/Report/Page/Report.php b/CRM/Report/Page/Report.php
index 8b4fa7e60503ca49a0e10d05099ac3db0163c1b2..4c44953a4d004cfc333b08cd98f00c87fb26a4a3 100644 (file)
--- a/CRM/Report/Page/Report.php
+++ b/CRM/Report/Page/Report.php
@@ -51,7 +51,7 @@ class CRM_Report_Page_Report extends CRM_Core_Page {
     $optionVal = CRM_Report_Utils_Report::getValueFromUrl();
 
     $templateInfo = CRM_Core_OptionGroup::getRowValues('report_template', "{$optionVal}", 'value',
-      'String', FALSE
+      'String', FALSE, TRUE
     );
 
     $extKey = strpos(CRM_Utils_Array::value('name', $templateInfo), '.');
@@ -65,7 +65,7 @@ class CRM_Report_Page_Report extends CRM_Core_Page {
     }
 
     if (strstr(CRM_Utils_Array::value('name', $templateInfo), '_Form') || !is_null($reportClass)) {
-      CRM_Utils_System::setTitle($templateInfo['label'] . ' - Template');
+      CRM_Utils_System::setTitle(ts('%1 - Template', array(1 => $templateInfo['label'])));
       $this->assign('reportTitle', $templateInfo['label']);
 
       $session = CRM_Core_Session::singleton();

diff --git a/CRM/Report/Page/TemplateList.php b/CRM/Report/Page/TemplateList.php
index 60622cfd7fd4e7c1588f0d83b46c265b570f1553..94331c86678029beb80babd1ff86d74815344120 100644 (file)
--- a/CRM/Report/Page/TemplateList.php
+++ b/CRM/Report/Page/TemplateList.php
@@ -93,8 +93,8 @@ LEFT  JOIN civicrm_component comp
       ) {
         continue;
       }
-      $rows[$dao->component_name][$dao->value]['title'] = $dao->label;
-      $rows[$dao->component_name][$dao->value]['description'] = $dao->description;
+      $rows[$dao->component_name][$dao->value]['title'] = ts($dao->label);
+      $rows[$dao->component_name][$dao->value]['description'] = ts($dao->description);
       $rows[$dao->component_name][$dao->value]['url'] = CRM_Utils_System::url('civicrm/report/' . trim($dao->value, '/'), 'reset=1');
       if ($dao->instance_id) {
         $rows[$dao->component_name][$dao->value]['instanceUrl'] = CRM_Utils_System::url('civicrm/report/list',