From 7edc74b253bc8eb12c0eabfcbfe268bc7d0a773b Mon Sep 17 00:00:00 2001
From: Dmitriy Simushev <simushevds@ossg.ru>
Date: Mon, 30 Jun 2014 11:59:14 +0000
Subject: [PATCH] Remove "get_locale_names" function

---
 .../Controller/CannedMessageController.php    |  4 ++--
 .../Localization/LocaleController.php         |  4 ++--
 .../Localization/TranslationController.php    | 10 ++++----
 .../Controller/MailTemplateController.php     |  4 ++--
 src/mibew/libs/common/locale.php              | 24 ++-----------------
 5 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/src/mibew/libs/classes/Mibew/Controller/CannedMessageController.php b/src/mibew/libs/classes/Mibew/Controller/CannedMessageController.php
index 160dec9d..d6a8be7a 100644
--- a/src/mibew/libs/classes/Mibew/Controller/CannedMessageController.php
+++ b/src/mibew/libs/classes/Mibew/Controller/CannedMessageController.php
@@ -42,12 +42,12 @@ class CannedMessageController extends AbstractController
 
         // Build list of available locales
         $all_locales = get_available_locales();
-        $locale_names = get_locale_names();
         $locales_with_label = array();
         foreach ($all_locales as $id) {
+            $locale_info = get_locale_info($id);
             $locales_with_label[] = array(
                 'id' => $id,
-                'name' => (isset($locale_names[$id]) ? $locale_names[$id] : $id)
+                'name' => ($locale_info ? $locale_info['name'] : $id)
             );
         }
         $page['locales'] = $locales_with_label;
diff --git a/src/mibew/libs/classes/Mibew/Controller/Localization/LocaleController.php b/src/mibew/libs/classes/Mibew/Controller/Localization/LocaleController.php
index ece384ca..17613d55 100644
--- a/src/mibew/libs/classes/Mibew/Controller/Localization/LocaleController.php
+++ b/src/mibew/libs/classes/Mibew/Controller/Localization/LocaleController.php
@@ -43,14 +43,14 @@ class LocaleController extends AbstractController
         );
 
         $fs_locales = discover_locales();
-        $locale_names = get_locale_names();
         $available_locales = get_available_locales();
 
         $locales_list = array();
         foreach ($fs_locales as $locale) {
+            $locale_info = get_locale_info($locale);
             $locales_list[] = array(
                 'code' => $locale,
-                'name' => (isset($locale_names[$locale]) ? $locale_names[$locale] : $locale),
+                'name' => ($locale_info ? $locale_info['name'] : $locale),
                 'isDisabled' => !in_array($locale, $available_locales),
             );
         }
diff --git a/src/mibew/libs/classes/Mibew/Controller/Localization/TranslationController.php b/src/mibew/libs/classes/Mibew/Controller/Localization/TranslationController.php
index 78a5e238..73d2d92d 100644
--- a/src/mibew/libs/classes/Mibew/Controller/Localization/TranslationController.php
+++ b/src/mibew/libs/classes/Mibew/Controller/Localization/TranslationController.php
@@ -203,13 +203,11 @@ class TranslationController extends AbstractController
      */
     protected function getLocaleName($locale)
     {
-        $names = get_locale_names();
+        $locale_info = get_locale_info($locale);
 
-        if (isset($names[$locale])) {
-            return sprintf('%s (%s)', $names[$locale], $locale);
-        }
-
-        return $locale;
+        return $locale_info
+            ? sprintf('%s (%s)', $locale_info['name'], $locale)
+            : $locale;
     }
 
     /**
diff --git a/src/mibew/libs/classes/Mibew/Controller/MailTemplateController.php b/src/mibew/libs/classes/Mibew/Controller/MailTemplateController.php
index 59e06f2a..03fd7eb3 100644
--- a/src/mibew/libs/classes/Mibew/Controller/MailTemplateController.php
+++ b/src/mibew/libs/classes/Mibew/Controller/MailTemplateController.php
@@ -37,12 +37,12 @@ class MailTemplateController extends AbstractController
 
         // Build list of available locales
         $all_locales = get_available_locales();
-        $locale_names = get_locale_names();
         $locales_with_label = array();
         foreach ($all_locales as $id) {
+            $locale_info = get_locale_info($id);
             $locales_with_label[] = array(
                 'id' => $id,
-                'name' => (isset($locale_names[$id]) ? $locale_names[$id] : $id)
+                'name' => ($locale_info ? $locale_info['name'] : $id)
             );
         }
         $page['locales'] = $locales_with_label;
diff --git a/src/mibew/libs/common/locale.php b/src/mibew/libs/common/locale.php
index 99dadb54..f5bf1d43 100644
--- a/src/mibew/libs/common/locale.php
+++ b/src/mibew/libs/common/locale.php
@@ -178,34 +178,14 @@ function get_locale_links()
     }
 
     // Attache locale names
-    $locale_names = get_locale_names();
     foreach ($all_locales as $k) {
-        $locale_links[$k] = isset($locale_names[$k]) ? $locale_names[$k] : $k;
+        $locale_info = get_locale_info($k);
+        $locale_links[$k] = $locale_info ? $locale_info['name'] : $k;
     }
 
     return $locale_links;
 }
 
-/**
- * Returns list of human readable locale names.
- *
- * @return array
- */
-function get_locale_names()
-{
-    static $names = false;
-
-    if ($names === false) {
-        $locales = get_locales();
-        $names = array();
-        foreach ($locales as $code => $info) {
-            $names[$code] = $info['name'];
-        }
-    }
-
-    return $names;
-}
-
 /**
  * Returns meta data for all known locales.
  *