From: joannechester Date: Fri, 31 Jul 2015 13:19:40 +0000 (+1000) Subject: CRM-16467-more-action-menu-changes X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=79e4c2ada5c082e5b2c987aeadbb897e9429280b;p=civicrm-core.git CRM-16467-more-action-menu-changes --- diff --git a/CRM/Contact/Task.php b/CRM/Contact/Task.php index 7ea1034386..7c28dd7b42 100644 --- a/CRM/Contact/Task.php +++ b/CRM/Contact/Task.php @@ -92,7 +92,7 @@ class CRM_Contact_Task { 'class' => 'CRM_Contact_Form_Task_RemoveFromGroup', ), self::TAG_CONTACTS => array( - 'title' => ts('Tag - addto contacts'), + 'title' => ts('Tag - add to contacts'), 'class' => 'CRM_Contact_Form_Task_AddToTag', ), self::REMOVE_TAGS => array( @@ -155,7 +155,7 @@ class CRM_Contact_Task { 'result' => TRUE, ), self::EMAIL_UNHOLD => array( - 'title' => ts('Emails - unhold addresses'), + 'title' => ts('Email - unhold addresses'), 'class' => 'CRM_Contact_Form_Task_Unhold', ), self::COMMUNICATION_PREFS => array( @@ -185,9 +185,9 @@ class CRM_Contact_Task { } if (CRM_Contact_BAO_ContactType::isActive('Household')) { - $label = CRM_Contact_BAO_ContactType::getLabel('Household'); + $label = CRM_Contact_BAO_ContactType::getLabel('household'); self::$_tasks[self::HOUSEHOLD_CONTACTS] = array( - 'title' => ts('Add relationship to %1', + 'title' => ts('Add relationship - to %1', array(1 => $label) ), 'class' => 'CRM_Contact_Form_Task_AddToHousehold', @@ -195,9 +195,9 @@ class CRM_Contact_Task { } if (CRM_Contact_BAO_ContactType::isActive('Organization')) { - $label = CRM_Contact_BAO_ContactType::getLabel('Organization'); + $label = CRM_Contact_BAO_ContactType::getLabel('organization'); self::$_tasks[self::ORGANIZATION_CONTACTS] = array( - 'title' => ts('Add relationship to %1', + 'title' => ts('Add relationship - to %1', array(1 => $label) ), 'class' => 'CRM_Contact_Form_Task_AddToOrganization', diff --git a/CRM/Contribute/Task.php b/CRM/Contribute/Task.php index 632acd4bc1..5d3f749224 100644 --- a/CRM/Contribute/Task.php +++ b/CRM/Contribute/Task.php @@ -102,17 +102,17 @@ class CRM_Contribute_Task { 'result' => TRUE, ), 7 => array( - 'title' => ts('Print or Email Contribution Receipts'), + 'title' => ts('Receipts - print or email'), 'class' => 'CRM_Contribute_Form_Task_PDF', 'result' => FALSE, ), 8 => array( - 'title' => ts('Thank-you Letters for Contributions'), + 'title' => ts('Thank-you letters - print or email'), 'class' => 'CRM_Contribute_Form_Task_PDFLetter', 'result' => FALSE, ), 9 => array( - 'title' => ts('Print or Email Contribution Invoices'), + 'title' => ts('Invoices - print or email'), 'class' => 'CRM_Contribute_Form_Task_Invoice', 'result' => FALSE, ), @@ -127,7 +127,7 @@ class CRM_Contribute_Task { unset(self::$_tasks[4], self::$_tasks[6]); } - // remove action "Print or Email Contribution Invoices" + // remove action "Invoices - print or email" $invoiceSettings = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME, 'contribution_invoice_settings'); $invoicing = CRM_Utils_Array::value('invoicing', $invoiceSettings); if (!$invoicing) { diff --git a/CRM/Event/Task.php b/CRM/Event/Task.php index 31452f49e0..ff7bd4db14 100644 --- a/CRM/Event/Task.php +++ b/CRM/Event/Task.php @@ -101,7 +101,7 @@ class CRM_Event_Task { 'result' => FALSE, ), 6 => array( - 'title' => ts('Email - send now (to 50 or less)'), + 'title' => ts('Email - send now'), 'class' => 'CRM_Event_Form_Task_Email', 'result' => TRUE, ), @@ -116,12 +116,12 @@ class CRM_Event_Task { 'result' => TRUE, ), 15 => array( - 'title' => ts('Change Participant Status'), + 'title' => ts('Participant status - change'), 'class' => 'CRM_Event_Form_Task_ParticipantStatus', 'result' => TRUE, ), 16 => array( - 'title' => ts('Event name badges - print'), + 'title' => ts('Name badges - print'), 'class' => 'CRM_Event_Form_Task_Badge', 'result' => FALSE, ), diff --git a/CRM/Member/Task.php b/CRM/Member/Task.php index 8b829c1dba..24be057cb9 100644 --- a/CRM/Member/Task.php +++ b/CRM/Member/Task.php @@ -85,7 +85,7 @@ class CRM_Member_Task { 'result' => FALSE, ), 4 => array( - 'title' => ts('Email send now'), + 'title' => ts('Email - send now'), 'class' => 'CRM_Member_Form_Task_Email', 'result' => TRUE, ), diff --git a/templates/CRM/Contact/Form/Search/Advanced.hlp b/templates/CRM/Contact/Form/Search/Advanced.hlp index 522e58e0f0..7020be0cb3 100644 --- a/templates/CRM/Contact/Form/Search/Advanced.hlp +++ b/templates/CRM/Contact/Form/Search/Advanced.hlp @@ -35,7 +35,7 @@ {ts}Smart Group{/ts} {/htxt} {htxt id='id-advanced-smart'} -

{ts}If you've changed search criteria for this 'smart group' and want to save your changes, select Update Smart Group from the '- more actions -' drop-down menu, and then click Go.{/ts}

+

{ts}If you've changed search criteria for this 'smart group' and want to save your changes, select Smart group - update from the '- more actions -' drop-down menu, and then click Go.{/ts}

{/htxt} {htxt id="id-privacy-title"} diff --git a/templates/CRM/Event/Form/ManageEvent/Registration.hlp b/templates/CRM/Event/Form/ManageEvent/Registration.hlp index 90caf7fc1d..227f3320ab 100644 --- a/templates/CRM/Event/Form/ManageEvent/Registration.hlp +++ b/templates/CRM/Event/Form/ManageEvent/Registration.hlp @@ -1,4 +1,4 @@ -{* +{* +--------------------------------------------------------------------+ | CiviCRM version 4.6 | +--------------------------------------------------------------------+ @@ -85,7 +85,7 @@ {ts}Require Approval{/ts} {/htxt} {htxt id="id-requires_approval"} -{ts}Check this box to require administrative approval for all the participants who self-register, prior to being able to complete the registration process. Participants will be placed in 'Awaiting Approval' status. You can review and approve participants from 'Find Participants' - select the 'Change Participant Status' task. Approved participants will move to 'Pending from approval' status, and will be sent an email with a link to complete their registration (including paying event fees - if any). {/ts} +{ts}Check this box to require administrative approval for all the participants who self-register, prior to being able to complete the registration process. Participants will be placed in 'Awaiting Approval' status. You can review and approve participants from 'Find Participants' - select the 'Participant status - change' task. Approved participants will move to 'Pending from approval' status, and will be sent an email with a link to complete their registration (including paying event fees - if any). {/ts} {/htxt} {htxt id="id-expiration_time-title"} diff --git a/tests/phpunit/WebTest/Event/ChangeParticipantStatus.php b/tests/phpunit/WebTest/Event/ChangeParticipantStatus.php index 2fdc86e5bb..39aca63d56 100644 --- a/tests/phpunit/WebTest/Event/ChangeParticipantStatus.php +++ b/tests/phpunit/WebTest/Event/ChangeParticipantStatus.php @@ -68,7 +68,7 @@ class WebTest_Event_ChangeParticipantStatus extends CiviSeleniumTestCase { $this->click($id2); // Change participant status for selected participants - $this->select('task', "label=Change Participant Status"); + $this->select('task', "label=Participant status - change"); $this->waitForElementPresent('_qf_ParticipantStatus_next'); $this->select('status_change', "label=Attended");