CRM-15603 - Standardize 'None found' messages

diff --git a/templates/CRM/Activity/Form/Search/EmptyResults.tpl b/templates/CRM/Activity/Form/Search/EmptyResults.tpl
index 90cf294b66ee97af8845eeb34d656fbb18088656..bcdebe6e43f105f19417c87b25bf0ed61279c88c 100644 (file)
--- a/templates/CRM/Activity/Form/Search/EmptyResults.tpl
+++ b/templates/CRM/Activity/Form/Search/EmptyResults.tpl
@@ -29,7 +29,7 @@
     {if $qill}{ts}No matches found for:{/ts}
         {include file="CRM/common/displaySearchCriteria.tpl"}
     {else}
-        {ts}No matching activity results found.{/ts}
+        {ts}None found.{/ts}
     {/if}
     <br />{ts}Suggestions:{/ts}
     <ul>

diff --git a/templates/CRM/Campaign/Form/Search/Campaign.tpl b/templates/CRM/Campaign/Form/Search/Campaign.tpl
index 821a1807bb2abe1c7bb655d0fd08a092db67ae27..51ed65829164907e6d229c1e7a907d79f9bcf31c 100755 (executable)
--- a/templates/CRM/Campaign/Form/Search/Campaign.tpl
+++ b/templates/CRM/Campaign/Form/Search/Campaign.tpl
@@ -28,7 +28,7 @@
   <div class="messages status no-popup">
     <div class="icon inform-icon"></div>
     &nbsp;
-    {ts}No campaigns found.{/ts}
+    {ts}None found.{/ts}
   </div>
   <div class="action-link">
     <a href="{crmURL p='civicrm/campaign/add' q='reset=1' h=0 }" class="button"><span><div

diff --git a/templates/CRM/Campaign/Form/Search/EmptyResults.tpl b/templates/CRM/Campaign/Form/Search/EmptyResults.tpl
index 45b58f558893aad6c14683803fb8acf38556f026..3cf31ee6f69c229397f31e47627d27393603437a 100755 (executable)
--- a/templates/CRM/Campaign/Form/Search/EmptyResults.tpl
+++ b/templates/CRM/Campaign/Form/Search/EmptyResults.tpl
@@ -29,7 +29,7 @@
         {if $qill}{ts}No matches found for:{/ts}
             {include file="CRM/common/displaySearchCriteria.tpl"}
         {else}
-            {ts}No matching respondent found.{/ts}
+            {ts}None found.{/ts}
         {/if}
         <br />
         {ts}Suggestions:{/ts}

diff --git a/templates/CRM/Campaign/Form/Search/Petition.tpl b/templates/CRM/Campaign/Form/Search/Petition.tpl
index 40be7c322fffcafee7307021707d72f3879ebf77..5c9aae2a65e1c8fd3b23917261705688fcdbefff 100755 (executable)
--- a/templates/CRM/Campaign/Form/Search/Petition.tpl
+++ b/templates/CRM/Campaign/Form/Search/Petition.tpl
@@ -27,7 +27,7 @@
 {if !$hasPetitions}
     <div class="messages status no-popup">
         <div class="icon inform-icon"></div> &nbsp;
-        {ts}No petitions found.{/ts}
+        {ts}None found.{/ts}
     </div>
 
     <div class="action-link">

diff --git a/templates/CRM/Campaign/Form/Search/Survey.tpl b/templates/CRM/Campaign/Form/Search/Survey.tpl
index e3c5fe4b16910b3ab290a2644b21ca792e5af7c1..015bac8d0b5af5fe56609fb0b0f674147219ef49 100755 (executable)
--- a/templates/CRM/Campaign/Form/Search/Survey.tpl
+++ b/templates/CRM/Campaign/Form/Search/Survey.tpl
@@ -27,7 +27,7 @@
 {if !$hasSurveys}
     <div class="messages status no-popup">
         <div class="icon inform-icon"></div> &nbsp;
-        {ts}No surveys found.{/ts}
+        {ts}None found.{/ts}
     </div>
 
     <div class="action-link">

diff --git a/templates/CRM/Campaign/Page/Campaign.tpl b/templates/CRM/Campaign/Page/Campaign.tpl
index e067900148c8fdfe165b562bbfc82dc7767daa75..f814db566716cf64f9eeb7d184e05ff5b20d07a4 100644 (file)
--- a/templates/CRM/Campaign/Page/Campaign.tpl
+++ b/templates/CRM/Campaign/Page/Campaign.tpl
@@ -62,7 +62,7 @@
 {else}
     <div class="messages status no-popup">
         <div class="icon inform-icon"></div> &nbsp;
