Adamw has uploaded a new change for review. https://gerrit.wikimedia.org/r/114388
Change subject: (FR #1378) preferred_language defaults to null ...................................................................... (FR #1378) preferred_language defaults to null See http://issues.civicrm.org/jira/browse/CRM-14232 Change-Id: I7e904d30734070ad213bd9942048dc07c0de7fb9 --- M CRM/Contact/BAO/Contact.php M CRM/Contact/Form/Edit/CommunicationPreferences.php M CRM/Contact/Form/Inline/CommunicationPreferences.php M CRM/Core/BAO/UFGroup.php 4 files changed, 2 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm refs/changes/88/114388/1 diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php index c204b66..2553c33 100644 --- a/CRM/Contact/BAO/Contact.php +++ b/CRM/Contact/BAO/Contact.php @@ -266,11 +266,6 @@ $config = CRM_Core_Config::singleton(); - // CRM-6942: set preferred language to the current language if it’s unset (and we’re creating a contact) - if (empty($params['contact_id']) && empty($params['preferred_language'])) { - $params['preferred_language'] = $config->lcMessages; - } - // CRM-9739: set greeting & addressee if unset and we’re creating a contact if (empty($params['contact_id'])) { foreach (self::$_greetingTypes as $greeting) { diff --git a/CRM/Contact/Form/Edit/CommunicationPreferences.php b/CRM/Contact/Form/Edit/CommunicationPreferences.php index 6aa554a..94d457b 100644 --- a/CRM/Contact/Form/Edit/CommunicationPreferences.php +++ b/CRM/Contact/Form/Edit/CommunicationPreferences.php @@ -83,7 +83,7 @@ $form->add('select', 'preferred_language', ts('Preferred Language'), array( - '' => ts('- select -')) + + '' => ts('- unknown -')) + CRM_Core_PseudoConstant::languages() ); @@ -166,12 +166,6 @@ if (!empty($defaults['preferred_language'])) { $languages = array_flip(CRM_Core_PseudoConstant::languages()); $defaults['preferred_language'] = $languages[$defaults['preferred_language']]; - } - - // CRM-7119: set preferred_language to default if unset - if (empty($defaults['preferred_language'])) { - $config = CRM_Core_Config::singleton(); - $defaults['preferred_language'] = $config->lcMessages; } //set default from greeting types CRM-4575, CRM-9739 diff --git a/CRM/Contact/Form/Inline/CommunicationPreferences.php b/CRM/Contact/Form/Inline/CommunicationPreferences.php index 553bd02..783ee49 100644 --- a/CRM/Contact/Form/Inline/CommunicationPreferences.php +++ b/CRM/Contact/Form/Inline/CommunicationPreferences.php @@ -118,12 +118,6 @@ $defaults['preferred_language'] = $languages[$defaults['preferred_language']]; } - // CRM-7119: set preferred_language to default if unset - if (empty($defaults['preferred_language'])) { - $config = CRM_Core_Config::singleton(); - $defaults['preferred_language'] = $config->lcMessages; - } - foreach (CRM_Contact_BAO_Contact::$_greetingTypes as $greeting) { $name = "{$greeting}_display"; $this->assign($name, CRM_Utils_Array::value($name, $defaults)); diff --git a/CRM/Core/BAO/UFGroup.php b/CRM/Core/BAO/UFGroup.php index 439d533..ec5d816 100644 --- a/CRM/Core/BAO/UFGroup.php +++ b/CRM/Core/BAO/UFGroup.php @@ -1738,7 +1738,7 @@ $form->add('select', $name, $title, CRM_Core_SelectValues::pmf()); } elseif ($fieldName === 'preferred_language') { - $form->add('select', $name, $title, array('' => ts('- select -')) + CRM_Core_PseudoConstant::languages()); + $form->add('select', $name, $title, array('' => ts('- unknown -')) + CRM_Core_PseudoConstant::languages()); } elseif ($fieldName == 'external_identifier') { $form->add('text', $name, $title, $attributes, $required); -- To view, visit https://gerrit.wikimedia.org/r/114388 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7e904d30734070ad213bd9942048dc07c0de7fb9 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm/civicrm Gerrit-Branch: master Gerrit-Owner: Adamw <awi...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
