From 18773b472741fa65d03c18abcacf8a113f97a0b7 Mon Sep 17 00:00:00 2001
From: Justin Freeman <justin@agileware.com.au>
Date: Wed, 7 Apr 2021 17:03:14 +1000
Subject: [PATCH] CIVICRM-1696 Adjust error message "Did you rename or deleted
the data source" should be "Did you rename or delete the data source"
---
CRM/Contact/DataProcessorContactSummaryTab.php | 2 +-
.../FieldOutputHandler/AbstractFieldOutputHandler.php | 2 +-
.../FieldOutputHandler/AggregateFunctionFieldOutputHandler.php | 2 +-
Civi/DataProcessor/FilterHandler/AbstractFieldFilterHandler.php | 2 +-
Civi/DataProcessor/FilterHandler/ChecksumFilter.php | 2 +-
Civi/DataProcessor/FilterHandler/MultipleFieldFilter.php | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/CRM/Contact/DataProcessorContactSummaryTab.php b/CRM/Contact/DataProcessorContactSummaryTab.php
index 06ef872e..945419b5 100644
--- a/CRM/Contact/DataProcessorContactSummaryTab.php
+++ b/CRM/Contact/DataProcessorContactSummaryTab.php
@@ -325,7 +325,7 @@ class CRM_Contact_DataProcessorContactSummaryTab implements UIFormOutputInterfac
[$datasource_name, $field_name] = explode('::', $output['configuration']['contact_id_field'], 2);
$dataSource = $dataProcessorClass->getDataSourceByName($datasource_name);
if (!$dataSource) {
- throw new \Civi\DataProcessor\Exception\DataSourceNotFoundException(E::ts("Requires data source '%1' which could not be found. Did you rename or deleted the data source?", array(1=>$datasource_name)));
+ throw new \Civi\DataProcessor\Exception\DataSourceNotFoundException(E::ts("Requires data source '%1' which could not be found. Did you rename or delete the data source?", array(1=>$datasource_name)));
}
$fieldSpecification = $dataSource->getAvailableFilterFields()->getFieldSpecificationByAlias($field_name);
if (!$fieldSpecification) {
diff --git a/Civi/DataProcessor/FieldOutputHandler/AbstractFieldOutputHandler.php b/Civi/DataProcessor/FieldOutputHandler/AbstractFieldOutputHandler.php
index 71ae5db0..b7d944d1 100644
--- a/Civi/DataProcessor/FieldOutputHandler/AbstractFieldOutputHandler.php
+++ b/Civi/DataProcessor/FieldOutputHandler/AbstractFieldOutputHandler.php
@@ -91,7 +91,7 @@ abstract class AbstractFieldOutputHandler {
protected function initializeField($fieldAlias, $datasourceName, $newAlias='') {
$dataSource = $this->dataProcessor->getDataSourceByName($datasourceName);
if (!$dataSource) {
- throw new DataSourceNotFoundException(E::ts("Field %1 requires data source '%2' which could not be found. Did you rename or deleted the data source?", array(1=>$newAlias, 2=>$datasourceName)));
+ throw new DataSourceNotFoundException(E::ts("Field %1 requires data source '%2' which could not be found. Did you rename or delete the data source?", array(1=>$newAlias, 2=>$datasourceName)));
}
$inputFieldSpec = $dataSource->getAvailableFields()->getFieldSpecificationByAlias($fieldAlias);
if (!$inputFieldSpec) {
diff --git a/Civi/DataProcessor/FieldOutputHandler/AggregateFunctionFieldOutputHandler.php b/Civi/DataProcessor/FieldOutputHandler/AggregateFunctionFieldOutputHandler.php
index 544a8812..9ed26e87 100644
--- a/Civi/DataProcessor/FieldOutputHandler/AggregateFunctionFieldOutputHandler.php
+++ b/Civi/DataProcessor/FieldOutputHandler/AggregateFunctionFieldOutputHandler.php
@@ -84,7 +84,7 @@ class AggregateFunctionFieldOutputHandler extends AbstractSimpleSortableFieldOut
public function initialize($alias, $title, $configuration) {
$this->dataSource = $this->dataProcessor->getDataSourceByName($configuration['datasource']);
if (!$this->dataSource) {
- throw new DataSourceNotFoundException(E::ts("Field %1 requires data source '%2' which could not be found. Did you rename or deleted the data source?", array(1=>$alias, 2=>$configuration['datasource'])));
+ throw new DataSourceNotFoundException(E::ts("Field %1 requires data source '%2' which could not be found. Did you rename or delete the data source?", array(1=>$alias, 2=>$configuration['datasource'])));
}
$this->inputFieldSpec = $this->dataSource->getAvailableFields()->getFieldSpecificationByAlias($configuration['field']);
diff --git a/Civi/DataProcessor/FilterHandler/AbstractFieldFilterHandler.php b/Civi/DataProcessor/FilterHandler/AbstractFieldFilterHandler.php
index 7344a10f..2d476047 100644
--- a/Civi/DataProcessor/FilterHandler/AbstractFieldFilterHandler.php
+++ b/Civi/DataProcessor/FilterHandler/AbstractFieldFilterHandler.php
@@ -50,7 +50,7 @@ abstract class AbstractFieldFilterHandler extends AbstractFilterHandler {
protected function initializeField($datasource_name, $field_name) {
$this->dataSource = $this->data_processor->getDataSourceByName($datasource_name);
if (!$this->dataSource) {
- throw new DataSourceNotFoundException(E::ts("Filter %1 requires data source '%2' which could not be found. Did you rename or deleted the data source?", array(1=>$this->title, 2=>$datasource_name)));
+ throw new DataSourceNotFoundException(E::ts("Filter %1 requires data source '%2' which could not be found. Did you rename or delete the data source?", array(1=>$this->title, 2=>$datasource_name)));
}
$this->inputFieldSpecification = $this->dataSource->getAvailableFilterFields()->getFieldSpecificationByAlias($field_name);
if (!$this->inputFieldSpecification) {
diff --git a/Civi/DataProcessor/FilterHandler/ChecksumFilter.php b/Civi/DataProcessor/FilterHandler/ChecksumFilter.php
index b66fe4ea..a4fd1d63 100644
--- a/Civi/DataProcessor/FilterHandler/ChecksumFilter.php
+++ b/Civi/DataProcessor/FilterHandler/ChecksumFilter.php
@@ -61,7 +61,7 @@ class ChecksumFilter extends AbstractFieldFilterHandler {
protected function initializeHashField($datasource_name, $field_name) {
$this->hashDataSource = $this->data_processor->getDataSourceByName($datasource_name);
if (!$this->hashDataSource) {
- throw new DataSourceNotFoundException(E::ts("Filter %1 requires data source '%2' which could not be found. Did you rename or deleted the data source?", array(1=>$this->title, 2=>$datasource_name)));
+ throw new DataSourceNotFoundException(E::ts("Filter %1 requires data source '%2' which could not be found. Did you rename or delete the data source?", array(1=>$this->title, 2=>$datasource_name)));
}
$this->hashInputFieldSpecification = $this->hashDataSource->getAvailableFilterFields()->getFieldSpecificationByAlias($field_name);
if (!$this->hashInputFieldSpecification) {
diff --git a/Civi/DataProcessor/FilterHandler/MultipleFieldFilter.php b/Civi/DataProcessor/FilterHandler/MultipleFieldFilter.php
index 63ba557a..8a42f6e6 100644
--- a/Civi/DataProcessor/FilterHandler/MultipleFieldFilter.php
+++ b/Civi/DataProcessor/FilterHandler/MultipleFieldFilter.php
@@ -55,7 +55,7 @@ class MultipleFieldFilter extends AbstractFilterHandler {
protected function initializeField($datasource_name, $field_name) {
$dataSource = $this->data_processor->getDataSourceByName($datasource_name);
if (!$dataSource) {
- throw new DataSourceNotFoundException(E::ts("Filter %1 requires data source '%2' which could not be found. Did you rename or deleted the data source?", array(1=>$this->title, 2=>$datasource_name)));
+ throw new DataSourceNotFoundException(E::ts("Filter %1 requires data source '%2' which could not be found. Did you rename or delete the data source?", array(1=>$this->title, 2=>$datasource_name)));
}
$fieldSpecification = $dataSource->getAvailableFilterFields()->getFieldSpecificationByAlias($field_name);
if (!$fieldSpecification) {
--
GitLab