-        {ts}No Campaigns found.{/ts}
+        {ts}None found.{/ts}
     </div>
 {/if}
 <div class="action-link">

diff --git a/templates/CRM/Campaign/Page/Petition.tpl b/templates/CRM/Campaign/Page/Petition.tpl
index 40e8d4a14dfd0b085f19bfdf59d53798327c040b..69e7839c32c9cb828853cf869c5f8dfd43cdd257 100644 (file)
--- a/templates/CRM/Campaign/Page/Petition.tpl
+++ b/templates/CRM/Campaign/Page/Petition.tpl
@@ -65,7 +65,7 @@
 
 {else}
   <div class="status">
-    <div class="icon inform-icon"></div>&nbsp;{ts}No survey found.{/ts}
+    <div class="icon inform-icon"></div>&nbsp;{ts}None found.{/ts}
   </div>
 {/if}
 <div class="action-link">

diff --git a/templates/CRM/Campaign/Page/Survey.tpl b/templates/CRM/Campaign/Page/Survey.tpl
index 40e8d4a14dfd0b085f19bfdf59d53798327c040b..69e7839c32c9cb828853cf869c5f8dfd43cdd257 100644 (file)
--- a/templates/CRM/Campaign/Page/Survey.tpl
+++ b/templates/CRM/Campaign/Page/Survey.tpl
@@ -65,7 +65,7 @@
 
 {else}
   <div class="status">
-    <div class="icon inform-icon"></div>&nbsp;{ts}No survey found.{/ts}
+    <div class="icon inform-icon"></div>&nbsp;{ts}None found.{/ts}
   </div>
 {/if}
 <div class="action-link">

diff --git a/templates/CRM/Case/Form/Search/EmptyResults.tpl b/templates/CRM/Case/Form/Search/EmptyResults.tpl
index a2cae5034100c322a7a2193add2b55becce2be9d..8790797cd628ba628f0a53011d713da055521747 100644 (file)
--- a/templates/CRM/Case/Form/Search/EmptyResults.tpl
+++ b/templates/CRM/Case/Form/Search/EmptyResults.tpl
@@ -29,7 +29,7 @@
         {if $qill}{ts}No matches found for:{/ts}
             {include file="CRM/common/displaySearchCriteria.tpl"}
         {else}
-            {ts}No matching cases found.{/ts}
+            {ts}None found.{/ts}
         {/if}
         <br />
         {ts}Suggestions:{/ts}

diff --git a/templates/CRM/Contact/Form/Search/Custom/EmptyResults.tpl b/templates/CRM/Contact/Form/Search/Custom/EmptyResults.tpl
index 5d14f69d800194f4816cfda762a4b3d907f75c72..ec73325c4161f4281340342f0bca37874a171351 100644 (file)
--- a/templates/CRM/Contact/Form/Search/Custom/EmptyResults.tpl
+++ b/templates/CRM/Contact/Form/Search/Custom/EmptyResults.tpl
@@ -31,7 +31,7 @@
     {include file="CRM/common/displaySearchCriteria.tpl"}
     <br />
   {else}
-    {ts}No matches found.{/ts}
+    {ts}None found.{/ts}
     <br />
   {/if}
   {ts}Suggestions:{/ts}

diff --git a/templates/CRM/Contact/Form/Search/EmptyResults.tpl b/templates/CRM/Contact/Form/Search/EmptyResults.tpl
index 2e02f58869cd0011cedfba17d1d3fa0c0ba8d7be..14ef6c7f8e732a27fbe76f410ac8d8312188f3a0 100644 (file)
--- a/templates/CRM/Contact/Form/Search/EmptyResults.tpl
+++ b/templates/CRM/Contact/Form/Search/EmptyResults.tpl
@@ -33,7 +33,7 @@
                 {include file="CRM/common/displaySearchCriteria.tpl"}
                 <br />
             {else}
-            {ts}No matches found.{/ts}
+            {ts}None found.{/ts}
             {/if}
             {ts}Suggestions:{/ts}
             <ul>

