From 273f984957a35320dc92dad75a450540edcbd4cd Mon Sep 17 00:00:00 2001
From: Samuel Vanhove <samuel@symbiotic.coop>
Date: Tue, 28 Apr 2015 19:08:59 -0400
Subject: [PATCH] CRM-16355 - cleanup, use of CRM_Core_I18n::language instead
 of a new function

---
 CRM/Admin/Form/ScheduleReminders.php | 23 +++++++----------------
 CRM/Core/BAO/ActionSchedule.php      |  4 ++--
 CRM/Core/DAO.php                     |  1 -
 CRM/Core/I18n.php                    | 10 ----------
 4 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/CRM/Admin/Form/ScheduleReminders.php b/CRM/Admin/Form/ScheduleReminders.php
index c5f90aa21f..c34eb74435 100644
--- a/CRM/Admin/Form/ScheduleReminders.php
+++ b/CRM/Admin/Form/ScheduleReminders.php
@@ -255,29 +255,20 @@ class CRM_Admin_Form_ScheduleReminders extends CRM_Admin_Form {
     );
 
     // multilingual only options
-    $domain = new CRM_Core_DAO_Domain();
-    $domain->find(TRUE);
-    $multilingual = (bool) $domain->locales;
+    $multilingual = CRM_Core_I18n::isMultilingual();
     if ($multilingual) {
       $smarty = CRM_Core_Smarty::singleton();
       $smarty->assign('multilingual', $multilingual);
 
-      $languageFilter = array();
-      $locales = explode(CRM_Core_DAO::VALUE_SEPARATOR, $domain->locales);
-      $languages = CRM_Core_I18n::languages();
-      foreach ($locales as $locale) {
-        $languageFilter[$locale] = $languages[$locale];
-      }
-      $languageFilter[CRM_Core_I18n::NONE] = ts('Contacts with no preferred language');
+      $languages = CRM_Core_I18n::languages(TRUE);
+      $languageFilter = $languages + array(CRM_Core_I18n::NONE => ts('Contacts with no preferred language'));
       $element = $this->add('select', 'filter_contact_language', ts('Recipients language'), $languageFilter, FALSE,
         array('multiple' => TRUE, 'class' => 'crm-select2', 'placeholder' => TRUE));
 
-      $communicationLanguage = array();
-      $communicationLanguage[''] = ts('System default language');
-      $communicationLanguage[CRM_Core_I18n::AUTO] = ts('Follow recipient preferred language');
-      foreach ($locales as $locale) {
-        $communicationLanguage[$locale] = $languages[$locale];
-      }
+      $communicationLanguage = $languages + array(
+        '' => ts('System default language'),
+        CRM_Core_I18n::AUTO => ts('Follow recipient preferred language')
+      );
       $this->add('select', 'communication_language', ts('Communication language'), $communicationLanguage);
     }
 
diff --git a/CRM/Core/BAO/ActionSchedule.php b/CRM/Core/BAO/ActionSchedule.php
index b99e8e253d..7be01b2959 100755
--- a/CRM/Core/BAO/ActionSchedule.php
+++ b/CRM/Core/BAO/ActionSchedule.php
@@ -1577,8 +1577,8 @@ WHERE     m.owner_membership_id IS NOT NULL AND
     }
 
     // language not in the existing language, use default
-    $locales = CRM_Core_I18n::getLocales();
-    if (!in_array($language, $locales)) {
+    $languages = CRM_Core_I18n::languages(TRUE);
+    if (!in_array($language, $languages)) {
       $language = $config->lcMessages;
     }
 
diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
index df78fbb883..baa3033c9d 100644
--- a/CRM/Core/DAO.php
+++ b/CRM/Core/DAO.php
@@ -320,7 +320,6 @@ class CRM_Core_DAO extends DB_DataObject {
     global $dbLocale;
     if ($i18nRewrite and $dbLocale) {
       $query = CRM_Core_I18n_Schema::rewriteQuery($query);
-//watchdog('debug', $query);
     }
 
     return parent::query($query);
diff --git a/CRM/Core/I18n.php b/CRM/Core/I18n.php
index b4a9a14e2f..20c0b4a065 100644
--- a/CRM/Core/I18n.php
+++ b/CRM/Core/I18n.php
@@ -541,16 +541,6 @@ class CRM_Core_I18n {
     return (bool) $domain->locales;
   }
 
-  /**
-   * Get the enabled locales list
-   *
-   * @return array
-   */
-  public static function getLocales() {
-    $domain = new CRM_Core_DAO_Domain();
-    $domain->find(TRUE);
-    return $domain->locales;
-  }
 
   /**
    * Change the processing language without changing the current user language
-- 
2.25.1