Merge branch '2.5.x' into saas

airtime_mvc/application/models/Locale.php

@@ -2,17 +2,32 @@
 
 class Application_Model_Locale
 {
+    public static $locales = array(
+    	    "en_CA" => "English (Canada)",
+            "en_GB" => "English (Britain)",
+            "en_US" => "English (USA)",
+            "cs_CZ" => "Český",
+            "de_DE" => "Deutsch",
+            "de_AT" => "Deutsch (Österreich)",
+            "el_GR" => "Ελληνικά",
+            "es_ES" => "Español",
+            "fr_FR" => "Français",
+            "hr_HR" => "Hrvatski",
+            "hu_HU" => "Magyar",
+            "it_IT" => "Italiano",
+            //"ja"    => "日本語",
+            "ko_KR" => "한국어",
+            "pl_PL" => "Polski",
+            "pt_BR" => "Português (Brasil)",
+            "ru_RU" => "Русский",
+            "sr_RS" => "Српски (Ћирилица)",
+            "sr_RS@latin" => "Srpski (Latinica)",
+            "zh_CN" => "简体中文"
+        );
+    
     public static function getLocales()
     {
-        $con = Propel::getConnection();
-        $sql = "SELECT * FROM cc_locale";
-        $res =  Application_Common_Database::prepareAndExecute($sql);
-        $out = array();
-        foreach ($res as $r) {
-            $out[$r["locale_code"]] = $r["locale_lang"];
-        }
-
-        return $out;
+        return self::$locales;
     }
 
     public static function configureLocalization($locale = null)
@@ -38,4 +53,5 @@ class Application_Model_Locale
         textdomain($domain);
         bind_textdomain_codeset($domain, $codeset);
     }
-}
+}
+