diff --git a/templates/CRM/Contribute/Form/Search/EmptyResults.tpl b/templates/CRM/Contribute/Form/Search/EmptyResults.tpl
index 15be8b5ca29f28aa1cac585bd7d04316380c5594..54b2d73884b1c9f69a74a81eff662368b01864ce 100644 (file)
--- a/templates/CRM/Contribute/Form/Search/EmptyResults.tpl
+++ b/templates/CRM/Contribute/Form/Search/EmptyResults.tpl
@@ -29,7 +29,7 @@
         {if $qill}{ts}No matches found for:{/ts}
             {include file="CRM/common/displaySearchCriteria.tpl"}
         {else}
-            {ts}No matching contributions found.{/ts}
+            {ts}None found.{/ts}
         {/if}
         <br />
         {ts}Suggestions:{/ts}

diff --git a/templates/CRM/Event/Form/Search/EmptyResults.tpl b/templates/CRM/Event/Form/Search/EmptyResults.tpl
index 402f21d404112fb4a31ec798e3214bfca40db30f..cdc42aafff9b3cddedefe0a84210ec1ee79278e0 100644 (file)
--- a/templates/CRM/Event/Form/Search/EmptyResults.tpl
+++ b/templates/CRM/Event/Form/Search/EmptyResults.tpl
@@ -29,7 +29,7 @@
     {if $qill}{ts}No matches found for:{/ts}
         {include file="CRM/common/displaySearchCriteria.tpl"}
     {else}
-        {ts}No matching memberships found.{/ts}
+        {ts}None found.{/ts}
     {/if}
   <br />
     {ts}Suggestions:{/ts}

