From 7f82e636096fd2c19d51253f58600f238a5ee3dd Mon Sep 17 00:00:00 2001 From: joannechester Date: Thu, 30 Jul 2015 23:32:13 +1000 Subject: [PATCH] first go at action menu changes --- CRM/Activity/Form/Task/PickOption.php | 2 +- CRM/Activity/Form/Task/PickProfile.php | 4 +- CRM/Activity/Task.php | 18 +++---- CRM/Case/Task.php | 8 +-- CRM/Contact/Form/Task/Merge.php | 2 +- CRM/Contact/Form/Task/PickProfile.php | 4 +- CRM/Contact/Task.php | 52 +++++++++---------- CRM/Contribute/Form/Task/PickProfile.php | 4 +- CRM/Contribute/Task.php | 12 ++--- CRM/Event/Task.php | 22 ++++---- CRM/Grant/Task.php | 8 +-- CRM/Member/Form/Task/PickProfile.php | 4 +- CRM/Member/Task.php | 14 ++--- CRM/Pledge/Task.php | 6 +-- CRM/Utils/Hook.php | 2 +- templates/CRM/Admin/Form/Setting/Mail.tpl | 2 +- templates/CRM/Contact/Form/Domain.tpl | 2 +- .../WebTest/ACL/AssignUsersToRolesTest.php | 2 +- .../AddContactsToEventAdvancedSearchTest.php | 2 +- .../AdvancedSearchedRelatedContactTest.php | 2 +- .../DeceasedContactsAdvancedSearchTest.php | 2 +- tests/phpunit/WebTest/Contact/SearchTest.php | 2 +- .../Contact/TaskActionAddToGroupTest.php | 4 +- .../Contact/TaskActionSendMassMailing.php | 2 +- .../WebTest/Contact/TaskActionSendSMS.php | 2 +- tests/phpunit/WebTest/Export/ContactTest.php | 8 +-- .../WebTest/Profile/BatchUpdateTest.php | 6 +-- 27 files changed, 99 insertions(+), 99 deletions(-) diff --git a/CRM/Activity/Form/Task/PickOption.php b/CRM/Activity/Form/Task/PickOption.php index e524b566a9..f8a5e6dea9 100644 --- a/CRM/Activity/Form/Task/PickOption.php +++ b/CRM/Activity/Form/Task/PickOption.php @@ -177,7 +177,7 @@ class CRM_Activity_Form_Task_PickOption extends CRM_Activity_Form_Task { $urlParams = "_qf_PickOption_display=true&qfKey={$params['qfKey']}"; $urlRedirect = CRM_Utils_System::url('civicrm/activity/search', $urlParams); CRM_Core_Error::statusBounce( - ts('It appears you have no contacts with emails from the selected recipients.'), + ts('It appears you have no contacts with email addresses from the selected recipients.'), $urlRedirect ); } diff --git a/CRM/Activity/Form/Task/PickProfile.php b/CRM/Activity/Form/Task/PickProfile.php index 6b1afc37bb..b6d875af6c 100755 --- a/CRM/Activity/Form/Task/PickProfile.php +++ b/CRM/Activity/Form/Task/PickProfile.php @@ -74,7 +74,7 @@ class CRM_Activity_Form_Task_PickProfile extends CRM_Activity_Form_Task { $validate = FALSE; //validations if (count($this->_activityHolderIds) > $this->_maxActivities) { - CRM_Core_Session::setStatus(ts("The maximum number of Activities you can select for Batch Update is %1. You have selected %2. Please select fewer Activities from your search results and try again.", array( + CRM_Core_Session::setStatus(ts("The maximum number of Activities you can select for Batch update is %1. You have selected %2. Please select fewer Activities from your search results and try again.", array( 1 => $this->_maxActivities, 2 => count($this->_activityHolderIds), )), ts('Maximum Exceeded'), 'error'); @@ -119,7 +119,7 @@ class CRM_Activity_Form_Task_PickProfile extends CRM_Activity_Form_Task { } if (empty($profiles)) { - CRM_Core_Session::setStatus(ts("You will need to create a Profile containing the %1 fields you want to edit before you can use Batch Update via Profile. Navigate to Administer > Customize Data and Screens > Profiles to configure a Profile. Consult the online Administrator documentation for more information.", array(1 => $types[0])), ts("No Profile Configured"), "alert"); + CRM_Core_Session::setStatus(ts("You will need to create a Profile containing the %1 fields you want to edit before you can use Batch update activities via profile. Navigate to Administer > Customize Data and Screens > Profiles to configure a Profile. Consult the online Administrator documentation for more information.", array(1 => $types[0])), ts("No Profile Configured"), "alert"); CRM_Utils_System::redirect($this->_userContext); } elseif ($notEditable) { diff --git a/CRM/Activity/Task.php b/CRM/Activity/Task.php index 1a07d53b15..f30f3e11e5 100644 --- a/CRM/Activity/Task.php +++ b/CRM/Activity/Task.php @@ -70,17 +70,17 @@ class CRM_Activity_Task { if (!(self::$_tasks)) { self::$_tasks = array( 1 => array( - 'title' => ts('Delete Activities'), + 'title' => ts('Delete activities'), 'class' => 'CRM_Activity_Form_Task_Delete', 'result' => FALSE, ), 2 => array( - 'title' => ts('Print Selected Rows'), + 'title' => ts('Print selected rows'), 'class' => 'CRM_Activity_Form_Task_Print', 'result' => FALSE, ), 3 => array( - 'title' => ts('Export Activities'), + 'title' => ts('Export activities'), 'class' => array( 'CRM_Export_Form_Select', 'CRM_Export_Form_Map', @@ -88,7 +88,7 @@ class CRM_Activity_Task { 'result' => FALSE, ), 4 => array( - 'title' => ts('Batch Update Activities Via Profile'), + 'title' => ts('Batch update activities via profile'), 'class' => array( 'CRM_Activity_Form_Task_PickProfile', 'CRM_Activity_Form_Task_Batch', @@ -96,7 +96,7 @@ class CRM_Activity_Task { 'result' => FALSE, ), 5 => array( - 'title' => ts('Send Email to Contacts'), + 'title' => ts('Email - send now'), 'class' => array( 'CRM_Activity_Form_Task_PickOption', 'CRM_Activity_Form_Task_Email', @@ -104,17 +104,17 @@ class CRM_Activity_Task { 'result' => FALSE, ), 6 => array( - 'title' => ts('Send Reply SMS To Contacts'), + 'title' => ts('SMS - send reply'), 'class' => 'CRM_Activity_Form_Task_SMS', 'result' => FALSE, ), 7 => array( - 'title' => ts('Tag Activities (assign tags)'), + 'title' => ts('Tag - add to activities'), 'class' => 'CRM_Activity_Form_Task_AddToTag', 'result' => FALSE, ), 8 => array( - 'title' => ts('Untag Activities (remove tags)'), + 'title' => ts('Tag - remove from activities'), 'class' => 'CRM_Activity_Form_Task_RemoveFromTag', 'result' => FALSE, ), @@ -126,7 +126,7 @@ class CRM_Activity_Task { CRM_Core_Permission::check('access my cases and activities') ) { self::$_tasks[6] = array( - 'title' => ts('File on Case'), + 'title' => ts('File on case'), 'class' => 'CRM_Activity_Form_Task_FileOnCase', 'result' => FALSE, ); diff --git a/CRM/Case/Task.php b/CRM/Case/Task.php index 0b6205fd43..6467f40352 100644 --- a/CRM/Case/Task.php +++ b/CRM/Case/Task.php @@ -66,17 +66,17 @@ class CRM_Case_Task { if (!self::$_tasks) { self::$_tasks = array( 1 => array( - 'title' => ts('Delete Cases'), + 'title' => ts('Delete cases'), 'class' => 'CRM_Case_Form_Task_Delete', 'result' => FALSE, ), 2 => array( - 'title' => ts('Print Selected Rows'), + 'title' => ts('Print selected rows'), 'class' => 'CRM_Case_Form_Task_Print', 'result' => FALSE, ), 3 => array( - 'title' => ts('Export Cases'), + 'title' => ts('Export cases'), 'class' => array( 'CRM_Export_Form_Select', 'CRM_Export_Form_Map', @@ -84,7 +84,7 @@ class CRM_Case_Task { 'result' => FALSE, ), 4 => array( - 'title' => ts('Restore Cases'), + 'title' => ts('Restore cases'), 'class' => 'CRM_Case_Form_Task_Restore', 'result' => FALSE, ), diff --git a/CRM/Contact/Form/Task/Merge.php b/CRM/Contact/Form/Task/Merge.php index 8fe0d7bdf2..95f07b7f24 100644 --- a/CRM/Contact/Form/Task/Merge.php +++ b/CRM/Contact/Form/Task/Merge.php @@ -34,7 +34,7 @@ */ /** - * This class provides the functionality to Merge Contacts. + * This class provides the functionality to Merge contacts. * */ class CRM_Contact_Form_Task_Merge extends CRM_Contact_Form_Task { diff --git a/CRM/Contact/Form/Task/PickProfile.php b/CRM/Contact/Form/Task/PickProfile.php index 5abf596ec0..d7fa7edd6e 100644 --- a/CRM/Contact/Form/Task/PickProfile.php +++ b/CRM/Contact/Form/Task/PickProfile.php @@ -75,7 +75,7 @@ class CRM_Contact_Form_Task_PickProfile extends CRM_Contact_Form_Task { $validate = FALSE; //validations if (count($this->_contactIds) > $this->_maxContacts) { - CRM_Core_Session::setStatus(ts("The maximum number of contacts you can select for Batch Update is %1. You have selected %2. Please select fewer contacts from your search results and try again.", array( + CRM_Core_Session::setStatus(ts("The maximum number of contacts you can select for Batch update is %1. You have selected %2. Please select fewer contacts from your search results and try again.", array( 1 => $this->_maxContacts, 2 => count($this->_contactIds), )), ts('Maximum Exceeded'), 'error'); @@ -113,7 +113,7 @@ class CRM_Contact_Form_Task_PickProfile extends CRM_Contact_Form_Task { if (empty($profiles)) { $types = implode(' ' . ts('or') . ' ', $this->_contactTypes); - CRM_Core_Session::setStatus(ts("The contact type selected for Batch Update does not have a corresponding profile. Please set up a profile for %1s and try again.", array(1 => $types)), ts('No Profile Available'), 'error'); + CRM_Core_Session::setStatus(ts("The contact type selected for Batch update does not have a corresponding profile. Please set up a profile for %1s and try again.", array(1 => $types)), ts('No Profile Available'), 'error'); CRM_Utils_System::redirect($this->_userContext); } $ufGroupElement = $this->add('select', 'uf_group_id', ts('Select Profile'), array('' => ts('- select profile -')) + $profiles, TRUE, array('class' => 'crm-select2 huge')); diff --git a/CRM/Contact/Task.php b/CRM/Contact/Task.php index 0dbfa265e5..7ea1034386 100644 --- a/CRM/Contact/Task.php +++ b/CRM/Contact/Task.php @@ -84,23 +84,23 @@ class CRM_Contact_Task { if (!self::$_tasks) { self::$_tasks = array( self::GROUP_CONTACTS => array( - 'title' => ts('Add Contacts to Group'), + 'title' => ts('Group - add contacts'), 'class' => 'CRM_Contact_Form_Task_AddToGroup', ), self::REMOVE_CONTACTS => array( - 'title' => ts('Remove Contacts from Group'), + 'title' => ts('Group - remove contacts'), 'class' => 'CRM_Contact_Form_Task_RemoveFromGroup', ), self::TAG_CONTACTS => array( - 'title' => ts('Tag Contacts (assign tags)'), + 'title' => ts('Tag - addto contacts'), 'class' => 'CRM_Contact_Form_Task_AddToTag', ), self::REMOVE_TAGS => array( - 'title' => ts('Untag Contacts (remove tags)'), + 'title' => ts('Tag - remove from contacts'), 'class' => 'CRM_Contact_Form_Task_RemoveFromTag', ), self::EXPORT_CONTACTS => array( - 'title' => ts('Export Contacts'), + 'title' => ts('Export contacts'), 'class' => array( 'CRM_Export_Form_Select', 'CRM_Export_Form_Map', @@ -108,41 +108,41 @@ class CRM_Contact_Task { 'result' => FALSE, ), self::EMAIL_CONTACTS => array( - 'title' => ts('Send Email to Contacts'), + 'title' => ts('Email - send now (to 50 or less)'), 'class' => 'CRM_Contact_Form_Task_Email', 'result' => TRUE, ), self::DELETE_CONTACTS => array( - 'title' => ts('Delete Contacts'), + 'title' => ts('Delete contacts'), 'class' => 'CRM_Contact_Form_Task_Delete', 'result' => FALSE, ), self::RECORD_CONTACTS => array( - 'title' => ts('Record Activity for Contacts'), + 'title' => ts('Add activity'), 'class' => 'CRM_Activity_Form_Activity', ), self::SAVE_SEARCH => array( - 'title' => ts('New Smart Group'), + 'title' => ts('Smart group - create'), 'class' => 'CRM_Contact_Form_Task_SaveSearch', 'result' => TRUE, ), self::SAVE_SEARCH_UPDATE => array( - 'title' => ts('Update Smart Group'), + 'title' => ts('Smart group - update'), 'class' => 'CRM_Contact_Form_Task_SaveSearch_Update', 'result' => TRUE, ), self::PRINT_CONTACTS => array( - 'title' => ts('Print Selected Rows'), + 'title' => ts('Print selected rows'), 'class' => 'CRM_Contact_Form_Task_Print', 'result' => FALSE, ), self::LABEL_CONTACTS => array( - 'title' => ts('Mailing Labels'), + 'title' => ts('Mailing labels - print'), 'class' => 'CRM_Contact_Form_Task_Label', 'result' => TRUE, ), self::BATCH_UPDATE => array( - 'title' => ts('Batch Update via Profile'), + 'title' => ts('Batch update contacts via profile'), 'class' => array( 'CRM_Contact_Form_Task_PickProfile', 'CRM_Contact_Form_Task_Batch', @@ -150,25 +150,25 @@ class CRM_Contact_Task { 'result' => TRUE, ), self::PRINT_FOR_CONTACTS => array( - 'title' => ts('Print PDF Letter for Contacts'), + 'title' => ts('PDF letters - print'), 'class' => 'CRM_Contact_Form_Task_PDF', 'result' => TRUE, ), self::EMAIL_UNHOLD => array( - 'title' => ts('Unhold Emails'), + 'title' => ts('Emails - unhold addresses'), 'class' => 'CRM_Contact_Form_Task_Unhold', ), self::COMMUNICATION_PREFS => array( - 'title' => ts('Alter Contact Communication Preferences'), + 'title' => ts('Communication preferences - alter'), 'class' => 'CRM_Contact_Form_Task_AlterPreferences', ), self::RESTORE => array( - 'title' => ts('Restore Contacts'), + 'title' => ts('Restore contacts from trash'), 'class' => 'CRM_Contact_Form_Task_Delete', 'result' => FALSE, ), self::DELETE_PERMANENTLY => array( - 'title' => ts('Delete Permanently'), + 'title' => ts('Delete permanently'), 'class' => 'CRM_Contact_Form_Task_Delete', 'result' => FALSE, ), @@ -178,7 +178,7 @@ class CRM_Contact_Task { $providersCount = CRM_SMS_BAO_Provider::activeProviderCount(); if ($providersCount) { self::$_tasks[self::SMS_CONTACTS] = array( - 'title' => ts('Send SMS to Contacts'), + 'title' => ts('SMS - schedule/send'), 'class' => 'CRM_Contact_Form_Task_SMS', 'result' => TRUE, ); @@ -187,7 +187,7 @@ class CRM_Contact_Task { if (CRM_Contact_BAO_ContactType::isActive('Household')) { $label = CRM_Contact_BAO_ContactType::getLabel('Household'); self::$_tasks[self::HOUSEHOLD_CONTACTS] = array( - 'title' => ts('Add Contacts to %1', + 'title' => ts('Add relationship to %1', array(1 => $label) ), 'class' => 'CRM_Contact_Form_Task_AddToHousehold', @@ -197,7 +197,7 @@ class CRM_Contact_Task { if (CRM_Contact_BAO_ContactType::isActive('Organization')) { $label = CRM_Contact_BAO_ContactType::getLabel('Organization'); self::$_tasks[self::ORGANIZATION_CONTACTS] = array( - 'title' => ts('Add Contacts to %1', + 'title' => ts('Add relationship to %1', array(1 => $label) ), 'class' => 'CRM_Contact_Form_Task_AddToOrganization', @@ -206,7 +206,7 @@ class CRM_Contact_Task { if (CRM_Core_Permission::check('merge duplicate contacts')) { self::$_tasks[self::MERGE_CONTACTS] = array( - 'title' => ts('Merge Contacts'), + 'title' => ts('Merge contacts'), 'class' => 'CRM_Contact_Form_Task_Merge', 'result' => TRUE, ); @@ -229,7 +229,7 @@ class CRM_Contact_Task { ) ) { self::$_tasks[self::MAP_CONTACTS] = array( - 'title' => ts('Map Contacts'), + 'title' => ts('Map contacts'), 'class' => 'CRM_Contact_Form_Task_Map', 'result' => FALSE, ); @@ -237,7 +237,7 @@ class CRM_Contact_Task { if (CRM_Core_Permission::access('CiviEvent')) { self::$_tasks[self::ADD_EVENT] = array( - 'title' => ts('Add Contacts to Event'), + 'title' => ts('Register participants for event'), 'class' => 'CRM_Event_Form_Participant', ); } @@ -245,7 +245,7 @@ class CRM_Contact_Task { if (defined('CIVICRM_CIVIMAIL_UI_LEGACY')) { if (CRM_Core_Permission::access('CiviMail')) { self::$_tasks[self::CREATE_MAILING] = array( - 'title' => ts('Schedule/Send a Mass Mailing'), + 'title' => ts('Email - schedule/send via CiviMail'), 'class' => array( 'CRM_Mailing_Form_Group', 'CRM_Mailing_Form_Settings', @@ -276,7 +276,7 @@ class CRM_Contact_Task { || (CRM_Mailing_Info::workflowEnabled() && CRM_Core_Permission::check('create mailings')) ) { self::$_tasks[self::CREATE_MAILING] = array( - 'title' => ts('Schedule/Send a Mass Mailing'), + 'title' => ts('Email - schedule/send via CiviMail'), 'class' => 'CRM_Mailing_Form_Task_AdhocMailing', 'result' => FALSE, ); diff --git a/CRM/Contribute/Form/Task/PickProfile.php b/CRM/Contribute/Form/Task/PickProfile.php index acbaea1ea7..3b17637ae3 100644 --- a/CRM/Contribute/Form/Task/PickProfile.php +++ b/CRM/Contribute/Form/Task/PickProfile.php @@ -69,7 +69,7 @@ class CRM_Contribute_Form_Task_PickProfile extends CRM_Contribute_Form_Task { $validate = FALSE; //validations if (count($this->_contributionIds) > $this->_maxContributions) { - CRM_Core_Session::setStatus(ts("The maximum number of contributions you can select for Batch Update is %1. You have selected %2. Please select fewer contributions from your search results and try again.", array( + CRM_Core_Session::setStatus(ts("The maximum number of contributions you can select for Batch update is %1. You have selected %2. Please select fewer contributions from your search results and try again.", array( 1 => $this->_maxContributions, 2 => count($this->_contributionIds), )), ts('Batch Update Error'), 'error'); @@ -94,7 +94,7 @@ class CRM_Contribute_Form_Task_PickProfile extends CRM_Contribute_Form_Task { $profiles = CRM_Core_BAO_UFGroup::getProfiles($types, TRUE); if (empty($profiles)) { - CRM_Core_Session::setStatus(ts("You will need to create a Profile containing the %1 fields you want to edit before you can use Batch Update via Profile. Navigate to Administer CiviCRM > Customize Data and Screens > CiviCRM Profile to configure a Profile. Consult the online Administrator documentation for more information.", array(1 => $types[0])), ts('Profile Required'), 'error'); + CRM_Core_Session::setStatus(ts("You will need to create a Profile containing the %1 fields you want to edit before you can use Batch update contributions via profile. Navigate to Administer CiviCRM > Customize Data and Screens > CiviCRM Profile to configure a Profile. Consult the online Administrator documentation for more information.", array(1 => $types[0])), ts('Profile Required'), 'error'); CRM_Utils_System::redirect($this->_userContext); } diff --git a/CRM/Contribute/Task.php b/CRM/Contribute/Task.php index c7f9b8256f..632acd4bc1 100644 --- a/CRM/Contribute/Task.php +++ b/CRM/Contribute/Task.php @@ -66,17 +66,17 @@ class CRM_Contribute_Task { if (!(self::$_tasks)) { self::$_tasks = array( 1 => array( - 'title' => ts('Delete Contributions'), + 'title' => ts('Delete contributions'), 'class' => 'CRM_Contribute_Form_Task_Delete', 'result' => FALSE, ), 2 => array( - 'title' => ts('Print Selected Rows'), + 'title' => ts('Print selected rows'), 'class' => 'CRM_Contribute_Form_Task_Print', 'result' => FALSE, ), 3 => array( - 'title' => ts('Export Contributions'), + 'title' => ts('Export contributions'), 'class' => array( 'CRM_Export_Form_Select', 'CRM_Export_Form_Map', @@ -84,7 +84,7 @@ class CRM_Contribute_Task { 'result' => FALSE, ), 4 => array( - 'title' => ts('Batch Update Contributions Via Profile'), + 'title' => ts('Batch update contributions via profile'), 'class' => array( 'CRM_Contribute_Form_Task_PickProfile', 'CRM_Contribute_Form_Task_Batch', @@ -92,12 +92,12 @@ class CRM_Contribute_Task { 'result' => TRUE, ), 5 => array( - 'title' => ts('Send Email to Contacts'), + 'title' => ts('Email - send now'), 'class' => 'CRM_Contribute_Form_Task_Email', 'result' => TRUE, ), 6 => array( - 'title' => ts('Update Pending Contribution Status'), + 'title' => ts('Update pending contribution status'), 'class' => 'CRM_Contribute_Form_Task_Status', 'result' => TRUE, ), diff --git a/CRM/Event/Task.php b/CRM/Event/Task.php index d354fb89ed..31452f49e0 100644 --- a/CRM/Event/Task.php +++ b/CRM/Event/Task.php @@ -70,17 +70,17 @@ class CRM_Event_Task { if (!(self::$_tasks)) { self::$_tasks = array( 1 => array( - 'title' => ts('Delete Participants'), + 'title' => ts('Delete participants from event'), 'class' => 'CRM_Event_Form_Task_Delete', 'result' => FALSE, ), 2 => array( - 'title' => ts('Print Selected Rows'), + 'title' => ts('Print selected rows'), 'class' => 'CRM_Event_Form_Task_Print', 'result' => FALSE, ), 3 => array( - 'title' => ts('Export Participants'), + 'title' => ts('Export participants'), 'class' => array( 'CRM_Export_Form_Select', 'CRM_Export_Form_Map', @@ -88,7 +88,7 @@ class CRM_Event_Task { 'result' => FALSE, ), 4 => array( - 'title' => ts('Batch Update Participants Via Profile'), + 'title' => ts('Batch update participants via profile'), 'class' => array( 'CRM_Event_Form_Task_PickProfile', 'CRM_Event_Form_Task_Batch', @@ -96,22 +96,22 @@ class CRM_Event_Task { 'result' => TRUE, ), 5 => array( - 'title' => ts('Cancel Registration'), + 'title' => ts('Cancel registration'), 'class' => 'CRM_Event_Form_Task_Cancel', 'result' => FALSE, ), 6 => array( - 'title' => ts('Send Email to Contacts'), + 'title' => ts('Email - send now (to 50 or less)'), 'class' => 'CRM_Event_Form_Task_Email', 'result' => TRUE, ), 13 => array( - 'title' => ts('New Smart Group'), + 'title' => ts('Smart group - create'), 'class' => 'CRM_Event_Form_Task_SaveSearch', 'result' => TRUE, ), 14 => array( - 'title' => ts('Update Smart Group'), + 'title' => ts('Smart group - update'), 'class' => 'CRM_Event_Form_Task_SaveSearch_Update', 'result' => TRUE, ), @@ -121,17 +121,17 @@ class CRM_Event_Task { 'result' => TRUE, ), 16 => array( - 'title' => ts('Print Event Name Badges'), + 'title' => ts('Event name badges - print'), 'class' => 'CRM_Event_Form_Task_Badge', 'result' => FALSE, ), 17 => array( - 'title' => ts('Print PDF Letter for Participants'), + 'title' => ts('PDF letter - print for participants'), 'class' => 'CRM_Event_Form_Task_PDF', 'result' => TRUE, ), 20 => array( - 'title' => ts('Add Contacts to Group'), + 'title' => ts('Group - add contacts'), 'class' => 'CRM_Event_Form_Task_AddToGroup', 'result' => FALSE, ), diff --git a/CRM/Grant/Task.php b/CRM/Grant/Task.php index c08bc27714..d6c40530fb 100644 --- a/CRM/Grant/Task.php +++ b/CRM/Grant/Task.php @@ -66,17 +66,17 @@ class CRM_Grant_Task { if (!(self::$_tasks)) { self::$_tasks = array( 1 => array( - 'title' => ts('Delete Grants'), + 'title' => ts('Delete grants'), 'class' => 'CRM_Grant_Form_Task_Delete', 'result' => FALSE, ), 2 => array( - 'title' => ts('Print Selected Rows'), + 'title' => ts('Print selected rows'), 'class' => 'CRM_Grant_Form_Task_Print', 'result' => FALSE, ), 3 => array( - 'title' => ts('Export Grants'), + 'title' => ts('Export grants'), 'class' => array( 'CRM_Export_Form_Select', 'CRM_Export_Form_Map', @@ -84,7 +84,7 @@ class CRM_Grant_Task { 'result' => FALSE, ), 4 => array( - 'title' => ts('Update Grants'), + 'title' => ts('Update grants'), 'class' => 'CRM_Grant_Form_Task_Update', 'result' => FALSE, ), diff --git a/CRM/Member/Form/Task/PickProfile.php b/CRM/Member/Form/Task/PickProfile.php index f4eb24eea8..2accdf7780 100644 --- a/CRM/Member/Form/Task/PickProfile.php +++ b/CRM/Member/Form/Task/PickProfile.php @@ -71,7 +71,7 @@ class CRM_Member_Form_Task_PickProfile extends CRM_Member_Form_Task { $validate = FALSE; //validations if (count($this->_memberIds) > $this->_maxMembers) { - CRM_Core_Session::setStatus(ts("The maximum number of members you can select for Batch Update is %1. You have selected %2. Please select fewer members from your search results and try again.", array( + CRM_Core_Session::setStatus(ts("The maximum number of members you can select for Batch update is %1. You have selected %2. Please select fewer members from your search results and try again.", array( 1 => $this->_maxMembers, 2 => count($this->_memberIds), )), ts('Batch Update Error'), 'error'); @@ -95,7 +95,7 @@ class CRM_Member_Form_Task_PickProfile extends CRM_Member_Form_Task { $profiles = CRM_Core_BAO_UFGroup::getProfiles($types, TRUE); if (empty($profiles)) { - CRM_Core_Session::setStatus(ts("You will need to create a Profile containing the %1 fields you want to edit before you can use Batch Update via Profile. Navigate to Administer CiviCRM >> CiviCRM Profile to configure a Profile. Consult the online Administrator documentation for more information.", array(1 => $types[0])), ts('Batch Update Error'), 'error'); + CRM_Core_Session::setStatus(ts("You will need to create a Profile containing the %1 fields you want to edit before you can use Batch update memberships via profile. Navigate to Administer CiviCRM >> CiviCRM Profile to configure a Profile. Consult the online Administrator documentation for more information.", array(1 => $types[0])), ts('Batch Update Error'), 'error'); CRM_Utils_System::redirect($this->_userContext); } diff --git a/CRM/Member/Task.php b/CRM/Member/Task.php index 19bc954e98..8b829c1dba 100644 --- a/CRM/Member/Task.php +++ b/CRM/Member/Task.php @@ -67,17 +67,17 @@ class CRM_Member_Task { if (!(self::$_tasks)) { self::$_tasks = array( 1 => array( - 'title' => ts('Delete Memberships'), + 'title' => ts('Delete memberships'), 'class' => 'CRM_Member_Form_Task_Delete', 'result' => FALSE, ), 2 => array( - 'title' => ts('Print Selected Rows'), + 'title' => ts('Print selected rows'), 'class' => 'CRM_Member_Form_Task_Print', 'result' => FALSE, ), 3 => array( - 'title' => ts('Export Members'), + 'title' => ts('Export members'), 'class' => array( 'CRM_Export_Form_Select', 'CRM_Export_Form_Map', @@ -85,12 +85,12 @@ class CRM_Member_Task { 'result' => FALSE, ), 4 => array( - 'title' => ts('Send Email to Contacts'), + 'title' => ts('Email send now'), 'class' => 'CRM_Member_Form_Task_Email', 'result' => TRUE, ), 5 => array( - 'title' => ts('Batch Update Members Via Profile'), + 'title' => ts('Batch update memberships via profile'), 'class' => array( 'CRM_Member_Form_Task_PickProfile', 'CRM_Member_Form_Task_Batch', @@ -98,14 +98,14 @@ class CRM_Member_Task { 'result' => TRUE, ), 6 => array( - 'title' => ts('Mailing Labels'), + 'title' => ts('Mailing labels - print'), 'class' => array( 'CRM_Member_Form_Task_Label', ), 'result' => TRUE, ), 7 => array( - 'title' => ts('Print PDF Letters for Memberships'), + 'title' => ts('PDF letters - print for memberships'), 'class' => 'CRM_Member_Form_Task_PDFLetter', 'result' => FALSE, ), diff --git a/CRM/Pledge/Task.php b/CRM/Pledge/Task.php index 4d16621689..c5ca12142f 100644 --- a/CRM/Pledge/Task.php +++ b/CRM/Pledge/Task.php @@ -66,17 +66,17 @@ class CRM_Pledge_Task { if (!self::$_tasks) { self::$_tasks = array( 1 => array( - 'title' => ts('Delete Pledges'), + 'title' => ts('Delete pledges'), 'class' => 'CRM_Pledge_Form_Task_Delete', 'result' => FALSE, ), 2 => array( - 'title' => ts('Print Selected Rows'), + 'title' => ts('Print selected rows'), 'class' => 'CRM_Pledge_Form_Task_Print', 'result' => FALSE, ), 3 => array( - 'title' => ts('Export Pledges'), + 'title' => ts('Export pledges'), 'class' => array( 'CRM_Export_Form_Select', 'CRM_Export_Form_Map', diff --git a/CRM/Utils/Hook.php b/CRM/Utils/Hook.php index 9f001877a2..6761896428 100644 --- a/CRM/Utils/Hook.php +++ b/CRM/Utils/Hook.php @@ -783,7 +783,7 @@ abstract class CRM_Utils_Hook { * @param array $tasks * The current set of tasks for that custom field. * You can add/remove existing tasks. - * Each task needs to have a title (eg 'title' => ts( 'Add Contacts to Group')) and a class + * Each task needs to have a title (eg 'title' => ts( 'Group - add contacts')) and a class * (eg 'class' => 'CRM_Contact_Form_Task_AddToGroup'). * Optional result (boolean) may also be provided. Class can be an array of classes (not sure what that does :( ). * The key for new Task(s) should not conflict with the keys for core tasks of that $objectType, which can be diff --git a/templates/CRM/Admin/Form/Setting/Mail.tpl b/templates/CRM/Admin/Form/Setting/Mail.tpl index ed15529fbb..ac665e5d5c 100644 --- a/templates/CRM/Admin/Form/Setting/Mail.tpl +++ b/templates/CRM/Admin/Form/Setting/Mail.tpl @@ -26,7 +26,7 @@ {capture assign=docLink}{docURL page="CiviMail Mailer Settings" text="CiviMail Mailer Settings and Optimization" resource="wiki"}{/capture}
- {ts 1=$docLink}These settings are used to configure mailer properties for the optional CiviMail component and may allow you to significantly optimize performance. Please read the %1 documentation, and make sure you understand it before modifying default values. (These settings are NOT used for the built-in 'Send Email to Contacts' feature).{/ts} + {ts 1=$docLink}These settings are used to configure mailer properties for the optional CiviMail component and may allow you to significantly optimize performance. Please read the %1 documentation, and make sure you understand it before modifying default values. (These settings are NOT used for the built-in 'Email - send now' feature).{/ts}
{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/templates/CRM/Contact/Form/Domain.tpl b/templates/CRM/Contact/Form/Domain.tpl index 1453abcbcb..59bb3dadce 100644 --- a/templates/CRM/Contact/Form/Domain.tpl +++ b/templates/CRM/Contact/Form/Domain.tpl @@ -60,7 +60,7 @@

{ts}Default Organization Address{/ts}

-
{ts 1={domain.address}}CiviMail mailings must include the sending organization's address. This is done by putting the %1 token in either the body or footer of the mailing. This token may also be used in regular 'Send Email to Contacts' messages and in other Message Templates. The token is replaced by the address entered below when the message is sent.{/ts}
+
{ts 1={domain.address}}CiviMail mailings must include the sending organization's address. This is done by putting the %1 token in either the body or footer of the mailing. This token may also be used in regular 'Email - send now' messages and in other Message Templates. The token is replaced by the address entered below when the message is sent.{/ts}
{include file="CRM/Contact/Form/Edit/Address.tpl"}

{ts}Organization Contact Information{/ts}

{ts}You can also include general email and/or phone contact information in mailings.{/ts} {help id="additional-contact"}
diff --git a/tests/phpunit/WebTest/ACL/AssignUsersToRolesTest.php b/tests/phpunit/WebTest/ACL/AssignUsersToRolesTest.php index 1be778fff3..e7d5546d98 100755 --- a/tests/phpunit/WebTest/ACL/AssignUsersToRolesTest.php +++ b/tests/phpunit/WebTest/ACL/AssignUsersToRolesTest.php @@ -140,7 +140,7 @@ class WebTest_ACL_AssignUsersToRolesTest extends CiviSeleniumTestCase { $this->waitForElementPresent("task"); $this->click('radio_ts', 'ts_all'); $this->click('task'); - $this->select('task', 'label=New Smart Group'); + $this->select('task', 'label=Smart group - create'); $this->waitForPageToLoad($this->getTimeoutMsec()); $smartGroupTitle = "SmartGroup" . substr(sha1(rand()), 0, 4); $this->type("title", $smartGroupTitle); diff --git a/tests/phpunit/WebTest/Contact/AddContactsToEventAdvancedSearchTest.php b/tests/phpunit/WebTest/Contact/AddContactsToEventAdvancedSearchTest.php index 2176034f6a..5f32908a03 100644 --- a/tests/phpunit/WebTest/Contact/AddContactsToEventAdvancedSearchTest.php +++ b/tests/phpunit/WebTest/Contact/AddContactsToEventAdvancedSearchTest.php @@ -46,7 +46,7 @@ class WebTest_Contact_AddContactsToEventAdvancedSearchTest extends CiviSeleniumT $this->waitForElementPresent("xpath=//div[@id='search-status']/table/tbody/tr[2]/td[2]/input[1]"); $this->click("xpath=//div[@id='search-status']/table/tbody/tr[2]/td[2]/input[1]"); - $this->select('task', "label=Add Contacts to Event"); + $this->select('task', "label=Register participants for event"); // Select event. Based on label for now. $this->waitForElementPresent('event_id'); diff --git a/tests/phpunit/WebTest/Contact/AdvancedSearchedRelatedContactTest.php b/tests/phpunit/WebTest/Contact/AdvancedSearchedRelatedContactTest.php index 22f2dc3a56..12d510aeb7 100644 --- a/tests/phpunit/WebTest/Contact/AdvancedSearchedRelatedContactTest.php +++ b/tests/phpunit/WebTest/Contact/AdvancedSearchedRelatedContactTest.php @@ -125,7 +125,7 @@ class WebTest_Contact_AdvancedSearchedRelatedContactTest extends CiviSeleniumTes $this->waitForElementPresent('search-status'); $this->assertElementContainsText('search-status', '2 Contact'); - $this->select("task", "label=Add Contacts to Group"); + $this->select("task", "label=Group - add contacts"); $this->waitForPageToLoad($this->getTimeoutMsec()); diff --git a/tests/phpunit/WebTest/Contact/DeceasedContactsAdvancedSearchTest.php b/tests/phpunit/WebTest/Contact/DeceasedContactsAdvancedSearchTest.php index 51eab6f27f..0ba595ac59 100644 --- a/tests/phpunit/WebTest/Contact/DeceasedContactsAdvancedSearchTest.php +++ b/tests/phpunit/WebTest/Contact/DeceasedContactsAdvancedSearchTest.php @@ -70,7 +70,7 @@ class WebTest_Contact_DeceasedContactsAdvancedSearchTest extends CiviSeleniumTes $this->click("toggleSelect"); $this->waitForTextPresent('2 Selected records only'); - $this->select('task', 'label=Remove Contacts from Group'); + $this->select('task', 'label=Group - remove contacts'); $this->waitForPageToLoad($this->getTimeoutMsec()); $this->waitForElementPresent('_qf_RemoveFromGroup_back-bottom'); $this->assertElementContainsText('crm-container', 'Number of selected contacts: 2'); diff --git a/tests/phpunit/WebTest/Contact/SearchTest.php b/tests/phpunit/WebTest/Contact/SearchTest.php index cbccecefdb..c6f02723c9 100644 --- a/tests/phpunit/WebTest/Contact/SearchTest.php +++ b/tests/phpunit/WebTest/Contact/SearchTest.php @@ -250,7 +250,7 @@ class WebTest_Contact_SearchTest extends CiviSeleniumTestCase { // Select the task action to export $this->click("task"); - $this->select("task", "label=Export Contacts"); + $this->select("task", "label=Export contacts"); $this->waitForPageToLoad($this->getTimeoutMsec()); $this->click("_qf_Select_next-bottom"); diff --git a/tests/phpunit/WebTest/Contact/TaskActionAddToGroupTest.php b/tests/phpunit/WebTest/Contact/TaskActionAddToGroupTest.php index 657199e875..1a10884311 100644 --- a/tests/phpunit/WebTest/Contact/TaskActionAddToGroupTest.php +++ b/tests/phpunit/WebTest/Contact/TaskActionAddToGroupTest.php @@ -73,7 +73,7 @@ class WebTest_Contact_TaskActionAddToGroupTest extends CiviSeleniumTestCase { // Click "check all" box and act on "Add to group" action $this->click('toggleSelect'); $this->waitForText("xpath=//input[@value='ts_sel']/following-sibling::label/span", '2'); - $this->select("task", "label=Add Contacts to Group"); + $this->select("task", "label=Group - add contacts"); $this->waitForPageToLoad($this->getTimeoutMsec()); // Select the new group and click to add @@ -120,7 +120,7 @@ class WebTest_Contact_TaskActionAddToGroupTest extends CiviSeleniumTestCase { $this->waitForText("xpath=//div[@class='crm-content-block']/div/div[2]/div/span[2]/a", "Next >"); $this->click("toggleSelect"); $this->waitForText("xpath=//input[@value='ts_sel']/following-sibling::label/span", '50'); - $this->select("task", "label=Add Contacts to Group"); + $this->select("task", "label=Group - add contacts"); $this->waitForPageToLoad($this->getTimeoutMsec()); // Select the new group and click to add diff --git a/tests/phpunit/WebTest/Contact/TaskActionSendMassMailing.php b/tests/phpunit/WebTest/Contact/TaskActionSendMassMailing.php index ff3014acf7..fe6c99a578 100644 --- a/tests/phpunit/WebTest/Contact/TaskActionSendMassMailing.php +++ b/tests/phpunit/WebTest/Contact/TaskActionSendMassMailing.php @@ -52,7 +52,7 @@ class WebTest_Contact_TaskActionSendMassMailing extends CiviSeleniumTestCase { // Click "check all" box and act on "Add to group" action $this->click("//form[@id='Advanced']/div[3]/div/div[2]/table/thead/tr/th[1]/input"); $this->waitForText('search-status', "50 Selected records only"); - $this->select("task", "label=Schedule/Send a Mass Mailing"); + $this->select("task", "label=Email - schedule/send via CiviMail"); $this->clickLink("Go"); //-------select recipients---------- diff --git a/tests/phpunit/WebTest/Contact/TaskActionSendSMS.php b/tests/phpunit/WebTest/Contact/TaskActionSendSMS.php index b6cb08964c..0eca3d98ab 100644 --- a/tests/phpunit/WebTest/Contact/TaskActionSendSMS.php +++ b/tests/phpunit/WebTest/Contact/TaskActionSendSMS.php @@ -108,7 +108,7 @@ class WebTest_Contact_TaskActionSendSMS extends CiviSeleniumTestCase { $this->click('CIVICRM_QFID_ts_all_12'); // Perform a task action - $this->select("task", "label=Send SMS to Contacts"); + $this->select("task", "label=SMS - schedule/send"); $this->clickLink("Go", 'activity_subject'); $this->type('activity_subject', "Send SMS to Contacts of {$smsGroupName}"); $this->type('text_message', "Test SMS to Contacts of {$smsGroupName}"); diff --git a/tests/phpunit/WebTest/Export/ContactTest.php b/tests/phpunit/WebTest/Export/ContactTest.php index 87a783461f..a941f5435c 100644 --- a/tests/phpunit/WebTest/Export/ContactTest.php +++ b/tests/phpunit/WebTest/Export/ContactTest.php @@ -100,7 +100,7 @@ class WebTest_Export_ContactTest extends ExportCiviSeleniumTestCase { // Select the task action to export. $this->click("task"); - $this->select("task", "label=Export Contacts"); + $this->select("task", "label=Export contacts"); $this->waitForPageToLoad($this->getTimeoutMsec()); $csvFile = $this->downloadCSV("_qf_Select_next-bottom"); @@ -212,12 +212,12 @@ class WebTest_Export_ContactTest extends ExportCiviSeleniumTestCase { // Is contact present in search result? $this->assertElementContainsText('css=div.crm-search-results', $childSortName, "Contact did not found in search result!"); - // select to export all the contasct from search result. + // select to export all the contacts from search result. $this->click("CIVICRM_QFID_ts_all_4"); // Select the task action to export. $this->click("task"); - $this->select("task", "label=Export Contacts"); + $this->select("task", "label=Export contacts"); $this->waitForPageToLoad($this->getTimeoutMsec()); $csvFile = $this->downloadCSV("_qf_Select_next-bottom"); @@ -370,7 +370,7 @@ class WebTest_Export_ContactTest extends ExportCiviSeleniumTestCase { // Select the task action to export. $this->click("task"); - $this->select("task", "label=Export Contacts"); + $this->select("task", "label=Export contacts"); $this->waitForPageToLoad($this->getTimeoutMsec()); $this->click("CIVICRM_QFID_2_10"); diff --git a/tests/phpunit/WebTest/Profile/BatchUpdateTest.php b/tests/phpunit/WebTest/Profile/BatchUpdateTest.php index 64144a7524..948469637a 100644 --- a/tests/phpunit/WebTest/Profile/BatchUpdateTest.php +++ b/tests/phpunit/WebTest/Profile/BatchUpdateTest.php @@ -74,7 +74,7 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase { $this->waitForElementPresent('CIVICRM_QFID_ts_all_4'); $this->click('CIVICRM_QFID_ts_all_4'); - $this->select('task', "label=Batch Update via Profile"); + $this->select('task', "label=Batch update contacts via profile"); $this->waitForElementPresent('_qf_PickProfile_next'); $this->waitForElementPresent('uf_group_id'); $this->select('uf_group_id', "label={$profileTitle}"); @@ -156,7 +156,7 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase { $this->waitForElementPresent('CIVICRM_QFID_ts_all_4'); $this->click('CIVICRM_QFID_ts_all_4'); - $this->select('task', "label=Batch Update via Profile"); + $this->select('task', "label=Batch update contacts via profile"); $this->waitForElementPresent('_qf_PickProfile_next'); $this->select('uf_group_id', "label={$profileTitle}"); @@ -335,7 +335,7 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase { $this->waitForElementPresent('CIVICRM_QFID_ts_all_4'); $this->click('CIVICRM_QFID_ts_all_4'); - $this->select('task', "label=Batch Update via Profile"); + $this->select('task', "label=Batch update contacts via profile"); $this->waitForElementPresent('_qf_PickProfile_next'); $this->select('uf_group_id', "label={$profileTitle}"); -- 2.25.1