From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 22 Aug 2014 12:01:24 +0000 (+0100)
Subject: Update state/county placeholder
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7e9d4774550697139b2ee3a72f0ac8c9577cafcb;p=civicrm-core.git

Update state/county placeholder
---

diff --git a/CRM/Core/BAO/UFGroup.php b/CRM/Core/BAO/UFGroup.php
index c213ac914c..478501d452 100644
--- a/CRM/Core/BAO/UFGroup.php
+++ b/CRM/Core/BAO/UFGroup.php
@@ -1854,8 +1854,7 @@ AND    ( entity_id IS NULL OR entity_id <= 0 )
     elseif (substr($fieldName, 0, 6) === 'county') {
       if ($addressOptions['county']) {
         $form->add('select', $name, $title,
-          array(
-            '' => ts('(choose state first)')), $required
+          array('' => ts('Choose state first')), $required
         );
       }
     }
diff --git a/CRM/Core/Page/AJAX/Location.php b/CRM/Core/Page/AJAX/Location.php
index d9e7023a97..1527af263a 100644
--- a/CRM/Core/Page/AJAX/Location.php
+++ b/CRM/Core/Page/AJAX/Location.php
@@ -233,7 +233,7 @@ class CRM_Core_Page_AJAX_Location {
     $elements = array();
     if (!isset($_GET['_value']) || CRM_Utils_System::isNull($_GET['_value'])) {
       $elements = array(
-        array('name' => ts('(choose state first)'), 'value' => '')
+        array('name' => ts('Choose state first'), 'value' => '')
       );
     }
     else {
diff --git a/templates/CRM/common/stateCountry.tpl b/templates/CRM/common/stateCountry.tpl
index b16e8a47c0..f03b6c717b 100644
--- a/templates/CRM/common/stateCountry.tpl
+++ b/templates/CRM/common/stateCountry.tpl
@@ -74,14 +74,14 @@
         $('select[name="{$stateCountryMap.state_province}"], select#{$stateCountryMap.state_province}', $form).data('chainSelect', {ldelim}
           callback: CRM.url('civicrm/ajax/jqCounty'),
           target: initField('select[name="{$stateCountryMap.county}"], #{$stateCountryMap.county}'),
-          placeholder: "{ts escape='js'}(choose state first){/ts}"
+          placeholder: "{ts escape='js'}Choose state first{/ts}"
         {rdelim}).on('change',  chainSelect);
       {/if}
       {if $stateCountryMap.country && $stateCountryMap.state_province}
         initField('select[name="{$stateCountryMap.country}"], select#{$stateCountryMap.country}').data('chainSelect', {ldelim}
           callback: CRM.url('civicrm/ajax/jqState'),
           target: initField('select[name="{$stateCountryMap.state_province}"], #{$stateCountryMap.state_province}'),
-          placeholder: "{ts escape='js'}(choose country first){/ts}"
+          placeholder: "{ts escape='js'}Choose country first{/ts}"
         {rdelim}).on('change', chainSelect).change();
       {/if}
     {/foreach}