Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ts() functions to have variable on the outside. #11357

Merged
merged 1 commit into from
Dec 1, 2017
Merged

Fix ts() functions to have variable on the outside. #11357

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions CRM/Report/Form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4379,7 +4379,7 @@ public function getPhoneColumns($options = array()) {
'dao' => 'CRM_Core_DAO_Phone',
'fields' => array(
$options['prefix'] . 'phone' => array(
'title' => ts($options['prefix_label'] . 'Phone'),
'title' => $options['prefix_label'] . ts('Phone'),
'name' => 'phone',
),
),
Expand Down Expand Up @@ -5000,19 +5000,19 @@ protected function getContactColumns($options = array()) {
$spec = array(
$options['prefix'] . 'display_name' => array(
'name' => 'display_name',
'title' => ts($options['prefix_label'] . 'Contact Name'),
'title' => $options['prefix_label'] . ts('Contact Name'),
'is_fields' => TRUE,
),
$options['prefix'] . 'sort_name' => array(
'name' => 'sort_name',
'title' => ts($options['prefix_label'] . 'Contact Name (in sort format)'),
'title' => $options['prefix_label'] . ts('Contact Name (in sort format)'),
'is_fields' => TRUE,
'is_filters' => TRUE,
'is_order_bys' => TRUE,
),
$options['prefix'] . 'id' => array(
'name' => 'id',
'title' => ts($options['prefix_label'] . 'Contact ID'),
'title' => $options['prefix_label'] . ts('Contact ID'),
'alter_display' => 'alterContactID',
'type' => CRM_Utils_Type::T_INT,
'is_order_bys' => TRUE,
Expand All @@ -5021,12 +5021,12 @@ protected function getContactColumns($options = array()) {
),
$options['prefix'] . 'external_identifier' => array(
'name' => 'external_identifier',
'title' => ts($options['prefix_label'] . 'External ID'),
'title' => $options['prefix_label'] . ts('External ID'),
'type' => CRM_Utils_Type::T_INT,
'is_fields' => TRUE,
),
$options['prefix'] . 'contact_type' => array(
'title' => ts($options['prefix_label'] . 'Contact Type'),
'title' => $options['prefix_label'] . ts('Contact Type'),
'name' => 'contact_type',
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contact_BAO_Contact::buildOptions('contact_type'),
Expand All @@ -5035,7 +5035,7 @@ protected function getContactColumns($options = array()) {
'is_group_bys' => TRUE,
),
$options['prefix'] . 'contact_sub_type' => array(
'title' => ts($options['prefix_label'] . 'Contact Sub Type'),
'title' => $options['prefix_label'] . ts('Contact Sub Type'),
'name' => 'contact_sub_type',
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contact_BAO_Contact::buildOptions('contact_sub_type'),
Expand All @@ -5044,7 +5044,7 @@ protected function getContactColumns($options = array()) {
'is_group_bys' => TRUE,
),
$options['prefix'] . 'is_deleted' => array(
'title' => ts($options['prefix_label'] . 'Is deleted'),
'title' => $options['prefix_label'] . ts('Is deleted'),
'name' => 'is_deleted',
'type' => CRM_Utils_Type::T_BOOLEAN,
'is_fields' => FALSE,
Expand All @@ -5055,51 +5055,51 @@ protected function getContactColumns($options = array()) {
$individualFields = array(
$options['prefix'] . 'first_name' => array(
'name' => 'first_name',
'title' => ts($options['prefix_label'] . 'First Name'),
'title' => $options['prefix_label'] . ts('First Name'),
'is_fields' => TRUE,
'is_filters' => TRUE,
'is_order_bys' => TRUE,
),
$options['prefix'] . 'middle_name' => array(
'name' => 'middle_name',
'title' => ts($options['prefix_label'] . 'Middle Name'),
'title' => $options['prefix_label'] . ts('Middle Name'),
'is_fields' => TRUE,
),
$options['prefix'] . 'last_name' => array(
'name' => 'last_name',
'title' => ts($options['prefix_label'] . 'Last Name'),
'title' => $options['prefix_label'] . ts('Last Name'),
'default_order' => 'ASC',
'is_fields' => TRUE,
),
$options['prefix'] . 'nick_name' => array(
'name' => 'nick_name',
'title' => ts($options['prefix_label'] . 'Nick Name'),
'title' => $options['prefix_label'] . ts('Nick Name'),
'is_fields' => TRUE,
),
$options['prefix'] . 'gender_id' => array(
'name' => 'gender_id',
'title' => ts($options['prefix_label'] . 'Gender'),
'title' => $options['prefix_label'] . ts('Gender'),
'options' => CRM_Contact_BAO_Contact::buildOptions('gender_id'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'alter_display' => 'alterGenderID',
'is_fields' => TRUE,
'is_filters' => TRUE,
),
'birth_date' => array(
'title' => ts($options['prefix_label'] . 'Birth Date'),
'title' => $options['prefix_label'] . ts('Birth Date'),
'operatorType' => CRM_Report_Form::OP_DATE,
'type' => CRM_Utils_Type::T_DATE,
'is_fields' => TRUE,
'is_filters' => TRUE,
),
'age' => array(
'title' => ts($options['prefix_label'] . 'Age'),
'title' => $options['prefix_label'] . ts('Age'),
'dbAlias' => 'TIMESTAMPDIFF(YEAR, ' . $tableAlias . '.birth_date, CURDATE())',
'type' => CRM_Utils_Type::T_INT,
'is_fields' => TRUE,
),
$options['prefix'] . 'is_deceased' => array(
'title' => ts($options['prefix_label'] . 'Is deceased'),
'title' => $options['prefix_label'] . ts('Is deceased'),
'name' => 'is_deceased',
'type' => CRM_Utils_Type::T_BOOLEAN,
'is_fields' => FALSE,
Expand Down