From 1eba7e53d120e8801a43fa7878174914865fec8d Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 15 Nov 2014 20:15:00 -0500
Subject: [PATCH] CRM-15603 - Standardize 'None found' messages

---
 templates/CRM/Activity/Form/Search/EmptyResults.tpl             | 2 +-
 templates/CRM/Campaign/Form/Search/Campaign.tpl                 | 2 +-
 templates/CRM/Campaign/Form/Search/EmptyResults.tpl             | 2 +-
 templates/CRM/Campaign/Form/Search/Petition.tpl                 | 2 +-
 templates/CRM/Campaign/Form/Search/Survey.tpl                   | 2 +-
 templates/CRM/Campaign/Page/Campaign.tpl                        | 2 +-
 templates/CRM/Campaign/Page/Petition.tpl                        | 2 +-
 templates/CRM/Campaign/Page/Survey.tpl                          | 2 +-
 templates/CRM/Case/Form/Search/EmptyResults.tpl                 | 2 +-
 templates/CRM/Contact/Form/Search/Custom/EmptyResults.tpl       | 2 +-
 templates/CRM/Contact/Form/Search/EmptyResults.tpl              | 2 +-
 templates/CRM/Contribute/Form/Search/EmptyResults.tpl           | 2 +-
 templates/CRM/Event/Form/Search/EmptyResults.tpl                | 2 +-
 templates/CRM/Financial/Form/BatchTransaction.tpl               | 2 +-
 templates/CRM/Grant/Form/Search/EmptyResults.tpl                | 2 +-
 templates/CRM/Mailing/Page/Tab.tpl                              | 2 +-
 templates/CRM/Member/Form/Search/EmptyResults.tpl               | 2 +-
 templates/CRM/Pledge/Form/Search/EmptyResults.tpl               | 2 +-
 templates/CRM/Report/Form/ErrorMessage.tpl                      | 2 +-
 tests/phpunit/WebTest/Campaign/OfflineContributionTest.php      | 2 +-
 tests/phpunit/WebTest/Campaign/OfflineEventRegistrationTest.php | 2 +-
 tests/phpunit/WebTest/Contact/AdvanceSearchPaneTest.php         | 2 +-
 tests/phpunit/WebTest/Contact/PrivacyOptionSearchTest.php       | 2 +-
 tests/phpunit/WebTest/Contact/SearchBuilderTest.php             | 2 +-
 tests/phpunit/WebTest/Contact/SearchbyDateFilterTest.php        | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/templates/CRM/Activity/Form/Search/EmptyResults.tpl b/templates/CRM/Activity/Form/Search/EmptyResults.tpl
index 90cf294b66..bcdebe6e43 100644
--- 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 821a1807bb..51ed658291 100755
--- 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 45b58f5588..3cf31ee6f6 100755
--- 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 40be7c322f..5c9aae2a65 100755
--- 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 e3c5fe4b16..015bac8d0b 100755
--- 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 e067900148..f814db5667 100644
--- 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 40e8d4a14d..69e7839c32 100644
--- 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 40e8d4a14d..69e7839c32 100644
--- 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 a2cae50341..8790797cd6 100644
--- 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 5d14f69d80..ec73325c41 100644
--- 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 2e02f58869..14ef6c7f8e 100644
--- 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 15be8b5ca2..54b2d73884 100644
--- 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 402f21d404..cdc42aafff 100644
--- 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 648725d1fe..8640fabd9e 100644
--- 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 142b2059a4..c558a887d6 100644
--- 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 14a7a7a34c..e212176a3c 100644
--- 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 31e5fc177e..7f0b89d491 100644
--- 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 896fccbdd0..c7b4125687 100644
--- 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 31e64d129b..bf77f08d98 100644
--- 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 7384c16f7a..aa65cc6af7 100644
--- 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 2cf02ffb18..f67d426525 100644
--- 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 964d20d1a3..29c68b58d2 100644
--- 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 ab0a8c93e2..07a478e9df 100644
--- 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 16f37032e3..cb7041f7c2 100644
--- 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 185f1291d8..92861a07d8 100644
--- 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');
     }
 
-- 
2.25.1