diff --git a/templates/CRM/Financial/Form/BatchTransaction.tpl b/templates/CRM/Financial/Form/BatchTransaction.tpl
index 648725d1fec1ca7ba171c22dca88fe31f82d62eb..8640fabd9ed3a7f7b260d2255cb6c33944aa0b8e 100644 (file)
--- a/templates/CRM/Financial/Form/BatchTransaction.tpl
+++ b/templates/CRM/Financial/Form/BatchTransaction.tpl
@@ -178,7 +178,7 @@ function buildTransactionSelectorAssign(filterSearch) {
   var sourceUrl = {/literal}'{crmURL p="civicrm/ajax/rest" h=0 q="className=CRM_Financial_Page_AJAX&fnName=getFinancialTransactionsList&snippet=4&context=financialBatch&entityID=$entityID&notPresent=1&statusID=$statusID"}'{literal};
   if ( filterSearch ) {
     sourceUrl = sourceUrl+"&search=1";
-    var ZeroRecordText = '<div class="status messages">{/literal}{ts escape="js"}No Contributions found for your search criteria.{/ts}{literal}</li></ul></div>';
+    var ZeroRecordText = '<div class="status messages">{/literal}{ts escape="js"}None found.{/ts}{literal}</li></ul></div>';
   }
 
   crmBatchSelector1 = CRM.$('#crm-transaction-selector-assign-{/literal}{$entityID}{literal}').dataTable({

diff --git a/templates/CRM/Grant/Form/Search/EmptyResults.tpl b/templates/CRM/Grant/Form/Search/EmptyResults.tpl
index 142b2059a4969eb1d4923fc230a6b6ed0ed24c3a..c558a887d6284f32a448f3c11d113120880ecc7b 100644 (file)
--- a/templates/CRM/Grant/Form/Search/EmptyResults.tpl
+++ b/templates/CRM/Grant/Form/Search/EmptyResults.tpl
@@ -29,7 +29,7 @@
         {if $qill}{ts}No matches found for:{/ts}
             {include file="CRM/common/displaySearchCriteria.tpl"}
         {else}
-            {ts}No matching memberships found.{/ts}
+            {ts}None found.{/ts}
         {/if}
         <br />
         {ts}Suggestions:{/ts}

diff --git a/templates/CRM/Mailing/Page/Tab.tpl b/templates/CRM/Mailing/Page/Tab.tpl
index 14a7a7a34c0741641f9a659fa29d76d927a4291f..e212176a3cf0c9dd2d328ab2b434e4bc16fb0940 100644 (file)
--- a/templates/CRM/Mailing/Page/Tab.tpl
+++ b/templates/CRM/Mailing/Page/Tab.tpl
@@ -48,7 +48,7 @@
     function buildMailingContact() {
       var sourceUrl = {/literal}'{crmURL p="civicrm/ajax/contactmailing" h=0 q="contact_id=$contactId"}'{literal};
 
-      var ZeroRecordText = {/literal}'{ts escape="js"}No mailings found{/ts}.'{literal};
+      var ZeroRecordText = {/literal}'{ts escape="js"}None found.{/ts}'{literal};
 
       oTable = $('.contact-mailing-selector').dataTable({
         "bFilter": false,

diff --git a/templates/CRM/Member/Form/Search/EmptyResults.tpl b/templates/CRM/Member/Form/Search/EmptyResults.tpl
index 31e5fc177e4b584bba04372f144f895951097a79..7f0b89d49112d655c6131a115920aea552ed8499 100644 (file)
--- a/templates/CRM/Member/Form/Search/EmptyResults.tpl
+++ b/templates/CRM/Member/Form/Search/EmptyResults.tpl
@@ -29,7 +29,7 @@
         {if $qill}{ts}No matches found for:{/ts}
             {include file="CRM/common/displaySearchCriteria.tpl"}
         {else}
-            {ts}No matching memberships found.{/ts}
+            {ts}None found.{/ts}
         {/if}
         <br />
         {ts}Suggestions:{/ts}

diff --git a/templates/CRM/Pledge/Form/Search/EmptyResults.tpl b/templates/CRM/Pledge/Form/Search/EmptyResults.tpl
index 896fccbdd0a3315687ed0d7dd77be3102edd2889..c7b4125687d7d765a153608457aa0a8d00987dd5 100644 (file)
--- a/templates/CRM/Pledge/Form/Search/EmptyResults.tpl
+++ b/templates/CRM/Pledge/Form/Search/EmptyResults.tpl
@@ -29,7 +29,7 @@
         {if $qill}{ts}No matches found for:{/ts}
             {include file="CRM/common/displaySearchCriteria.tpl"}
         {else}
-            {ts}No matching pledge results found.{/ts}
+            {ts}None found.{/ts}
         {/if}
         {ts}Suggestions:{/ts}
         <ul>

diff --git a/templates/CRM/Report/Form/ErrorMessage.tpl b/templates/CRM/Report/Form/ErrorMessage.tpl
index 31e64d129bc79a2a5e8dd29dd4abde338a104e09..bf77f08d9826d76b525ece5b4803db31035e5504 100644 (file)
--- a/templates/CRM/Report/Form/ErrorMessage.tpl
+++ b/templates/CRM/Report/Form/ErrorMessage.tpl
@@ -25,6 +25,6 @@
 *}
 {if $outputMode eq 'html' && !$rows}
     <div class="messages status no-popup">
-        <div class="icon inform-icon"></div>&nbsp; {ts}Sorry. No results found.{/ts}
+        <div class="icon inform-icon"></div>&nbsp; {ts}None found.{/ts}
     </div>
 {/if}

diff --git a/tests/phpunit/WebTest/Campaign/OfflineContributionTest.php b/tests/phpunit/WebTest/Campaign/OfflineContributionTest.php
index 7384c16f7a27a44baebd4675f52e4a9070f4d983..aa65cc6af77cc7a3feadbc983401a015c0ecc0f4 100644 (file)
--- a/tests/phpunit/WebTest/Campaign/OfflineContributionTest.php
+++ b/tests/phpunit/WebTest/Campaign/OfflineContributionTest.php
@@ -80,7 +80,7 @@ class WebTest_Campaign_OfflineContributionTest extends CiviSeleniumTestCase {
     $this->webtestLogin();
 
     $this->openCiviPage('campaign', 'reset=1', "link=Add Campaign");
-    if ($this->isTextPresent('No campaigns found.')) {
+    if ($this->isTextPresent('None found.')) {
       $this->openCiviPage('contribute/add', 'reset=1&action=add&context=standalone', '_qf_Contribution_cancel-bottom');
       $this->assertElementContainsText('crm-container', 'There are currently no active Campaigns.');
     }

diff --git a/tests/phpunit/WebTest/Campaign/OfflineEventRegistrationTest.php b/tests/phpunit/WebTest/Campaign/OfflineEventRegistrationTest.php
index 2cf02ffb181933c1d37c4e6e9a5a9788affed9f0..f67d426525154cf99a1588d2e705a1ebf5abd412 100644 (file)
--- a/tests/phpunit/WebTest/Campaign/OfflineEventRegistrationTest.php
+++ b/tests/phpunit/WebTest/Campaign/OfflineEventRegistrationTest.php
@@ -81,7 +81,7 @@ class WebTest_Campaign_OfflineEventRegistrationTest extends CiviSeleniumTestCase
 
     $this->openCiviPage("campaign", "reset=1", "link=Add Campaign");
 
-    if ($this->isTextPresent('No campaigns found.')) {
+    if ($this->isTextPresent('None found.')) {
       $this->openCiviPage("participant/add", "reset=1&action=add&context=standalone", "_qf_Participant_upload-bottom");
       $this->assertTrue($this->isTextPresent('There are currently no active Campaigns.'));
     }

diff --git a/tests/phpunit/WebTest/Contact/AdvanceSearchPaneTest.php b/tests/phpunit/WebTest/Contact/AdvanceSearchPaneTest.php
index 964d20d1a346b03d8e2364cd468c72e6d7471f0b..29c68b58d271cf83e8a3d6f50f2bbd4d81fe5a8c 100644 (file)
--- a/tests/phpunit/WebTest/Contact/AdvanceSearchPaneTest.php
+++ b/tests/phpunit/WebTest/Contact/AdvanceSearchPaneTest.php
@@ -91,7 +91,7 @@ class WebTest_Contact_AdvanceSearchPaneTest extends CiviSeleniumTestCase {
    */
   function _checkOpenedPanes($openedPanes = array(
     )) {
-    if (!$this->isTextPresent('No matches found')) {
+    if (!$this->isTextPresent('None found.')) {
       $this->click('css=div.crm-advanced_search_form-accordion div.crm-accordion-header');
     }
 

diff --git a/tests/phpunit/WebTest/Contact/PrivacyOptionSearchTest.php b/tests/phpunit/WebTest/Contact/PrivacyOptionSearchTest.php
index ab0a8c93e2506984c832d4716dcd654f27b68f6c..07a478e9df84b71c46a129ba8bcb99273077246c 100644 (file)
--- a/tests/phpunit/WebTest/Contact/PrivacyOptionSearchTest.php
+++ b/tests/phpunit/WebTest/Contact/PrivacyOptionSearchTest.php
@@ -121,7 +121,7 @@ class WebTest_Contact_PrivacyOptionSearchTest extends CiviSeleniumTestCase {
     $this->click("_qf_Advanced_refresh");
     $this->waitForPageToLoad(2 * $this->getTimeoutMsec());
 
-    $this->assertTrue($this->isTextPresent("No matches found"));
+    $this->assertTrue($this->isTextPresent("None found."));
 
     // Go to advance search, check for 'Include' + 'OR' options.
     $this->openCiviPage("contact/search/advanced", "reset=1");

diff --git a/tests/phpunit/WebTest/Contact/SearchBuilderTest.php b/tests/phpunit/WebTest/Contact/SearchBuilderTest.php
index 16f37032e3eb7f6a2fd389b4f368651b7a181389..cb7041f7c2840567eaa8be655619a840ce264f44 100644 (file)
--- a/tests/phpunit/WebTest/Contact/SearchBuilderTest.php
+++ b/tests/phpunit/WebTest/Contact/SearchBuilderTest.php
@@ -50,7 +50,7 @@ class WebTest_Contact_SearchBuilderTest extends CiviSeleniumTestCase {
     $this->waitForPageToLoad();
 
     // We should get no results. But check the options are all still set
-    $this->waitForTextPresent('No matches found');
+    $this->waitForTextPresent('None found.');
     foreach (array($groupName, 'United States', 'Male') as $i => $label) {
       $this->waitForElementPresent("//span[@id='crm_search_value_1_$i']/select/option[2]");
       $this->assertSelectedLabel("//span[@id='crm_search_value_1_$i']/select", $label);

diff --git a/tests/phpunit/WebTest/Contact/SearchbyDateFilterTest.php b/tests/phpunit/WebTest/Contact/SearchbyDateFilterTest.php
index 185f1291d84bc9809b4b80d592a5ec6e6fd826fa..92861a07d809b2701b25cac47279bbd3479b7b53 100644 (file)
--- a/tests/phpunit/WebTest/Contact/SearchbyDateFilterTest.php
+++ b/tests/phpunit/WebTest/Contact/SearchbyDateFilterTest.php
@@ -158,7 +158,7 @@ class WebTest_Contact_SearchbyDateFilterTest extends CiviSeleniumTestCase {
    */
   function _checkOpenedPanes($openedPanes = array(
     )) {
-    if (!$this->isTextPresent('No matches found')) {
+    if (!$this->isTextPresent('None found.')) {
       $this->click('css=div.crm-advanced_search_form-accordion div.crm-accordion-header');
     }