CRM-13764 - change all instances of Delete Members to Delete Memberships.

----------------------------------------
* CRM-13764:
  https://issues.civicrm.org/jira/browse/CRM-13764

diff --git a/CRM/Member/Form/Task/Delete.php b/CRM/Member/Form/Task/Delete.php
index 46162b20d961391e334ddb0861c7e5cc5724a59f..6c1870a0bc84163efdf06b80f001512b42e6801d 100644 (file)
--- a/CRM/Member/Form/Task/Delete.php
+++ b/CRM/Member/Form/Task/Delete.php
@@ -70,7 +70,7 @@ class CRM_Member_Form_Task_Delete extends CRM_Member_Form_Task {
    * @return void
    */
   function buildQuickForm() {
-    $this->addDefaultButtons(ts('Delete Members'), 'done');
+    $this->addDefaultButtons(ts('Delete Memberships'), 'done');
   }
 
   /**
@@ -88,7 +88,7 @@ class CRM_Member_Form_Task_Delete extends CRM_Member_Form_Task {
       }
     }
 
-    CRM_Core_Session::setStatus($deletedMembers, ts('Deleted Member(s)'), 'success');
+    CRM_Core_Session::setStatus($deletedMembers, ts('Deleted Membership(s)'), 'success');
     CRM_Core_Session::setStatus(ts('Total Selected Membership(s): %1', array(1 => count($this->_memberIds))), '', 'info');
   }
 }

diff --git a/CRM/Member/Task.php b/CRM/Member/Task.php
index 0c6925f9d99b3fbcb5c3c6127f52b23fc3919434..bcfb75a781657ec82b19b4bfac8d7a6ac42fbeed 100644 (file)
--- a/CRM/Member/Task.php
+++ b/CRM/Member/Task.php
@@ -70,7 +70,7 @@ class CRM_Member_Task {
     if (!(self::$_tasks)) {
       self::$_tasks = array(
         1 => array(
-          'title' => ts('Delete Members'),
+          'title' => ts('Delete Memberships'),
           'class' => 'CRM_Member_Form_Task_Delete',
           'result' => FALSE,
         ),

diff --git a/templates/CRM/Member/Form/Task.tpl b/templates/CRM/Member/Form/Task.tpl
index 73d3d1d66f33118f507d99800cb9317e065c5999..23e976bf73b37c48e88f80422ea98cd8cf112dad 100644 (file)
--- a/templates/CRM/Member/Form/Task.tpl
+++ b/templates/CRM/Member/Form/Task.tpl
@@ -23,7 +23,7 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}
-{ts 1=$totalSelectedMembers}Number of selected members: %1{/ts}
+{ts 1=$totalSelectedMembers}Number of selected memberships: %1{/ts}
 
 {if $rows } 
 <div class="form-item">

diff --git a/templates/CRM/Member/Form/Task/Delete.tpl b/templates/CRM/Member/Form/Task/Delete.tpl
index 0d2561d8b5b6b8262518da37d7f063214e54bf7c..be4bc62da3f46d0d5dc7da599fd0830123f3fcd3 100644 (file)
--- a/templates/CRM/Member/Form/Task/Delete.tpl
+++ b/templates/CRM/Member/Form/Task/Delete.tpl
@@ -25,12 +25,9 @@
 *}
 {* Confirmation of membership deletes  *}
 <div class="crm-block crm-form-block crm-member-task-delete-form-block">
-<div class="crm-submit-buttons">
-    {include file="CRM/common/formButtons.tpl" location="top"}
-  </div>
   <div class="messages status no-popup">
      <div class="icon inform-icon"></div>
-        <span>{ts}Are you sure you want to delete the selected memberships? This delete operation cannot be undone and will delete all transactions and activity associated with these members.{/ts}</span>
+        <span>{ts}Are you sure you want to delete the selected memberships? This delete operation cannot be undone and will delete all transactions and activity associated with these memberships.{/ts}</span>
         <p>{include file="CRM/Member/Form/Task.tpl"}</p>
   </div>
   <div class="crm-submit-buttons">