Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-24-02-32-04

[civicrm-core.git] / CRM / Utils / Geocode / Yahoo.php

diff --git a/CRM/Utils/Geocode/Yahoo.php b/CRM/Utils/Geocode/Yahoo.php
index a92239b3ab0fa26e5ebe630a22da3b7c1dbdbb13..ee90f814bbf6ecf8a471a7e8c52f4d6c62d0219c 100644 (file)
--- a/CRM/Utils/Geocode/Yahoo.php
+++ b/CRM/Utils/Geocode/Yahoo.php
@@ -166,12 +166,11 @@ class CRM_Utils_Geocode_Yahoo {
           if (strpos($new_pc_complete, $current_pc_complete) !== 0) {
             // Don't bother anonymous users with the message - they can't change a form they just submitted anyway
             if(CRM_Utils_System::isUserLoggedIn()) {
-              $ts_args =  array(
+              $msg = ts('The Yahoo Geocoding system returned a different postal code (%1) than the one you entered (%2). If you want the Yahoo value, please delete the current postal code and save again.', array(
                 1 => $ret['postal'],
                 2 => $current_pc_suffix ? "$current_pc-$current_pc_suffix" : $current_pc
-            );
-              $msg = ts('The Yahoo Geocoding system returned a different postal code (%1) than the one you entered (%2). If you want the Yahoo value, please delete the current postal code and save again.', $ts_args);
-            
+              ));
+
               CRM_Core_Session::setStatus($msg, ts('Postal Code Mismatch'), 'error');
             }
             $skip_postal = TRUE;