diff --git a/CRM/Grant/Form/GrantProgramView.php b/CRM/Grant/Form/GrantProgramView.php index 6d84c54f8e29033ba129ddfee57aa4e080efcc6c..6683355288fb72ab94712be29e3f88ab99c5bbee 100755 --- a/CRM/Grant/Form/GrantProgramView.php +++ b/CRM/Grant/Form/GrantProgramView.php @@ -207,15 +207,15 @@ class CRM_Grant_Form_GrantProgramView extends CRM_Core_Form { $grantPrograms = CRM_Grant_BAO_GrantProgram::getGrantPrograms(); $eligibleCountMessage = $remainingAmount = NULL; if ($nonEligibleCount) { - $nonEligibleCountMessage = $nonEligibleCount." eligible applications were not allocated since they have already received their annual maximum."; + $nonEligibleCountMessage = ts($nonEligibleCount." eligible applications were not allocated since they have already received their annual maximum.";) } if ($eligibleCount) { - $eligibleCountMessage = $eligibleCount." eligible applications were not allocated ".CRM_Utils_Money::format($eligibleAmount,NULL, NULL,FALSE)." in funds they would have received were funds available. "; + $eligibleCountMessage = ts($eligibleCount." eligible applications were not allocated ".CRM_Utils_Money::format($eligibleAmount,NULL, NULL,FALSE)." in funds they would have received were funds available."); } if ($totalAmount > 0) { $remainingAmount = CRM_Utils_Money::format($totalAmount,NULL, NULL,FALSE)." remains unallocated."; } - $message = "Trial Allocation Completed. ".CRM_Utils_Money::format($grantedAmount,NULL, NULL,FALSE)." allocated to {$grantedCount} eligible applications. ".$eligibleCountMessage.$nonEligibleCountMessage.$remainingAmount; + $message = ts("Trial Allocation Completed. " . CRM_Utils_Money::format($grantedAmount,NULL, NULL,FALSE) . " allocated to {$grantedCount} eligible applications. " . $eligibleCountMessage . $nonEligibleCountMessage . $remainingAmount); $page->assign('message', $message); @@ -305,7 +305,7 @@ class CRM_Grant_Form_GrantProgramView extends CRM_Core_Form { $result = CRM_Grant_BAO_Grant::add($row, $ids); } } - CRM_Core_Session::setStatus('Approved allocations finalized successfully.', '', 'no-popup'); + CRM_Core_Session::setStatus(ts('Approved allocations finalized successfully.'), '', 'no-popup'); } } @@ -339,7 +339,7 @@ class CRM_Grant_Form_GrantProgramView extends CRM_Core_Form { $grantProgramParams['id'] = $_POST['pid']; $ids['grant_program'] = $_POST['pid']; CRM_Grant_BAO_GrantProgram::create($grantProgramParams, $ids); - CRM_Core_Session::setStatus('Marked remaining unapproved Grants as Ineligible successfully.', '', 'no-popup'); + CRM_Core_Session::setStatus(ts('Marked remaining unapproved Grants as Ineligible successfully.'), '', 'no-popup'); } } } \ No newline at end of file diff --git a/sql/grantprograms_uninstall.sql b/sql/grantprograms_uninstall.sql index b042c39baf9c8a6f68710bce19581754ec06199f..faf9685e3b7f43a348d7e6ce68272e1d9927e535 100755 --- a/sql/grantprograms_uninstall.sql +++ b/sql/grantprograms_uninstall.sql @@ -132,8 +132,6 @@ DELETE FROM civicrm_financial_account WHERE name = 'NEI Grant'; DELETE FROM civicrm_financial_type WHERE name = 'NEI Grant'; ALTER table civicrm_grant DROP column grant_incomplete_reason_id; - -DELETE FROM civicrm_extension WHERE full_name = 'biz.jmaconsulting.grantprograms'; - + -- RG-212 DELETE cov FROM civicrm_option_group cog INNER JOIN civicrm_option_value cov ON cov.option_group_id = cog.id WHERE cog.name = 'activity_type' AND cov.name IN ('grant_status_change', 'grant_payment');