Update Zend Framework from 1.12.4 => 1.12.6

14 files changed, 856 insertions, 696 deletions

diff --git a/composer.lock b/composer.lock
index f7701c2114..5f3c518fcd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -7,16 +7,16 @@
     "packages": [
         {
             "name": "bombayworks/zendframework1",
-            "version": "v1.12.5",
+            "version": "v1.12.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bombayworks/zendframework1.git",
-                "reference": "3f8af440199be5eb31cc9e73c196278227bb73af"
+                "reference": "f83796e2fcaf18bea1480988ab61de02a8168535"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bombayworks/zendframework1/zipball/3f8af440199be5eb31cc9e73c196278227bb73af",
-                "reference": "3f8af440199be5eb31cc9e73c196278227bb73af",
+                "url": "https://api.github.com/repos/bombayworks/zendframework1/zipball/f83796e2fcaf18bea1480988ab61de02a8168535",
+                "reference": "f83796e2fcaf18bea1480988ab61de02a8168535",
                 "shasum": ""
             },
             "require": {
@@ -56,7 +56,7 @@
                 "ZF1",
                 "framework"
             ],
-            "time": "2014-03-07 17:08:56"
+            "time": "2014-04-15 17:01:21"
         },
         {
             "name": "ezyang/htmlpurifier",
@@ -207,11 +207,11 @@
         },
         {
             "name": "tecnick.com/tcpdf",
-            "version": "6.0.062",
+            "version": "6.0.071",
             "source": {
                 "type": "git",
                 "url": "git://git.code.sf.net/p/tcpdf/code",
-                "reference": "cada5f0ef8c1bb0799f2694ea501db437b02a2ea"
+                "reference": "e85569fc0351501ed51643df1b12f66696727b8a"
             },
             "require": {
                 "php": ">=5.3.0"
@@ -260,7 +260,7 @@
                 "pdf417",
                 "qrcode"
             ],
-            "time": "2014-03-02 10:22:27"
+            "time": "2014-04-25 18:13:02"
         }
     ],
     "packages-dev": [
diff --git a/library/bombayworks/zendframework1/library/Zend/Application/Resource/Translate.php b/library/bombayworks/zendframework1/library/Zend/Application/Resource/Translate.php
index 4a1f6a2ed3..fa93a67c67 100644
--- a/library/bombayworks/zendframework1/library/Zend/Application/Resource/Translate.php
+++ b/library/bombayworks/zendframework1/library/Zend/Application/Resource/Translate.php
@@ -88,10 +88,7 @@ class Zend_Application_Resource_Translate extends Zend_Application_Resource_Reso
 
             if (isset($options['log'])) {
                 if (is_array($options['log'])) {
-                    $log = Zend_Log::factory($options['log']);
-                }
-                if ($log instanceof Zend_Log) {
-                    $options['log'] = $log;
+                    $options['log'] = Zend_Log::factory($options['log']);
                 }
             }
 
diff --git a/library/bombayworks/zendframework1/library/Zend/Cache/Backend/Libmemcached.php b/library/bombayworks/zendframework1/library/Zend/Cache/Backend/Libmemcached.php
index 44e113d6ae..f1cdca1b34 100644
--- a/library/bombayworks/zendframework1/library/Zend/Cache/Backend/Libmemcached.php
+++ b/library/bombayworks/zendframework1/library/Zend/Cache/Backend/Libmemcached.php
@@ -132,7 +132,7 @@ class Zend_Cache_Backend_Libmemcached extends Zend_Cache_Backend implements Zend
                     $this->_log("Unknown memcached client option '{$name}' ({$optConst})");
                 }
             }
