From fbaf3c7d92e12925fa0c7173a36e1ecedcc8e167 Mon Sep 17 00:00:00 2001 From: Bradley Taylor Date: Sat, 16 Oct 2021 14:15:31 +0100 Subject: [PATCH] Makes hardcoded placeholder strings translatable --- CRM/Contact/Form/Edit/TagsAndGroups.php | 2 +- CRM/Contact/Form/Relationship.php | 2 +- CRM/Event/Form/ManageEvent/Registration.php | 2 +- CRM/Financial/Form/FinancialAccount.php | 2 +- CRM/Report/Form/Campaign/SurveyDetails.php | 2 +- CRM/Report/Form/Contribute/Bookkeeping.php | 4 ++-- CRM/UF/Form/Field.php | 2 +- .../CRM/Contact/Form/Search/Custom/ActivitySearch.php | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CRM/Contact/Form/Edit/TagsAndGroups.php b/CRM/Contact/Form/Edit/TagsAndGroups.php index 11bb704fca..a3d060fc47 100644 --- a/CRM/Contact/Form/Edit/TagsAndGroups.php +++ b/CRM/Contact/Form/Edit/TagsAndGroups.php @@ -115,7 +115,7 @@ class CRM_Contact_Form_Edit_TagsAndGroups { if ($groupElementType == 'select' && !empty($groupsOptions)) { $form->add('select2', $fName, $groupName, $groupsOptions, FALSE, - ['placeholder' => '- select -', 'multiple' => TRUE, 'class' => 'twenty'] + ['placeholder' => ts('- select -'), 'multiple' => TRUE, 'class' => 'twenty'] ); $form->assign('groupCount', count($groupsOptions)); } diff --git a/CRM/Contact/Form/Relationship.php b/CRM/Contact/Form/Relationship.php index 6bbbdf3a91..06d6d09ba1 100644 --- a/CRM/Contact/Form/Relationship.php +++ b/CRM/Contact/Form/Relationship.php @@ -297,7 +297,7 @@ class CRM_Contact_Form_Relationship extends CRM_Core_Form { [ 'options' => ['' => ts('- select -')] + $relationshipList, 'class' => 'huge', - 'placeholder' => '- select -', + 'placeholder' => ts('- select -'), 'option_url' => 'civicrm/admin/reltype', 'option_context' => [ 'contact_id' => $this->_contactId, diff --git a/CRM/Event/Form/ManageEvent/Registration.php b/CRM/Event/Form/ManageEvent/Registration.php index 16fcd9c3f5..7773107cc0 100644 --- a/CRM/Event/Form/ManageEvent/Registration.php +++ b/CRM/Event/Form/ManageEvent/Registration.php @@ -258,7 +258,7 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent $this->assign('ruleFields', json_encode($ruleFields)); $dedupeRules = [ - '' => '- Unsupervised rule -', + '' => ts('- Unsupervised rule -'), ]; $dedupeRules += CRM_Dedupe_BAO_DedupeRuleGroup::getByType('Individual'); $this->add('select', 'dedupe_rule_group_id', ts('Duplicate matching rule'), $dedupeRules); diff --git a/CRM/Financial/Form/FinancialAccount.php b/CRM/Financial/Form/FinancialAccount.php index 860d210037..82fb432f85 100644 --- a/CRM/Financial/Form/FinancialAccount.php +++ b/CRM/Financial/Form/FinancialAccount.php @@ -90,7 +90,7 @@ class CRM_Financial_Form_FinancialAccount extends CRM_Contribute_Form { $financialAccountType = CRM_Core_PseudoConstant::get('CRM_Financial_DAO_FinancialAccount', 'financial_account_type_id'); if (!empty($financialAccountType)) { $element = $this->add('select', 'financial_account_type_id', ts('Financial Account Type'), - ['' => '- select -'] + $financialAccountType, TRUE, ['class' => 'crm-select2 huge']); + ['' => ts('- select -')] + $financialAccountType, TRUE, ['class' => 'crm-select2 huge']); if ($this->_isARFlag) { $element->freeze(); $elementAccounting->freeze(); diff --git a/CRM/Report/Form/Campaign/SurveyDetails.php b/CRM/Report/Form/Campaign/SurveyDetails.php index 5b43d96f55..b7a34aec01 100644 --- a/CRM/Report/Form/Campaign/SurveyDetails.php +++ b/CRM/Report/Form/Campaign/SurveyDetails.php @@ -49,7 +49,7 @@ class CRM_Report_Form_Campaign_SurveyDetails extends CRM_Report_Form { */ public function __construct() { //filter options for survey activity status. - $responseStatus = array('' => '- Any -'); + $responseStatus = array('' => ts('- Any -')); self::$_surveyRespondentStatus = []; $activityStatus = CRM_Core_PseudoConstant::activityStatus('name'); if ($statusId = array_search('Scheduled', $activityStatus)) { diff --git a/CRM/Report/Form/Contribute/Bookkeeping.php b/CRM/Report/Form/Contribute/Bookkeeping.php index 2a3af71516..b96c804409 100644 --- a/CRM/Report/Form/Contribute/Bookkeeping.php +++ b/CRM/Report/Form/Contribute/Bookkeeping.php @@ -112,7 +112,7 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form { 'title' => ts('Financial Account Owner - Debit'), 'operatorType' => CRM_Report_Form::OP_SELECT, 'type' => CRM_Utils_Type::T_INT, - 'options' => ['' => '- Select Organization -'] + CRM_Financial_BAO_FinancialAccount::getOrganizationNames(FALSE), + 'options' => ['' => ts('- Select Organization -')] + CRM_Financial_BAO_FinancialAccount::getOrganizationNames(FALSE), 'name' => 'contact_id', 'alias' => 'financial_account_civireport_debit', ], @@ -128,7 +128,7 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form { 'title' => ts('Financial Account Owner - Credit'), 'operatorType' => CRM_Report_Form::OP_SELECT, 'type' => CRM_Utils_Type::T_INT, - 'options' => ['' => '- Select Organization -'] + CRM_Financial_BAO_FinancialAccount::getOrganizationNames(FALSE), + 'options' => ['' => ts('- Select Organization -')] + CRM_Financial_BAO_FinancialAccount::getOrganizationNames(FALSE), 'name' => 'contact_id', 'alias' => 'financial_account_civireport_credit', ], diff --git a/CRM/UF/Form/Field.php b/CRM/UF/Form/Field.php index 997962cd40..43509401ab 100644 --- a/CRM/UF/Form/Field.php +++ b/CRM/UF/Form/Field.php @@ -287,7 +287,7 @@ class CRM_UF_Form_Field extends CRM_Core_Form { unset($contactTypes['']); $contactTypes = !empty($contactTypes) ? ['Contact' => 'Contacts'] + $contactTypes : []; - $sel1 = ['' => '- select -'] + $contactTypes; + $sel1 = ['' => ts('- select -')] + $contactTypes; if (!empty($fields['Activity'])) { $sel1['Activity'] = 'Activity'; diff --git a/ext/legacycustomsearches/CRM/Contact/Form/Search/Custom/ActivitySearch.php b/ext/legacycustomsearches/CRM/Contact/Form/Search/Custom/ActivitySearch.php index 7c403fd0c1..f3abfdbd79 100644 --- a/ext/legacycustomsearches/CRM/Contact/Form/Search/Custom/ActivitySearch.php +++ b/ext/legacycustomsearches/CRM/Contact/Form/Search/Custom/ActivitySearch.php @@ -96,7 +96,7 @@ class CRM_Contact_Form_Search_Custom_ActivitySearch extends CRM_Contact_Form_Sea ); // Select box for Activity Type - $activityType = ['' => ' - select activity - '] + CRM_Core_PseudoConstant::activityType(); + $activityType = ['' => ts(' - select activity - ')] + CRM_Core_PseudoConstant::activityType(); $form->add('select', 'activity_type_id', ts('Activity Type'), $activityType, @@ -104,7 +104,7 @@ class CRM_Contact_Form_Search_Custom_ActivitySearch extends CRM_Contact_Form_Sea ); // textbox for Activity Status - $activityStatus = ['' => ' - select status - '] + CRM_Core_PseudoConstant::activityStatus(); + $activityStatus = ['' => ts(' - select status - ')] + CRM_Core_PseudoConstant::activityStatus(); $form->add('select', 'activity_status_id', ts('Activity Status'), $activityStatus, -- 2.25.1