From a08aa8e83e19176544395d56b69571e3cc48df06 Mon Sep 17 00:00:00 2001 From: Dave Greenberg Date: Mon, 22 Jul 2013 13:35:03 -0700 Subject: [PATCH] CRM-13062 Fix various typos and obsolete admin menu paths. ---------------------------------------- * CRM-13062: Wrong texts in UI http://issues.civicrm.org/jira/browse/CRM-13062 --- CRM/Activity/Form/Task/PickProfile.php | 2 +- CRM/Utils/Address/BatchUpdate.php | 4 ++-- templates/CRM/Contact/Form/Task/SMS.hlp | 2 +- xml/templates/civicrm_data.tpl | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CRM/Activity/Form/Task/PickProfile.php b/CRM/Activity/Form/Task/PickProfile.php index 4cbfe731d4..0c19b1fb1a 100755 --- a/CRM/Activity/Form/Task/PickProfile.php +++ b/CRM/Activity/Form/Task/PickProfile.php @@ -120,7 +120,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 CiviCRM >> CiviCRM Profile 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 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/Utils/Address/BatchUpdate.php b/CRM/Utils/Address/BatchUpdate.php index 19f6404956..1888ac71ca 100644 --- a/CRM/Utils/Address/BatchUpdate.php +++ b/CRM/Utils/Address/BatchUpdate.php @@ -60,7 +60,7 @@ class CRM_Utils_Address_BatchUpdate { $processGeocode = FALSE; if (empty($config->geocodeMethod)) { if ($this->geocoding == 'true') { - $this->returnMessages[] = ts('Error: You need to set a mapping provider under Global Settings'); + $this->returnMessages[] = ts('Error: You need to set a mapping provider under Administer > System Settings > Mapping and Geocoding'); $this->returnError = 1; $this->returnResult(); } @@ -84,7 +84,7 @@ class CRM_Utils_Address_BatchUpdate { $parseStreetAddress = FALSE; if (!$parseAddress) { if ($this->parse == 'true') { - $this->returnMessages[] = ts('Error: You need to enable Street Address Parsing under Global Settings >> Address Settings.'); + $this->returnMessages[] = ts('Error: You need to enable Street Address Parsing under Administer > Localization > Address Settings.'); $this->returnError = 1; return $this->returnResult(); } diff --git a/templates/CRM/Contact/Form/Task/SMS.hlp b/templates/CRM/Contact/Form/Task/SMS.hlp index 7d5fc5447e..c22e31aeda 100644 --- a/templates/CRM/Contact/Form/Task/SMS.hlp +++ b/templates/CRM/Contact/Form/Task/SMS.hlp @@ -27,7 +27,7 @@ {ts}Provider{/ts} {/htxt} {htxt id="id-provider"} -

{ts}By default,CiviCRM uses the provider which are set active and the default provider is selected. User with administer CiviCRM permission can add a new Provider{/ts}

+

{ts}By default, CiviCRM uses the provider which are set active and the default provider is selected. User with administer CiviCRM permission can add a new Provider{/ts}

{if $params.isAdmin} {capture assign="fromConfig"}{crmURL p="civicrm/admin/sms/provider" q="reset=1"}{/capture}

{ts 1=$fromConfig}Go to Administer CiviCRM » System Settings » SMS Providers to add or edit the provider. Make sure these Providers are valid.{/ts}

diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl index ac8821bb8c..86caa5ba5a 100644 --- a/xml/templates/civicrm_data.tpl +++ b/xml/templates/civicrm_data.tpl @@ -572,7 +572,7 @@ VALUES (@option_group_id_report , '{ts escape="sql"}Pledged But not Paid Report{/ts}', 'pledge/pbnp', 'CRM_Report_Form_Pledge_Pbnp', NULL, 0, NULL, 22, '{ts escape="sql"}Pledged but not Paid Report{/ts}', 0, 0, 1, @pledgeCompId, NULL), (@option_group_id_report , '{ts escape="sql"}Relationship Report{/ts}', 'contact/relationship', 'CRM_Report_Form_Contact_Relationship', NULL, 0, NULL, 23, '{ts escape="sql"}Relationship Report{/ts}', 0, 0, 1, NULL, NULL), (@option_group_id_report , '{ts escape="sql"}Case Summary Report{/ts}', 'case/summary', 'CRM_Report_Form_Case_Summary', NULL, 0, NULL, 24, '{ts escape="sql"}Provides a summary of cases and their duration by date range, status, staff member and / or case role.{/ts}', 0, 0, 1, @caseCompId, NULL), - (@option_group_id_report , '{ts escape="sql"}Case Time Spent Report{/ts}', 'case/timespent', 'CRM_Report_Form_Case_TimeSpent', NULL, 0, NULL, 25, '{ts escape="sql"}Aggregates time spent on case and / or or non-case activities by activity type and contact.{/ts}', 0, 0, 1, @caseCompId, NULL), + (@option_group_id_report , '{ts escape="sql"}Case Time Spent Report{/ts}', 'case/timespent', 'CRM_Report_Form_Case_TimeSpent', NULL, 0, NULL, 25, '{ts escape="sql"}Aggregates time spent on case and / or non-case activities by activity type and contact.{/ts}', 0, 0, 1, @caseCompId, NULL), (@option_group_id_report , '{ts escape="sql"}Contact Demographics Report{/ts}', 'case/demographics', 'CRM_Report_Form_Case_Demographics', NULL, 0, NULL, 26, '{ts escape="sql"}Demographic breakdown for case clients (and or non-case contacts) in your database. Includes custom contact fields.{/ts}', 0, 0, 1, @caseCompId, NULL), (@option_group_id_report , '{ts escape="sql"}Database Log Report{/ts}', 'contact/log', 'CRM_Report_Form_Contact_Log', NULL, 0, NULL, 27, '{ts escape="sql"}Log of contact and activity records created or updated in a given date range.{/ts}', 0, 0, 1, NULL, NULL), (@option_group_id_report , '{ts escape="sql"}Activity Report (Summary){/ts}', 'activitySummary', 'CRM_Report_Form_ActivitySummary', NULL, 0, NULL, 28, '{ts escape="sql"}Shows activity statistics by type / date{/ts}', 0, 0, 1, NULL, NULL), -- 2.25.1