-            if ($optId) {
+            if (null !== $optId) {
                 if (!$this->_memcache->setOption($optId, $value)) {
                     $this->_log("Setting memcached client option '{$optId}' failed");
                 }
diff --git a/library/bombayworks/zendframework1/library/Zend/Date.php b/library/bombayworks/zendframework1/library/Zend/Date.php
index 6a0c517fd8..417f4c6e6d 100644
--- a/library/bombayworks/zendframework1/library/Zend/Date.php
+++ b/library/bombayworks/zendframework1/library/Zend/Date.php
@@ -1208,7 +1208,7 @@ class Zend_Date extends Zend_Date_DateObject
             return $zone;
         }
 
-        preg_match('/([[:alpha:]\/]{3,30})(?!.*([[:alpha:]\/]{3,30}))/', $zone, $match);
+        preg_match('/([[:alpha:]\/_]{3,30})(?!.*([[:alpha:]\/]{3,30}))/', $zone, $match);
         try {
             if (!empty($match) and (!is_int($match[count($match) - 1]))) {
                 $oldzone = $this->getTimezone();
diff --git a/library/bombayworks/zendframework1/library/Zend/Db/Table/Abstract.php b/library/bombayworks/zendframework1/library/Zend/Db/Table/Abstract.php
index d4f3aacc6c..69103fbeac 100644
--- a/library/bombayworks/zendframework1/library/Zend/Db/Table/Abstract.php
+++ b/library/bombayworks/zendframework1/library/Zend/Db/Table/Abstract.php
@@ -1041,16 +1041,6 @@ abstract class Zend_Db_Table_Abstract
         $primary = (array) $this->_primary;
         $pkIdentity = $primary[(int)$this->_identity];
 
-        /**
-         * If this table uses a database sequence object and the data does not
-         * specify a value, then get the next ID from the sequence and add it
-         * to the row.  We assume that only the first column in a compound
-         * primary key takes a value from a sequence.
-         */
-        if (is_string($this->_sequence) && !isset($data[$pkIdentity])) {
-            $data[$pkIdentity] = $this->_db->nextSequenceId($this->_sequence);
-            $pkSuppliedBySequence = true;
-        }
 
         /**
          * If the primary key can be generated automatically, and no value was
@@ -1060,7 +1050,7 @@ abstract class Zend_Db_Table_Abstract
          * position of the data.  The following values are considered empty:
          *   null, false, true, '', array()
          */
-        if (!isset($pkSuppliedBySequence) && array_key_exists($pkIdentity, $data)) {
+        if (array_key_exists($pkIdentity, $data)) {
             if ($data[$pkIdentity] === null                                        // null
                 || $data[$pkIdentity] === ''                                       // empty string
                 || is_bool($data[$pkIdentity])                                     // boolean
@@ -1070,6 +1060,16 @@ abstract class Zend_Db_Table_Abstract
         }
 
         /**
+         * If this table uses a database sequence object and the data does not
+         * specify a value, then get the next ID from the sequence and add it
+         * to the row.  We assume that only the first column in a compound
+         * primary key takes a value from a sequence.
+         */
+        if (is_string($this->_sequence) && !isset($data[$pkIdentity])) {
+            $data[$pkIdentity] = $this->_db->nextSequenceId($this->_sequence);
+        }
+
+        /**
          * INSERT the new row.
          */
         $tableSpec = ($this->_schema ? $this->_schema . '.' : '') . $this->_name;
@@ -1212,20 +1212,20 @@ abstract class Zend_Db_Table_Abstract
     {
         // setup metadata
         $this->_setupMetadata();
-        
+
         // get this class name
         $thisClass = get_class($this);
         if ($thisClass === 'Zend_Db_Table') {
             $thisClass = $this->_definitionConfigName;
         }
-        
+
         $rowsAffected = 0;
-        
+
         foreach ($this->_getReferenceMapNormalized() as $map) {
             if ($map[self::REF_TABLE_CLASS] == $parentTableClassname && isset($map[self::ON_DELETE])) {
-                
+
                 $where = array();
-                
+
                 // CASCADE or CASCADE_RECURSE
                 if (in_array($map[self::ON_DELETE], array(self::CASCADE, self::CASCADE_RECURSE))) {
                     for ($i = 0; $i < count($map[self::COLUMNS]); ++$i) {
@@ -1237,10 +1237,10 @@ abstract class Zend_Db_Table_Abstract
                             $primaryKey[$refCol], $type);
                     }
                 }
-                
+
                 // CASCADE_RECURSE
                 if ($map[self::ON_DELETE] == self::CASCADE_RECURSE) {
-                    
+
                     /**
                      * Execute cascading deletes against dependent tables
                      */
@@ -1259,7 +1259,7 @@ abstract class Zend_Db_Table_Abstract
                 if (in_array($map[self::ON_DELETE], array(self::CASCADE, self::CASCADE_RECURSE))) {
                     $rowsAffected += $this->delete($where);
                 }
-                
+
             }
         }
         return $rowsAffected;
@@ -1610,5 +1610,5 @@ abstract class Zend_Db_Table_Abstract
 
         return new $tableName($options);
     }
-    
+
 }
diff --git a/library/bombayworks/zendframework1/library/Zend/Form.php b/library/bombayworks/zendframework1/library/Zend/Form.php
index 99356c13db..729d92702a 100644
--- a/library/bombayworks/zendframework1/library/Zend/Form.php
+++ b/library/bombayworks/zendframework1/library/Zend/Form.php
@@ -2494,7 +2494,27 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface
      */
     public function hasErrors()
     {
-        return $this->_errorsExist;
+        $errors = $this->_errorsExist;
+
+        if (!$errors) {
+            /** @var Zend_Form_Element $element */
+            foreach ($this->getElements() as $element) {
+                if ($element->hasErrors()) {
+                    $errors = true;
+                    break;
+                }
+            }
+
+            /** @var Zend_Form_SubForm $subForm */
+            foreach ($this->getSubForms() as $subForm) {
+                if ($subForm->hasErrors()) {
+                    $errors = true;
+                    break;
+                }
+            }
+        }
+
+        return $errors;
     }
 
     /**
diff --git a/library/bombayworks/zendframework1/library/Zend/Loader/PluginLoader.php b/library/bombayworks/zendframework1/library/Zend/Loader/PluginLoader.php
index 3fc32fffca..e2aa81fd75 100644
--- a/library/bombayworks/zendframework1/library/Zend/Loader/PluginLoader.php
+++ b/library/bombayworks/zendframework1/library/Zend/Loader/PluginLoader.php
@@ -44,6 +44,12 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface
     protected static $_includeFileCache;
 
     /**
+     * Class map cache file handler
+     * @var resource
+     */
+    protected static $_includeFileCacheHandler;
+
+    /**
      * Instance loaded plugin paths
      *
      * @var array
@@ -438,6 +444,13 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface
      */
     public static function setIncludeFileCache($file)
     {
+        if (!empty(self::$_includeFileCacheHandler)) {
+            flock(self::$_includeFileCacheHandler, LOCK_UN);
+            fclose(self::$_includeFileCacheHandler);
+        }
+
+        self::$_includeFileCacheHandler = null;
+
         if (null === $file) {
             self::$_includeFileCache = null;
             return;
@@ -477,14 +490,17 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface
      */
     protected static function _appendIncFile($incFile)
     {
-        if (!file_exists(self::$_includeFileCache)) {
-            $file = '<?php';
-        } else {
-            $file = file_get_contents(self::$_includeFileCache);
+        if (!isset(self::$_includeFileCacheHandler)) {
+            self::$_includeFileCacheHandler = fopen(self::$_includeFileCache, 'ab');
+
+            if (!flock(self::$_includeFileCacheHandler, LOCK_EX | LOCK_NB, $wouldBlock) || $wouldBlock) {
+                self::$_includeFileCacheHandler = false;
+            }
         }
-        if (!strstr($file, $incFile)) {
-            $file .= "\ninclude_once '$incFile';";
-            file_put_contents(self::$_includeFileCache, $file);
+
+        if (false !== self::$_includeFileCacheHandler) {
+            $line = "<?php include_once '$incFile'?>\n";
+            fwrite(self::$_includeFileCacheHandler, $line, strlen($line));
         }
     }
 }
diff --git a/library/bombayworks/zendframework1/library/Zend/Locale.php b/library/bombayworks/zendframework1/library/Zend/Locale.php
index 0e621af2c7..4918819a42 100644
--- a/library/bombayworks/zendframework1/library/Zend/Locale.php
+++ b/library/bombayworks/zendframework1/library/Zend/Locale.php
@@ -30,635 +30,712 @@
 class Zend_Locale
 {
     /**
+     * List of locales that are no longer part of CLDR along with a
+     * mapping to an appropriate alternative.
+     *
+     * @var array
+     */
+    private static $_localeAliases = array(
+        'az_AZ'  => 'az_Latn_AZ',
+        'bs_BA'  => 'bs_Latn_BA',
+        'ha_GH'  => 'ha_Latn_GH',
+        'ha_NE'  => 'ha_Latn_NE',
+        'ha_NG'  => 'ha_Latn_NG',
+        'kk_KZ'  => 'kk_Cyrl_KZ',
+        'ks_IN'  => 'ks_Arab_IN',
+        'mn_MN'  => 'mn_Cyrl_MN',
+        'ms_BN'  => 'ms_Latn_BN',
+        'ms_MY'  => 'ms_Latn_MY',
+        'ms_SG'  => 'ms_Latn_SG',
+        'pa_IN'  => 'pa_Guru_IN',
+        'pa_PK'  => 'pa_Arab_PK',
+        'shi_MA' => 'shi_Latn_MA',
+        'sr_BA'  => 'sr_Latn_BA',
+        'sr_ME'  => 'sr_Latn_ME',
+        'sr_RS'  => 'sr_Latn_RS',
+        'sr_XK'  => 'sr_Latn_XK',
+        'tg_TJ'  => 'tg_Cyrl_TJ',
+        'tzm_MA' => 'tzm_Latn_MA',
+        'uz_AF'  => 'uz_Arab_AF',
+        'uz_UZ'  => 'uz_Latn_UZ',
+        'vai_LR' => 'vai_Latn_LR',
+        'zh_CN' => 'zh_Hans_CN',
+        'zh_HK' => 'zh_Hans_HK',
+        'zh_MO' => 'zh_Hans_MO',
+        'zh_SG' => 'zh_Hans_SG',
+        'zh_TW' => 'zh_Hant_TW',
+    );
+
+    /**
      * Class wide Locale Constants
      *
      * @var array $_localeData
      */
     private static $_localeData = array(
-        'root'    => true,
-        'aa_DJ'   => true,
-        'aa_ER'   => true,
-        'aa_ET'   => true,
-        'aa'      => true,
-        'af_NA'   => true,
-        'af_ZA'   => true,
-        'af'      => true,
-        'agq_CM'  => true,
-        'agq'     => true,
-        'ak_GH'   => true,
-        'ak'      => true,
-        'am_ET'   => true,
-        'am'      => true,
-        'ar_001'  => true,
-        'ar_AE'   => true,
-        'ar_BH'   => true,
-        'ar_DJ'   => true,
-        'ar_DZ'   => true,
-        'ar_EG'   => true,
-        'ar_EH'   => true,
-        'ar_ER'   => true,
-        'ar_IL'   => true,
-        'ar_IQ'   => true,
-        'ar_JO'   => true,
-        'ar_KM'   => true,
-        'ar_KW'   => true,
-        'ar_LB'   => true,
-        'ar_LY'   => true,
-        'ar_MA'   => true,
-        'ar_MR'   => true,
-        'ar_OM'   => true,
-        'ar_PS'   => true,
-        'ar_QA'   => true,
-        'ar_SA'   => true,
-        'ar_SD'   => true,
-        'ar_SO'   => true,
-        'ar_SY'   => true,
-        'ar_TD'   => true,
-        'ar_TN'   => true,
-        'ar_YE'   => true,
-        'ar'      => true,
-        'as_IN'   => true,
-        'as'      => true,
-        'asa_TZ'  => true,
-        'asa'     => true,
-        'ast_ES'  => true,
-        'ast'     => true,
-        'az_AZ'   => true,
-        'az'      => true,
-        'bas_CM'  => true,
-        'bas'     => true,
-        'be_BY'   => true,
-        'be'      => true,
-        'bem_ZM'  => true,
-        'bem'     => true,
-        'bez_TZ'  => true,
-        'bez'     => true,
-        'bg_BG'   => true,
-        'bg'      => true,
-        'bm_ML'   => true,
-        'bm'      => true,
-        'bn_BD'   => true,
-        'bn_IN'   => true,
-        'bn'      => true,
-        'bo_CN'   => true,
-        'bo_IN'   => true,
-        'bo'      => true,
-        'br_FR'   => true,
-        'br'      => true,
-        'brx_IN'  => true,
-        'brx'     => true,
-        'bs_BA'   => true,
-        'bs'      => true,
-        'byn_ER'  => true,
-        'byn'     => true,
-        'ca_AD'   => true,
-        'ca_ES'   => true,
-        'ca'      => true,
-        'cgg_UG'  => true,
-        'cgg'     => true,
-        'chr_US'  => true,
-        'chr'     => true,
-        'cs_CZ'   => true,
-        'cs'      => true,
-        'cy_GB'   => true,
-        'cy'      => true,
-        'da_DK'   => true,
-        'da'      => true,
-        'dav_KE'  => true,
-        'dav'     => true,
-        'de_AT'   => true,
-        'de_BE'   => true,
-        'de_CH'   => true,
-        'de_DE'   => true,
-        'de_LI'   => true,
-        'de_LU'   => true,
-        'de'      => true,
-        'dje_NE'  => true,
-        'dje'     => true,
-        'dua_CM'  => true,
-        'dua'     => true,
-        'dyo_SN'  => true,
-        'dyo'     => true,
-        'dz_BT'   => true,
-        'dz'      => true,
-        'ebu_KE'  => true,
-        'ebu'     => true,
-        'ee_GH'   => true,
-        'ee_TG'   => true,
-        'ee'      => true,
-        'el_CY'   => true,
-        'el_GR'   => true,
-        'el'      => true,
-        'en_150'  => true,
-        'en_AG'   => true,
-        'en_AS'   => true,
-        'en_AU'   => true,
-        'en_BB'   => true,
-        'en_BE'   => true,
-        'en_BM'   => true,
-        'en_BS'   => true,
-        'en_BW'   => true,
-        'en_BZ'   => true,
-        'en_CA'   => true,
-        'en_CM'   => true,
-        'en_DM'   => true,
-        'en_FJ'   => true,
-        'en_FM'   => true,
-        'en_GB'   => true,
-        'en_GD'   => true,
-        'en_GG'   => true,
-        'en_GH'   => true,
-        'en_GI'   => true,
-        'en_GM'   => true,
-        'en_GU'   => true,
-        'en_GY'   => true,
-        'en_HK'   => true,
-        'en_IE'   => true,
-        'en_IM'   => true,
-        'en_IN'   => true,
-        'en_JE'   => true,
-        'en_JM'   => true,
-        'en_KE'   => true,
-        'en_KI'   => true,
-        'en_KN'   => true,
-        'en_KY'   => true,
-        'en_LC'   => true,
-        'en_LR'   => true,
-        'en_LS'   => true,
-        'en_MG'   => true,
-        'en_MH'   => true,
-        'en_MP'   => true,
-        'en_MT'   => true,
-        'en_MU'   => true,
-        'en_MW'   => true,
-        'en_NA'   => true,
-        'en_NG'   => true,
-        'en_NZ'   => true,
-        'en_PG'   => true,
-        'en_PH'   => true,
-        'en_PK'   => true,
-        'en_PR'   => true,
-        'en_PW'   => true,
-        'en_SB'   => true,
-        'en_SC'   => true,
-        'en_SG'   => true,
-        'en_SL'   => true,
-        'en_SS'   => true,
-        'en_SZ'   => true,
-        'en_TC'   => true,
-        'en_TO'   => true,
-        'en_TT'   => true,
-        'en_TZ'   => true,
-        'en_UG'   => true,
-        'en_UM'   => true,
-        'en_US'   => true,
-        'en_VC'   => true,
-        'en_VG'   => true,
-        'en_VI'   => true,
-        'en_VU'   => true,
-        'en_WS'   => true,
-        'en_ZA'   => true,
-        'en_ZM'   => true,
-        'en_ZW'   => true,
-        'en'      => true,
-        'eo'      => true,
-        'es_419'  => true,
-        'es_AR'   => true,
-        'es_BO'   => true,
-        'es_CL'   => true,
-        'es_CO'   => true,
-        'es_CR'   => true,
-        'es_CU'   => true,
-        'es_DO'   => true,
-        'es_EA'   => true,
-        'es_EC'   => true,
-        'es_ES'   => true,
-        'es_GQ'   => true,
-        'es_GT'   => true,
-        'es_HN'   => true,
-        'es_IC'   => true,
-        'es_MX'   => true,
-        'es_NI'   => true,
-        'es_PA'   => true,
-        'es_PE'   => true,
-        'es_PH'   => true,
-        'es_PR'   => true,
-        'es_PY'   => true,
-        'es_SV'   => true,
-        'es_US'   => true,
-        'es_UY'   => true,
-        'es_VE'   => true,
-        'es'      => true,
-        'et_EE'   => true,
-        'et'      => true,
-        'eu_ES'   => true,
-        'eu'      => true,
-        'ewo_CM'  => true,
-        'ewo'     => true,
-        'fa_AF'   => true,
-        'fa_IR'   => true,
-        'fa'      => true,
-        'ff_SN'   => true,
-        'ff'      => true,
-        'fi_FI'   => true,
-        'fi'      => true,
-        'fil_PH'  => true,
-        'fil'     => true,
-        'fo_FO'   => true,
-        'fo'      => true,
-        'fr_BE'   => true,
-        'fr_BF'   => true,
-        'fr_BI'   => true,
-        'fr_BJ'   => true,
-        'fr_BL'   => true,
-        'fr_CA'   => true,
-        'fr_CD'   => true,
-        'fr_CF'   => true,
-        'fr_CG'   => true,
-        'fr_CH'   => true,
-        'fr_CI'   => true,
-        'fr_CM'   => true,
-        'fr_DJ'   => true,
-        'fr_DZ'   => true,
-        'fr_FR'   => true,
-        'fr_GA'   => true,
-        'fr_GF'   => true,
-        'fr_GN'   => true,
-        'fr_GP'   => true,
-        'fr_GQ'   => true,
-        'fr_HT'   => true,
-        'fr_KM'   => true,
-        'fr_LU'   => true,
-        'fr_MA'   => true,
-        'fr_MC'   => true,
-        'fr_MF'   => true,
-        'fr_MG'   => true,
-        'fr_ML'   => true,
-        'fr_MQ'   => true,
-        'fr_MR'   => true,
-        'fr_MU'   => true,
-        'fr_NC'   => true,
-        'fr_NE'   => true,
-        'fr_PF'   => true,
-        'fr_RE'   => true,
-        'fr_RW'   => true,
-        'fr_SC'   => true,
-        'fr_SN'   => true,
-        'fr_SY'   => true,
-        'fr_TD'   => true,
-        'fr_TG'   => true,
-        'fr_TN'   => true,
-        'fr_VU'   => true,
-        'fr_YT'   => true,
-        'fr'      => true,
-        'fur_IT'  => true,
-        'fur'     => true,
-        'ga_IE'   => true,
-        'ga'      => true,
-        'gd_GB'   => true,
-        'gd'      => true,
-        'gl_ES'   => true,
-        'gl'      => true,
-        'gsw_CH'  => true,
-        'gsw'     => true,
-        'gu_IN'   => true,
-        'gu'      => true,
-        'guz_KE'  => true,
-        'guz'     => true,
-        'gv'      => true,
-        'ha_GH'   => true,
-        'ha_NE'   => true,
-        'ha_NG'   => true,
-        'ha'      => true,
-        'haw_US'  => true,
-        'haw'     => true,
-        'he_IL'   => true,
-        'he'      => true,
-        'hi_IN'   => true,
-        'hi'      => true,
-        'hr_BA'   => true,
-        'hr_HR'   => true,
-        'hr'      => true,
-        'hu_HU'   => true,
-        'hu'      => true,
-        'hy_AM'   => true,
-        'hy'      => true,
-        'ia_FR'   => true,
-        'ia'      => true,
-        'id_ID'   => true,
-        'id'      => true,
-        'ig_NG'   => true,
-        'ig'      => true,
-        'ii_CN'   => true,
-        'ii'      => true,
-        'is_IS'   => true,
-        'is'      => true,
-        'it_CH'   => true,
-        'it_IT'   => true,
-        'it_SM'   => true,
-        'it'      => true,
-        'ja_JP'   => true,
-        'ja'      => true,
-        'jgo_CM'  => true,
-        'jgo'     => true,
-        'jmc_TZ'  => true,
-        'jmc'     => true,
-        'ka_GE'   => true,
-        'ka'      => true,
-        'kab_DZ'  => true,
-        'kab'     => true,
-        'kam_KE'  => true,
-        'kam'     => true,
-        'kde_TZ'  => true,
-        'kde'     => true,
-        'kea_CV'  => true,
-        'kea'     => true,
-        'khq_ML'  => true,
-        'khq'     => true,
-        'ki_KE'   => true,
-        'ki'      => true,
-        'kk_KZ'   => true,
-        'kk'      => true,
-        'kkj_CM'  => true,
-        'kkj'     => true,
-        'kl_GL'   => true,
-        'kl'      => true,
-        'kln_KE'  => true,
-        'kln'     => true,
-        'km_KH'   => true,
-        'km'      => true,
-        'kn_IN'   => true,
-        'kn'      => true,
-        'ko_KP'   => true,
-        'ko_KR'   => true,
-        'ko'      => true,
-        'kok_IN'  => true,
-        'kok'     => true,
-        'ks_IN'   => true,
-        'ks'      => true,
-        'ksb_TZ'  => true,
-        'ksb'     => true,
-        'ksf_CM'  => true,
-        'ksf'     => true,
-        'ksh_DE'  => true,
-        'ksh'     => true,
-        'kw_GB'   => true,
-        'kw'      => true,
-        'ky'      => true,
-        'lag_TZ'  => true,
-        'lag'     => true,
-        'lg_UG'   => true,
-        'lg'      => true,
-        'ln_AO'   => true,
-        'ln_CD'   => true,
-        'ln_CF'   => true,
-        'ln_CG'   => true,
-        'ln'      => true,
-        'lo_LA'   => true,
-        'lo'      => true,
-        'lt_LT'   => true,
-        'lt'      => true,
-        'lu_CD'   => true,
-        'lu'      => true,
-        'luo_KE'  => true,
-        'luo'     => true,
-        'luy_KE'  => true,
-        'luy'     => true,
-        'lv_LV'   => true,
-        'lv'      => true,
-        'mas_KE'  => true,
-        'mas_TZ'  => true,
-        'mas'     => true,
-        'mer_KE'  => true,
-        'mer'     => true,
-        'mfe_MU'  => true,
-        'mfe'     => true,
-        'mg_MG'   => true,
-        'mg'      => true,
-        'mgh_MZ'  => true,
-        'mgh'     => true,
-        'mgo_CM'  => true,
-        'mgo'     => true,
-        'mk_MK'   => true,
-        'mk'      => true,
-        'ml_IN'   => true,
-        'ml'      => true,
-        'mn_MN'   => true,
-        'mn'      => true,
-        'mr_IN'   => true,
-        'mr'      => true,
-        'ms_BN'   => true,
-        'ms_MY'   => true,
-        'ms_SG'   => true,
-        'ms'      => true,
-        'mt_MT'   => true,
-        'mt'      => true,
-        'mua_CM'  => true,
-        'mua'     => true,
-        'my_MM'   => true,
-        'my'      => true,
-        'naq_NA'  => true,
-        'naq'     => true,
-        'nb_NO'   => true,
-        'nb'      => true,
-        'nd_ZW'   => true,
-        'nd'      => true,
-        'ne_IN'   => true,
-        'ne_NP'   => true,
-        'ne'      => true,
-        'nl_AW'   => true,
-        'nl_BE'   => true,
-        'nl_CW'   => true,
-        'nl_NL'   => true,
-        'nl_SR'   => true,
-        'nl_SX'   => true,
-        'nl'      => true,
-        'nmg_CM'  => true,
-        'nmg'     => true,
-        'nn_NO'   => true,
-        'nn'      => true,
-        'nnh_CM'  => true,
-        'nnh'     => true,
-        'nr_ZA'   => true,
-        'nr'      => true,
-        'nso_ZA'  => true,
-        'nso'     => true,
-        'nus_SD'  => true,
-        'nus'     => true,
-        'nyn_UG'  => true,
-        'nyn'     => true,
-        'om_ET'   => true,
-        'om_KE'   => true,
-        'om'      => true,
-        'or_IN'   => true,
-        'or'      => true,
-        'os_GE'   => true,
-        'os_RU'   => true,
-        'os'      => true,
-        'pa_IN'   => true,
-        'pa_PK'   => true,
-        'pa'      => true,
-        'pl_PL'   => true,
-        'pl'      => true,
-        'ps_AF'   => true,
-        'ps'      => true,
-        'pt_AO'   => true,
-        'pt_BR'   => true,
-        'pt_CV'   => true,
-        'pt_GW'   => true,
-        'pt_MO'   => true,
-        'pt_MZ'   => true,
-        'pt_PT'   => true,
-        'pt_ST'   => true,
-        'pt_TL'   => true,
-        'pt'      => true,
-        'rm_CH'   => true,
-        'rm'      => true,
-        'rn_BI'   => true,
-        'rn'      => true,
-        'ro_MD'   => true,
-        'ro_RO'   => true,
-        'ro'      => true,
-        'rof_TZ'  => true,
-        'rof'     => true,
-        'ru_BY'   => true,
-        'ru_KG'   => true,
-        'ru_KZ'   => true,
-        'ru_MD'   => true,
-        'ru_RU'   => true,
-        'ru_UA'   => true,
-        'ru'      => true,
-        'rw_RW'   => true,
-        'rw'      => true,
-        'rwk_TZ'  => true,
-        'rwk'     => true,
-        'sah_RU'  => true,
-        'sah'     => true,
-        'saq_KE'  => true,
-        'saq'     => true,
-        'sbp_TZ'  => true,
-        'sbp'     => true,
-        'se_FI'   => true,
-        'se_NO'   => true,
-        'se'      => true,
-        'seh_MZ'  => true,
-        'seh'     => true,
-        'ses__ML' => true,
-        'ses'     => true,
-        'sg_CF'   => true,
-        'sg'      => true,
-        'shi_MA'  => true,
-        'shi'     => true,
-        'si_LK'   => true,
-        'si'      => true,
-        'sk_SK'   => true,
-        'sk'      => true,
-        'sl_SI'   => true,
-        'sl'      => true,
-        'sn_ZW'   => true,
-        'sn'      => true,
-        'so_DJ'   => true,
-        'so_ET'   => true,
-        'so_KE'   => true,
-        'so_SO'   => true,
-        'so'      => true,
-        'sq_AL'   => true,
-        'sq_MK'   => true,
-        'sq_XK'   => true,
-        'sq'      => true,
-        'sr_BA'   => true,
-        'sr_ME'   => true,
-        'sr_RS'   => true,
-        'sr_XK'   => true,
-        'sr'      => true,
-        'ss_SZ'   => true,
-        'ss_ZA'   => true,
-        'ss'      => true,
-        'ssy_ER'  => true,
-        'ssy'     => true,
-        'st_LS'   => true,
-        'st_ZA'   => true,
-        'st'      => true,
-        'sv_AX'   => true,
-        'sv_FI'   => true,
-        'sv_SE'   => true,
-        'sv'      => true,
-        'sw_KE'   => true,
-        'sw_TZ'   => true,
-        'sw_UG'   => true,
-        'sw'      => true,
-        'swc_CD'  => true,
-        'swc'     => true,
-        'ta_IN'   => true,
-        'ta_LK'   => true,
-        'ta_MY'   => true,
-        'ta_SG'   => true,
-        'ta'      => true,
-        'te_IN'   => true,
-        'te'      => true,
-        'teo_KE'  => true,
-        'teo_UG'  => true,
-        'teo'     => true,
-        'tg_TJ'   => true,
-        'tg'      => true,
-        'th_TH'   => true,
-        'th'      => true,
-        'ti_ER'   => true,
-        'ti_ET'   => true,
-        'ti'      => true,
-        'tig_ER'  => true,
-        'tig'     => true,
-        'tn_BW'   => true,
-        'tn_ZA'   => true,
-        'tn'      => true,
-        'to_TO'   => true,
-        'to'      => true,
-        'tr_CY'   => true,
-        'tr_TR'   => true,
-        'tr'      => true,
-        'ts_ZA'   => true,
-        'ts'      => true,
-        'twq_NE'  => true,
-        'twq'     => true,
-        'tzm_MA'  => true,
-        'tzm'     => true,
-        'uk_UA'   => true,
-        'uk'      => true,
-        'ur_IN'   => true,
-        'ur_PK'   => true,
-        'ur'      => true,
-        'uz_AF'   => true,
-        'uz_UZ'   => true,
-        'uz'      => true,
-        'vai_LR'  => true,
-        'vai'     => true,
-        've_ZA'   => true,
-        've'      => true,
-        'vi_VN'   => true,
-        'vi'      => true,
-        'vo'      => true,
-        'vun_TZ'  => true,
-        'vun'     => true,
-        'wae_CH'  => true,
-        'wae'     => true,
-        'wal_ET'  => true,
-        'wal'     => true,
-        'xh_ZA'   => true,
-        'xh'      => true,
-        'xog_UG'  => true,
-        'xog'     => true,
-        'yav_CM'  => true,
-        'yav'     => true,
-        'yo_NG'   => true,
-        'yo'      => true,
-        'zh_CN'   => true,
-        'zh_HK'   => true,
-        'zh_MO'   => true,
-        'zh_SG'   => true,
-        'zh_TW'   => true,
-        'zh'      => true,
-        'zu_ZA'   => true,
-        'zu'      => true
+        'root'        => true,
+        'aa'          => true,
+        'aa_DJ'       => true,
+        'aa_ER'       => true,
+        'aa_ET'       => true,
+        'af'          => true,
+        'af_NA'       => true,
+        'af_ZA'       => true,
+        'agq'         => true,
+        'agq_CM'      => true,
+        'ak'          => true,
+        'ak_GH'       => true,
+        'am'          => true,
+        'am_ET'       => true,
+        'ar'          => true,
+        'ar_001'      => true,
+        'ar_AE'       => true,
+        'ar_BH'       => true,
+        'ar_DJ'       => true,
+        'ar_DZ'       => true,
+        'ar_EG'       => true,
+        'ar_EH'       => true,
+        'ar_ER'       => true,
+        'ar_IL'       => true,
+        'ar_IQ'       => true,
+        'ar_JO'       => true,
+        'ar_KM'       => true,
+        'ar_KW'       => true,
+        'ar_LB'       => true,
+        'ar_LY'       => true,
+        'ar_MA'       => true,
+        'ar_MR'       => true,
+        'ar_OM'       => true,
+        'ar_PS'       => true,
+        'ar_QA'       => true,
+        'ar_SA'       => true,
+        'ar_SD'       => true,
+        'ar_SO'       => true,
+        'ar_SY'       => true,
+        'ar_TD'       => true,
+        'ar_TN'       => true,
+        'ar_YE'       => true,
+        'as'          => true,
+        'as_IN'       => true,
+        'asa'         => true,
+        'asa_TZ'      => true,
+        'ast'         => true,
+        'ast_ES'      => true,
+        'az'          => true,
+        'az_Cyrl'     => true,
+        'az_Cyrl_AZ'  => true,
+        'az_Latn'     => true,
+        'az_Latn_AZ'  => true,
+        'bas'         => true,
+        'bas_CM'      => true,
+        'be'          => true,
+        'be_BY'       => true,
+        'bem'         => true,
+        'bem_ZM'      => true,
+        'bez'         => true,
+        'bez_TZ'      => true,
+        'bg'          => true,
+        'bg_BG'       => true,
+        'bm'          => true,
+        'bm_ML'       => true,
+        'bn'          => true,
+        'bn_BD'       => true,
+        'bn_IN'       => true,
+        'bo'          => true,
+        'bo_CN'       => true,
+        'bo_IN'       => true,
+        'br'          => true,
+        'br_FR'       => true,
+        'brx'         => true,
+        'brx_IN'      => true,
+        'bs'          => true,
+        'bs_Cyrl'     => true,
+        'bs_Cyrl_BA'  => true,
+        'bs_Latn'     => true,
+        'bs_Latn_BA'  => true,
+        'byn'         => true,
+        'byn_ER'      => true,
+        'ca'          => true,
+        'ca_AD'       => true,
+        'ca_ES'       => true,
+        'cgg'         => true,
+        'cgg_UG'      => true,
+        'chr'         => true,
+        'chr_US'      => true,
+        'cs'          => true,
+        'cs_CZ'       => true,
+        'cy'          => true,
+        'cy_GB'       => true,
+        'da'          => true,
+        'da_DK'       => true,
+        'dav'         => true,
+        'dav_KE'      => true,
+        'de'          => true,
+        'de_AT'       => true,
+        'de_BE'       => true,
+        'de_CH'       => true,
+        'de_DE'       => true,
+        'de_LI'       => true,
+        'de_LU'       => true,
+        'dje'         => true,
+        'dje_NE'      => true,
+        'dua'         => true,
+        'dua_CM'      => true,
+        'dyo'         => true,
+        'dyo_SN'      => true,
+        'dz'          => true,
+        'dz_BT'       => true,
+        'ebu'         => true,
+        'ebu_KE'      => true,
+        'ee'          => true,
+        'ee_GH'       => true,
+        'ee_TG'       => true,
+        'el'          => true,
+        'el_CY'       => true,
+        'el_GR'       => true,
+        'en'          => true,
+        'en_150'      => true,
+        'en_AG'       => true,
+        'en_AS'       => true,
+        'en_AU'       => true,
+        'en_BB'       => true,
+        'en_BE'       => true,
+        'en_BM'       => true,
+        'en_BS'       => true,
+        'en_BW'       => true,
+        'en_BZ'       => true,
+        'en_CA'       => true,
+        'en_CM'       => true,
+        'en_DM'       => true,
+        'en_Dsrt'     => true,
+        'en_Dsrt_US'  => true,
+        'en_FJ'       => true,
+        'en_FM'       => true,
+        'en_GB'       => true,
+        'en_GD'       => true,
+        'en_GG'       => true,
+        'en_GH'       => true,
+        'en_GI'       => true,
+        'en_GM'       => true,
+        'en_GU'       => true,
+        'en_GY'       => true,
+        'en_HK'       => true,
+        'en_IE'       => true,
+        'en_IM'       => true,
+        'en_IN'       => true,
+        'en_JE'       => true,
+        'en_JM'       => true,
+        'en_KE'       => true,
+        'en_KI'       => true,
+        'en_KN'       => true,
+        'en_KY'       => true,
+        'en_LC'       => true,
+        'en_LR'       => true,
+        'en_LS'       => true,
+        'en_MG'       => true,
+        'en_MH'       => true,
+        'en_MP'       => true,
+        'en_MT'       => true,
+        'en_MU'       => true,
+        'en_MW'       => true,
+        'en_NA'       => true,
+        'en_NG'       => true,
+        'en_NZ'       => true,
+        'en_PG'       => true,
+        'en_PH'       => true,
+        'en_PK'       => true,
+        'en_PR'       => true,
+        'en_PW'       => true,
+        'en_SB'       => true,
+        'en_SC'       => true,
+        'en_SG'       => true,
+        'en_SL'       => true,
+        'en_SS'       => true,
+        'en_SZ'       => true,
+        'en_TC'       => true,
+        'en_TO'       => true,
+        'en_TT'       => true,
+        'en_TZ'       => true,
+        'en_UG'       => true,
+        'en_UM'       => true,
+        'en_US'       => true,
+        'en_US_POSIX' => true,
+        'en_VC'       => true,
+        'en_VG'       => true,
+        'en_VI'       => true,
+        'en_VU'       => true,
+        'en_WS'       => true,
+        'en_ZA'       => true,
+        'en_ZM'       => true,
+        'en_ZW'       => true,
+        'eo'          => true,
+        'es'          => true,
+        'es_419'      => true,
+        'es_AR'       => true,
+        'es_BO'       => true,
+        'es_CL'       => true,
+        'es_CO'       => true,
+        'es_CR'       => true,
+        'es_CU'       => true,
+        'es_DO'       => true,
+        'es_EA'       => true,
+        'es_EC'       => true,
+        'es_ES'       => true,
+        'es_GQ'       => true,
+        'es_GT'       => true,
+        'es_HN'       => true,
+        'es_IC'       => true,
+        'es_MX'       => true,
+        'es_NI'       => true,
+        'es_PA'       => true,
+        'es_PE'       => true,
+        'es_PH'       => true,
+        'es_PR'       => true,
+        'es_PY'       => true,
+        'es_SV'       => true,
+        'es_US'       => true,
+        'es_UY'       => true,
+        'es_VE'       => true,
+        'et'          => true,
+        'et_EE'       => true,
+        'eu'          => true,
+        'eu_ES'       => true,
+        'ewo'         => true,
+        'ewo_CM'      => true,
+        'fa'          => true,
+        'fa_AF'       => true,
+        'fa_IR'       => true,
+        'ff'          => true,
+        'ff_SN'       => true,
+        'fi'          => true,
+        'fi_FI'       => true,
+        'fil'         => true,
+        'fil_PH'      => true,
+        'fo'          => true,
+        'fo_FO'       => true,
+        'fr'          => true,
+        'fr_BE'       => true,
+        'fr_BF'       => true,
+        'fr_BI'       => true,
+        'fr_BJ'       => true,
+        'fr_BL'       => true,
+        'fr_CA'       => true,
+        'fr_CD'       => true,
+        'fr_CF'       => true,
+        'fr_CG'       => true,
+        'fr_CH'       => true,
+        'fr_CI'       => true,
+        'fr_CM'       => true,
+        'fr_DJ'       => true,
+        'fr_DZ'       => true,
+        'fr_FR'       => true,
+        'fr_GA'       => true,
+        'fr_GF'       => true,
+        'fr_GN'       => true,
+        'fr_GP'       => true,
+        'fr_GQ'       => true,
+        'fr_HT'       => true,
+        'fr_KM'       => true,
+        'fr_LU'       => true,
+        'fr_MA'       => true,
+        'fr_MC'       => true,
+        'fr_MF'       => true,
+        'fr_MG'       => true,
+        'fr_ML'       => true,
+        'fr_MQ'       => true,
+        'fr_MR'       => true,
+        'fr_MU'       => true,
+        'fr_NC'       => true,
+        'fr_NE'       => true,
+        'fr_PF'       => true,
+        'fr_RE'       => true,
+        'fr_RW'       => true,
+        'fr_SC'       => true,
+        'fr_SN'       => true,
+        'fr_SY'       => true,
+        'fr_TD'       => true,
+        'fr_TG'       => true,
+        'fr_TN'       => true,
+        'fr_VU'       => true,
+        'fr_YT'       => true,
+        'fur'         => true,
+        'fur_IT'      => true,
+        'ga'          => true,
+        'ga_IE'       => true,
+        'gd'          => true,
+        'gd_GB'       => true,
+        'gl'          => true,
+        'gl_ES'       => true,
+        'gsw'         => true,
+        'gsw_CH'      => true,
+        'gu'          => true,
+        'gu_IN'       => true,
+        'guz'         => true,
+        'guz_KE'      => true,
+        'gv'          => true,
+        'ha'          => true,
+        'ha_Latn'     => true,
+        'ha_Latn_GH'  => true,
+        'ha_Latn_NE'  => true,
+        'ha_Latn_NG'  => true,
+        'haw'         => true,
+        'haw_US'      => true,
+        'he'          => true,
+        'he_IL'       => true,
+        'hi'          => true,
+        'hi_IN'       => true,
+        'hr'          => true,
+        'hr_BA'       => true,
+        'hr_HR'       => true,
+        'hu'          => true,
+        'hu_HU'       => true,
+        'hy'          => true,
+        'hy_AM'       => true,
+        'ia'          => true,
+        'ia_FR'       => true,
+        'id'          => true,
+        'id_ID'       => true,
+        'ig'          => true,
+        'ig_NG'       => true,
+        'ii'          => true,
+        'ii_CN'       => true,
+        'is'          => true,
+        'is_IS'       => true,
+        'it'          => true,
+        'it_CH'       => true,
+        'it_IT'       => true,
+        'it_SM'       => true,
+        'ja'          => true,
+        'ja_JP'       => true,
+        'jgo'         => true,
+        'jgo_CM'      => true,
+        'jmc'         => true,
+        'jmc_TZ'      => true,
+        'ka'          => true,
+        'ka_GE'       => true,
+        'kab'         => true,
+        'kab_DZ'      => true,
+        'kam'         => true,
+        'kam_KE'      => true,
+        'kde'         => true,
+        'kde_TZ'      => true,
+        'kea'         => true,
+        'kea_CV'      => true,
+        'khq'         => true,
+        'khq_ML'      => true,
+        'ki'          => true,
+        'ki_KE'       => true,
+        'kk'          => true,
+        'kk_Cyrl'     => true,
+        'kk_Cyrl_KZ'  => true,
+        'kkj'         => true,
+        'kkj_CM'      => true,
+        'kl'          => true,
+        'kl_GL'       => true,
+        'kln'         => true,
+        'kln_KE'      => true,
+        'km'          => true,
+        'km_KH'       => true,
+        'kn'          => true,
+        'kn_IN'       => true,
+        'ko'          => true,
+        'ko_KP'       => true,
+        'ko_KR'       => true,
+        'kok'         => true,
+        'kok_IN'      => true,
+        'ks'          => true,
+        'ks_Arab'     => true,
+        'ks_Arab_IN'  => true,
+        'ksb'         => true,
+        'ksb_TZ'      => true,
+        'ksf'         => true,
+        'ksf_CM'      => true,
+        'ksh'         => true,
+        'ksh_DE'      => true,
+        'kw'          => true,
+        'kw_GB'       => true,
+        'ky'          => true,
+        'lag'         => true,
+        'lag_TZ'      => true,
+        'lg'          => true,
+        'lg_UG'       => true,
+        'ln'          => true,
+        'ln_AO'       => true,
+        'ln_CD'       => true,
+        'ln_CF'       => true,
+        'ln_CG'       => true,
+        'lo'          => true,
+        'lo_LA'       => true,
+        'lt'          => true,
+        'lt_LT'       => true,
+        'lu'          => true,
+        'lu_CD'       => true,
+        'luo'         => true,
+        'luo_KE'      => true,
+        'luy'         => true,
+        'luy_KE'      => true,
+        'lv'          => true,
+        'lv_LV'       => true,
+        'mas'         => true,
+        'mas_KE'      => true,
+        'mas_TZ'      => true,
+        'mer'         => true,
+        'mer_KE'      => true,
+        'mfe'         => true,
+        'mfe_MU'      => true,
+        'mg'          => true,
+        'mg_MG'       => true,
+        'mgh'         => true,
+        'mgh_MZ'      => true,
+        'mgo'         => true,
+        'mgo_CM'      => true,
+        'mk'          => true,
+        'mk_MK'       => true,
+        'ml'          => true,
+        'ml_IN'       => true,
+        'mn'          => true,
+        'mn_Cyrl'     => true,
+        'mn_Cyrl_MN'  => true,
+        'mr'          => true,
+        'mr_IN'       => true,
+        'ms'          => true,
+        'ms_Latn'     => true,
+        'ms_Latn_BN'  => true,
+        'ms_Latn_MY'  => true,
+        'ms_Latn_SG'  => true,
+        'mt'          => true,
+        'mt_MT'       => true,
+        'mua'         => true,
+        'mua_CM'      => true,
+        'my'          => true,
+        'my_MM'       => true,
+        'naq'         => true,
+        'naq_NA'      => true,
+        'nb'          => true,
+        'nb_NO'       => true,
+        'nd'          => true,
+        'nd_ZW'       => true,
+        'ne'          => true,
+        'ne_IN'       => true,
+        'ne_NP'       => true,
+        'nl'          => true,
+        'nl_AW'       => true,
+        'nl_BE'       => true,
+        'nl_CW'       => true,
+        'nl_NL'       => true,
+        'nl_SR'       => true,
+        'nl_SX'       => true,
+        'nmg'         => true,
+        'nmg_CM'      => true,
+        'nn'          => true,
+        'nn_NO'       => true,
+        'nnh'         => true,
+        'nnh_CM'      => true,
+        'nr'          => true,
+        'nr_ZA'       => true,
+        'nso'         => true,
+        'nso_ZA'      => true,
+        'nus'         => true,
+        'nus_SD'      => true,
+        'nyn'         => true,
+        'nyn_UG'      => true,
+        'om'          => true,
+        'om_ET'       => true,
+        'om_KE'       => true,
+        'or'          => true,
+        'or_IN'       => true,
+        'ordinals'    => true,
+        'os'          => true,
+        'os_GE'       => true,
+        'os_RU'       => true,
+        'pa'          => true,
+        'pa_Arab'     => true,
+        'pa_Arab_PK'  => true,
+        'pa_Guru'     => true,
+        'pa_Guru_IN'  => true,
+        'pl'          => true,
+        'pl_PL'       => true,
+        'plurals'     => true,
+        'ps'          => true,
+        'ps_AF'       => true,
+        'pt'          => true,
+        'pt_AO'       => true,
+        'pt_BR'       => true,
+        'pt_CV'       => true,
+        'pt_GW'       => true,
+        'pt_MO'       => true,
+        'pt_MZ'       => true,
+        'pt_PT'       => true,
+        'pt_ST'       => true,
+        'pt_TL'       => true,
+        'rm'          => true,
+        'rm_CH'       => true,
+        'rn'          => true,
+        'rn_BI'       => true,
+        'ro'          => true,
+        'ro_MD'       => true,
+        'ro_RO'       => true,
+        'rof'         => true,
+        'rof_TZ'      => true,
+        'ru'          => true,
+        'ru_BY'       => true,
+        'ru_KG'       => true,
+        'ru_KZ'       => true,
+        'ru_MD'       => true,
+        'ru_RU'       => true,
+        'ru_UA'       => true,
+        'rw'          => true,
+        'rw_RW'       => true,
+        'rwk'         => true,
+        'rwk_TZ'      => true,
+        'sah'         => true,
+        'sah_RU'      => true,
+        'saq'         => true,
+        'saq_KE'      => true,
+        'sbp'         => true,
+        'sbp_TZ'      => true,
+        'se'          => true,
+        'se_FI'       => true,
+        'se_NO'       => true,
+        'seh'         => true,
+        'seh_MZ'      => true,
+        'ses'         => true,
+        'ses_ML'      => true,
+        'sg'          => true,
+        'sg_CF'       => true,
+        'shi'         => true,
+        'shi_Latn'    => true,
+        'shi_Latn_MA' => true,
+        'shi_Tfng'    => true,
+        'shi_Tfng_MA' => true,
+        'si'          => true,
+        'si_LK'       => true,
+        'sk'          => true,
+        'sk_SK'       => true,
+        'sl'          => true,
+        'sl_SI'       => true,
+        'sn'          => true,
+        'sn_ZW'       => true,
+        'so'          => true,
+        'so_DJ'       => true,
+        'so_ET'       => true,
+        'so_KE'       => true,
+        'so_SO'       => true,
+        'sq'          => true,
+        'sq_AL'       => true,
+        'sq_MK'       => true,
+        'sq_XK'       => true,
+        'sr'          => true,
+        'sr_Cyrl'     => true,
+        'sr_Cyrl_BA'  => true,
+        'sr_Cyrl_ME'  => true,
+        'sr_Cyrl_RS'  => true,
+        'sr_Cyrl_XK'  => true,
+        'sr_Latn'     => true,
+        'sr_Latn_BA'  => true,
+        'sr_Latn_ME'  => true,
+        'sr_Latn_RS'  => true,
+        'sr_Latn_XK'  => true,
+        'ss'          => true,
+        'ss_SZ'       => true,
+        'ss_ZA'       => true,
+        'ssy'         => true,
+        'ssy_ER'      => true,
+        'st'          => true,
+        'st_LS'       => true,
+        'st_ZA'       => true,
+        'sv'          => true,
+        'sv_AX'       => true,
+        'sv_FI'       => true,
+        'sv_SE'       => true,
+        'sw'          => true,
+        'sw_KE'       => true,
+        'sw_TZ'       => true,
+        'sw_UG'       => true,
+        'swc'         => true,
+        'swc_CD'      => true,
+        'ta'          => true,
+        'ta_IN'       => true,
+        'ta_LK'       => true,
+        'ta_MY'       => true,
+        'ta_SG'       => true,
+        'te'          => true,
+        'te_IN'       => true,
+        'teo'         => true,
+        'teo_KE'      => true,
+        'teo_UG'      => true,
+        'tg'          => true,
+        'tg_Cyrl'     => true,
+        'tg_Cyrl_TJ'  => true,
+        'th'          => true,
+        'th_TH'       => true,
+        'ti'          => true,
+        'ti_ER'       => true,
+        'ti_ET'       => true,
+        'tig'         => true,
+        'tig_ER'      => true,
+        'tn'          => true,
+        'tn_BW'       => true,
+        'tn_ZA'       => true,
+        'to'          => true,
+        'to_TO'       => true,
+        'tr'          => true,
+        'tr_CY'       => true,
+        'tr_TR'       => true,
+        'ts'          => true,
+        'ts_ZA'       => true,
+        'twq'         => true,
+        'twq_NE'      => true,
+        'tzm'         => true,
+        'tzm_Latn'    => true,
+        'tzm_Latn_MA' => true,
+        'uk'          => true,
+        'uk_UA'       => true,
+        'ur'          => true,
+        'ur_IN'       => true,
+        'ur_PK'       => true,
+        'uz'          => true,
+        'uz_Arab'     => true,
+        'uz_Arab_AF'  => true,
+        'uz_Cyrl'     => true,
+        'uz_Cyrl_UZ'  => true,
+        'uz_Latn'     => true,
+        'uz_Latn_UZ'  => true,
+        'vai'         => true,
+        'vai_Latn'    => true,
+        'vai_Latn_LR' => true,
+        'vai_Vaii'    => true,
+        'vai_Vaii_LR' => true,
+        've'          => true,
+        've_ZA'       => true,
+        'vi'          => true,
+        'vi_VN'       => true,
+        'vo'          => true,
+        'vun'         => true,
+        'vun_TZ'      => true,
+        'wae'         => true,
+        'wae_CH'      => true,
+        'wal'         => true,
+        'wal_ET'      => true,
+        'xh'          => true,
+        'xh_ZA'       => true,
+        'xog'         => true,
+        'xog_UG'      => true,
+        'yav'         => true,
+        'yav_CM'      => true,
+        'yo'          => true,
+        'yo_NG'       => true,
+        'zh'          => true,
+        'zh_Hans'     => true,
+        'zh_Hans_CN'  => true,
+        'zh_Hans_HK'  => true,
+        'zh_Hans_MO'  => true,
+        'zh_Hans_SG'  => true,
+        'zh_Hant'     => true,
+        'zh_Hant_HK'  => true,
+        'zh_Hant_MO'  => true,
+        'zh_Hant_TW'  => true,
+        'zu'          => true,
+        'zu_ZA'       => true,
     );
 
     /**
@@ -1226,6 +1303,12 @@ class Zend_Locale
         $locale = self::_prepareLocale($locale);
 
         if (isset(self::$_localeData[(string) $locale]) === false) {
+            // Is it an alias? If so, we can use this locale
+            if (isset(self::$_localeAliases[$locale]) === true) {
+                $this->_locale = $locale;
+                return;
+            }
+
             $region = substr((string) $locale, 0, 3);
             if (isset($region[2]) === true) {
                 if (($region[2] === '_') or ($region[2] === '-')) {
@@ -1838,4 +1921,38 @@ class Zend_Locale
 
         return $languages;
     }
+
+    /**
+     * Is the given locale in the list of aliases?
+     *
+     * @param  string|Zend_Locale $locale Locale to work on
+     * @return boolean
+     */
+    public static function isAlias($locale)
+    {
+        if ($locale instanceof Zend_Locale) {
+            $locale = $locale->toString();
+        }
+
+        return isset(self::$_localeAliases[$locale]);
+    }
+
+    /**
+     * Return an alias' actual locale.
+     *
+     * @param  string|Zend_Locale $locale Locale to work on
+     * @return string
+     */
+    public static function getAlias($locale)
+    {
+        if ($locale instanceof Zend_Locale) {
+            $locale = $locale->toString();
+        }
+
+        if (isset(self::$_localeAliases[$locale]) === true) {
+            return self::$_localeAliases[$locale];
+        }
+
+        return (string) $locale;
+    }
 }
diff --git a/library/bombayworks/zendframework1/library/Zend/Locale/Data.php b/library/bombayworks/zendframework1/library/Zend/Locale/Data.php
index 04950fa9eb..a5f447bd51 100644
--- a/library/bombayworks/zendframework1/library/Zend/Locale/Data.php
+++ b/library/bombayworks/zendframework1/library/Zend/Locale/Data.php
@@ -292,6 +292,10 @@ class Zend_Locale_Data
             throw new Zend_Locale_Exception("Locale (" . (string) $locale . ") is a unknown locale");
         }
 
+        if (Zend_Locale::isAlias($locale)) {
+            // Return a valid CLDR locale so that the XML file can be loaded.
+            return Zend_Locale::getAlias($locale);
+        }
         return (string) $locale;
     }
 
diff --git a/library/bombayworks/zendframework1/library/Zend/Locale/Format.php b/library/bombayworks/zendframework1/library/Zend/Locale/Format.php
index 3046367ea7..7c632a4741 100644
--- a/library/bombayworks/zendframework1/library/Zend/Locale/Format.php
+++ b/library/bombayworks/zendframework1/library/Zend/Locale/Format.php
@@ -59,7 +59,7 @@ class Zend_Locale_Format
      * @param  array  $options  Array of options, keyed by option name: format_type = 'iso' | 'php', fix_date = true | false,
      *                          locale = Zend_Locale | locale string, precision = whole number between -1 and 30
      * @throws Zend_Locale_Exception
-     * @return Options array if no option was given
+     * @return array if no option was given
      */
     public static function setOptions(array $options = array())
     {
@@ -74,7 +74,7 @@ class Zend_Locale_Format
      * @param  array  $options  Array of options, keyed by option name: format_type = 'iso' | 'php', fix_date = true | false,
      *                          locale = Zend_Locale | locale string, precision = whole number between -1 and 30
      * @throws Zend_Locale_Exception
-     * @return Options array if no option was given
+     * @return array if no option was given
      */
     private static function _checkOptions(array $options = array())
     {
@@ -292,7 +292,7 @@ class Zend_Locale_Format
      * ##0.00 -> 12345.12345 -> 12345.12
      * ##,##0.00 -> 12345.12345 -> 12,345.12
      *
-     * @param   string  $input    Localized number string
+     * @param   string  $value    Localized number string
      * @param   array   $options  Options: number_format, locale, precision. See {@link setOptions()} for details.
      * @return  string  locale formatted number
      * @throws Zend_Locale_Exception
@@ -475,6 +475,12 @@ class Zend_Locale_Format
         return (string) $format;
     }
 
+    /**
+     * @param string $format
+     * @param string $value
+     * @param int $precision
+     * @return string
+     */
     private static function _seperateFormat($format, $value, $precision)
     {
         if (iconv_strpos($format, ';') !== false) {
@@ -531,7 +537,9 @@ class Zend_Locale_Format
      * Internal method to convert cldr number syntax into regex
      *
      * @param  string $type
+     * @param  array  $options Options: locale. See {@link setOptions()} for details.
      * @return string
+     * @throws Zend_Locale_Exception
      */
     private static function _getRegexForType($type, $options)
     {
@@ -631,7 +639,7 @@ class Zend_Locale_Format
     /**
      * Alias for getNumber
      *
-     * @param   string  $value    Number to localize
+     * @param   string  $input    Number to localize
      * @param   array   $options  Options: locale, precision. See {@link setOptions()} for details.
      * @return  float
      */
@@ -658,9 +666,9 @@ class Zend_Locale_Format
      * Returns if a float was found
      * Alias for isNumber()
      *
-     * @param   string  $input    Localized number string
-     * @param   array   $options  Options: locale. See {@link setOptions()} for details.
-     * @return  boolean           Returns true if a number was found
+     * @param   string $value  Localized number string
+     * @param   array $options Options: locale. See {@link setOptions()} for details.
+     * @return  boolean        Returns true if a number was found
      */
     public static function isFloat($value, array $options = array())
     {
@@ -706,9 +714,9 @@ class Zend_Locale_Format
     /**
      * Returns if a integer was found
      *
-     * @param   string  $input    Localized number string
-     * @param   array   $options  Options: locale. See {@link setOptions()} for details.
-     * @return  boolean           Returns true if a integer was found
+     * @param  string $value Localized number string
+     * @param  array $options Options: locale. See {@link setOptions()} for details.
+     * @return boolean Returns true if a integer was found
      */
     public static function isInteger($value, array $options = array())
     {
@@ -755,15 +763,16 @@ class Zend_Locale_Format
             }
         }
 
-        return join($values);
+        return implode($values);
     }
 
     /**
      * Parse date and split in named array fields
      *
-     * @param   string  $date     Date string to parse
-     * @param   array   $options  Options: format_type, fix_date, locale, date_format. See {@link setOptions()} for details.
-     * @return  array             Possible array members: day, month, year, hour, minute, second, fixed, format
+     * @param  string $date    Date string to parse
+     * @param  array  $options Options: format_type, fix_date, locale, date_format. See {@link setOptions()} for details.
+     * @return array Possible array members: day, month, year, hour, minute, second, fixed, format
+     * @throws Zend_Locale_Exception
      */
     private static function _parseDate($date, $options)
     {
@@ -1181,8 +1190,9 @@ class Zend_Locale_Format
     /**
      * Returns the default time format for $locale.
      *
-     * @param  string|Zend_Locale  $locale  OPTIONAL Locale of $number, possibly in string form (e.g. 'de_AT')
+     * @param  string|Zend_Locale $locale OPTIONAL Locale of $number, possibly in string form (e.g. 'de_AT')
      * @return string  format
+     * @throws Zend_Locale_Exception
      */
     public static function getTimeFormat($locale = null)
     {
@@ -1196,7 +1206,7 @@ class Zend_Locale_Format
 
     /**
      * Returns an array with 'hour', 'minute', and 'second' elements extracted from $time
-     * according to the order described in $format.  For a format of 'H:m:s', and
+     * according to the order described in $format.  For a format of 'H:i:s', and
      * an input of 11:20:55, getTime() would return:
      * array ('hour' => 11, 'minute' => 20, 'second' => 55)
      * The optional $locale parameter may be used to help extract times from strings
@@ -1219,8 +1229,9 @@ class Zend_Locale_Format
     /**
      * Returns the default datetime format for $locale.
      *
-     * @param  string|Zend_Locale  $locale  OPTIONAL Locale of $number, possibly in string form (e.g. 'de_AT')
+     * @param  string|Zend_Locale $locale OPTIONAL Locale of $number, possibly in string form (e.g. 'de_AT')
      * @return string  format
+     * @throws Zend_Locale_Exception
      */
     public static function getDateTimeFormat($locale = null)
     {
@@ -1234,7 +1245,7 @@ class Zend_Locale_Format
 
     /**
      * Returns an array with 'year', 'month', 'day', 'hour', 'minute', and 'second' elements
-     * extracted from $datetime according to the order described in $format.  For a format of 'd.M.y H:m:s',
+     * extracted from $datetime according to the order described in $format.  For a format of 'd.M.y H:i:s',
      * and an input of 10.05.1985 11:20:55, getDateTime() would return:
      * array ('year' => 1985, 'month' => 5, 'day' => 10, 'hour' => 11, 'minute' => 20, 'second' => 55)
      * The optional $locale parameter may be used to help extract times from strings
diff --git a/library/bombayworks/zendframework1/library/Zend/Mobile/Push/Message/Gcm.php b/library/bombayworks/zendframework1/library/Zend/Mobile/Push/Message/Gcm.php
index bf682c2752..51e1062a8e 100644
--- a/library/bombayworks/zendframework1/library/Zend/Mobile/Push/Message/Gcm.php
+++ b/library/bombayworks/zendframework1/library/Zend/Mobile/Push/Message/Gcm.php
@@ -267,6 +267,10 @@ class Zend_Mobile_Push_Message_Gcm extends Zend_Mobile_Push_Message_Abstract
         if ($this->_ttl !== 2419200) {
             $json['time_to_live'] = $this->_ttl;
         }
-        return json_encode($json);
+        if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
+            return json_encode($json, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+        } else {
+            return json_encode($json);
+        }
     }
 }
diff --git a/library/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Constraint/DomQuery37.php b/library/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Constraint/DomQuery37.php
index ec90835911..8151706dfa 100644
--- a/library/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Constraint/DomQuery37.php
+++ b/library/bombayworks/zendframework1/library/Zend/Test/PHPUnit/Constraint/DomQuery37.php
@@ -193,7 +193,7 @@ class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint
             case self::ASSERT_CONTENT_COUNT:
             case self::ASSERT_CONTENT_COUNT_MIN:
             case self::ASSERT_CONTENT_COUNT_MAX:
-                if (!$match) {
+                if ($match === false) {
                     // require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
                     throw new Zend_Test_PHPUnit_Constraint_Exception('No count provided against which to compare');
                 }
diff --git a/library/bombayworks/zendframework1/library/Zend/Test/PHPUnit/ControllerTestCase.php b/library/bombayworks/zendframework1/library/Zend/Test/PHPUnit/ControllerTestCase.php
index a0dfa744a5..eda235eba7 100644
--- a/library/bombayworks/zendframework1/library/Zend/Test/PHPUnit/ControllerTestCase.php
+++ b/library/bombayworks/zendframework1/library/Zend/Test/PHPUnit/ControllerTestCase.php
@@ -19,15 +19,6 @@
  * @version    $Id$
  */
 
-/** @see PHPUnit_Runner_Version */
-// require_once 'PHPUnit/Runner/Version.php';
-
-/**
- * Depending on version, include the proper PHPUnit support
- * @see PHPUnit_Autoload
- */
-// require_once (version_compare(PHPUnit_Runner_Version::id(), '3.5.0', '>=')) ? 'PHPUnit/Autoload.php' : 'PHPUnit/Framework.php';
-
 /** @see Zend_Controller_Front */
 // require_once 'Zend/Controller/Front.php';
 
diff --git a/library/bombayworks/zendframework1/library/Zend/Version.php b/library/bombayworks/zendframework1/library/Zend/Version.php
index d629776bd8..83d0d5161c 100644
--- a/library/bombayworks/zendframework1/library/Zend/Version.php
+++ b/library/bombayworks/zendframework1/library/Zend/Version.php
@@ -32,7 +32,7 @@ final class Zend_Version
     /**
      * Zend Framework version identification - see compareVersion()
      */
-    const VERSION = '1.12.4';
+    const VERSION = '1.12.6';
 
     /**
      * The latest stable version Zend Framework available