From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 28 Aug 2014 14:48:55 +0000 (+0100)
Subject: String fixes
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1f5588bc8cca55106430d3e758349f62e9b13759;p=civicrm-core.git

String fixes
---

diff --git a/CRM/Admin/Form/Preferences/Address.php b/CRM/Admin/Form/Preferences/Address.php
index 1f6b0cb80d..546e5dbb36 100644
--- a/CRM/Admin/Form/Preferences/Address.php
+++ b/CRM/Admin/Form/Preferences/Address.php
@@ -206,13 +206,9 @@ class CRM_Admin_Form_Preferences_Address extends CRM_Admin_Form_Preferences {
           !empty($this->_params['address_options'][$key])
         ) {
           // print a status message to the user if county table seems small
-          $sql = "
-SELECT count(*)
-FROM   civicrm_county
-";
-          $countyCount = CRM_Core_DAO::singleValueQuery($sql);
+          $countyCount = CRM_Core_DAO::singleValueQuery("SELECT count(*) FROM civicrm_county");
           if ($countyCount < 10) {
-            CRM_Core_Session::setStatus(ts('You have enabled the County option. Please ensure you populate the county table in your CiviCRM Database. You can find extensions to populate counties in the ') . CRM_Utils_System::href(ts('CiviCRM Extensions Directory'), 'civicrm/admin/extensions', array('reset' => 1), TRUE, 'extensions-addnew'),
+            CRM_Core_Session::setStatus(ts('You have enabled the County option. Please ensure you populate the county table in your CiviCRM Database. You can find extensions to populate counties in the <a %1>CiviCRM Extensions Directory</a>.', array(1 => 'href="' . CRM_Utils_System::url('civicrm/admin/extensions', array('reset' => 1), TRUE, 'extensions-addnew') . '"')),
               ts('Populate counties'),
               "info"
             );