tweet_live: comparison web/lib/Zend/Locale/Data.php

equal deleted inserted replaced

-:5a6b6e770365
+:68c69c656a2c
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Locale
 * @subpackage Data
-* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
-* @version    $Id: Data.php 24766 2012-05-06 02:51:42Z adamlundrigan $
+* @version    $Id$
 */
 /**
 * include needed classes
 */
 require_once 'Zend/Locale.php';
+/** @see Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
 /**
 * Locale data reader, handles the CLDR
 *
 * @category   Zend
 * @package    Zend_Locale
 * @subpackage Data
-* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Locale_Data
 {
 /**
 * Locale files
 *
-* @var ressource
+* @var array
-* @access private
 */
 private static $_ldml = array();
 /**
 * List of values which are collected
 *
 * @var array
-* @access private
 */
 private static $_list = array();
 /**
 * Internal cache for ldml values
 *
 * @var Zend_Cache_Core
-* @access private
 */
 private static $_cache = null;
 /**
 * Internal value to remember if cache supports tags
 private static $_cacheTags = false;
 /**
 * Internal option, cache disabled
 *
-* @var    boolean
+* @var boolean
-* @access private
 */
 private static $_cacheDisabled = false;
 /**
 * Read the content from locale
 * @param  string $locale
 * @param  string $path
 * @param  string $attribute
 * @param  string $value
 * @param  array  $temp
+* @return bool
 * @throws Zend_Locale_Exception
-* @access private
 */
 private static function _findRoute($locale, $path, $attribute, $value, &$temp)
 {
 // load locale file if not already in cache
 // needed for alias tag when referring to other locale
 if (!file_exists($filename)) {
 require_once 'Zend/Locale/Exception.php';
 throw new Zend_Locale_Exception("Missing locale file '$filename' for '$locale' locale.");
 }
-self::$_ldml[(string) $locale] = simplexml_load_file($filename);
+self::$_ldml[(string) $locale] = Zend_Xml_Security::scanFile($filename);
 }
 // search for 'alias' tag in the search path for redirection
 $search = '';
 $tok = strtok($path, '/');
 }
 /**
 * Read the right LDML file
 *
-* @param  string $locale
+* @param  string      $locale
-* @param  string $path
+* @param  string      $path
-* @param  string $attribute
+* @param  string|bool $attribute
-* @param  string $value
+* @param  string|bool $value
-* @access private
+* @param  array       $temp
+* @return array
+* @throws Zend_Locale_Exception
 */
 private static function _getFile($locale, $path, $attribute = false, $value = false, $temp = array())
 {
 $result = self::_findRoute($locale, $path, $attribute, $value, $temp);
 if ($result) {
 }
 /**
 * Internal function for checking the locale
 *
-* @param string|Zend_Locale $locale Locale to check
+* @param  string|Zend_Locale $locale Locale to check
 * @return string
+* @throws Zend_Locale_Exception
 */
 private static function _checkLocale($locale)
 {
 if (empty($locale)) {
 $locale = new Zend_Locale();
 if (!(Zend_Locale::isLocale((string) $locale, null, false))) {
 require_once 'Zend/Locale/Exception.php';
 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;
 }
 /**
 * Read the LDML file, get a array of multipath defined value
 *
-* @param  string $locale
+* @param  string      $locale
-* @param  string $path
+* @param  string      $path
-* @param  string $value
+* @param  bool|string $value
 * @return array
-* @access public
+* @throws Zend_Locale_Exception
 */
 public static function getList($locale, $path, $value = false)
 {
 $locale = self::_checkLocale($locale);
 if (is_array($value)) {
 $val = implode('_' , $value);
 }
 $val = urlencode($val);
-$id = strtr('Zend_LocaleL_' . $locale . '_' . $path . '_' . $val, array('-' => '_', '%' => '_', '+' => '_'));
+$id  = self::_filterCacheId('Zend_LocaleL_' . $locale . '_' . $path . '_' . $val);
 if (!self::$_cacheDisabled && ($result = self::$_cache->load($id))) {
 return unserialize($result);
 }
 $temp = array();
 case 'territory':
 $temp = self::_getFile($locale, '/ldml/localeDisplayNames/territories/territory', 'type');
 if ($value === 1) {
 foreach($temp as $key => $value) {
-if ((is_numeric($key) === false) and ($key != 'QO') and ($key != 'QU')) {
+if ((is_numeric($key) === false) and ($key != 'QO') and ($key != 'EU')) {
 unset($temp[$key]);
 }
 }
 } else if ($value === 2) {
 foreach($temp as $key => $value) {
-if (is_numeric($key) or ($key == 'QO') or ($key == 'QU')) {
+if (is_numeric($key) or ($key == 'QO') or ($key == 'EU')) {
 unset($temp[$key]);
 }
 }
 }
 break;
 }
 }
 break;
 case 'layout':
-$temp  = self::_getFile($locale, '/ldml/layout/orientation',                 'lines',      'lines');
+$temp  = self::_getFile($locale, '/ldml/layout/orientation/characterOrder', '', 'characterOrder');
-$temp += self::_getFile($locale, '/ldml/layout/orientation',                 'characters', 'characters');
+$temp += self::_getFile($locale, '/ldml/layout/orientation/lineOrder', '', 'lineOrder');
-$temp += self::_getFile($locale, '/ldml/layout/inList',                      '',           'inList');
+break;
-$temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'currency\']',  '',           'currency');
-$temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'dayWidth\']',  '',           'dayWidth');
+case 'contexttransform':
-$temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'fields\']',    '',           'fields');
+if (empty($value)) {
-$temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'keys\']',      '',           'keys');
+$value = 'uiListOrMenu';
-$temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'languages\']', '',           'languages');
+}
-$temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'long\']',      '',           'long');
+$temp = self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'languages\']/contextTransform[@type=\''.$value.'\']', '', 'languages');
-$temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'measurementSystemNames\']', '', 'measurementSystemNames');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'day-format-except-narrow\']/contextTransform[@type=\''.$value.'\']', '', 'day-format-except-narrow');
-$temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'monthWidth\']',   '',        'monthWidth');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'day-standalone-except-narrow\']/contextTransform[@type=\''.$value.'\']', '', 'day-standalone-except-narrow');
-$temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'quarterWidth\']', '',        'quarterWidth');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'day-narrow\']/contextTransform[@type=\''.$value.'\']', '', 'day-narrow');
-$temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'scripts\']',   '',           'scripts');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'month-format-except-narrow\']/contextTransform[@type=\''.$value.'\']', '', 'month-format-except-narrow');
-$temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'territories\']',  '',        'territories');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'month-standalone-except-narrow\']/contextTransform[@type=\''.$value.'\']', '', 'month-standalone-except-narrow');
-$temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'types\']',     '',           'types');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'month-narrow\']/contextTransform[@type=\''.$value.'\']', '', 'month-narrow');
-$temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'variants\']',  '',           'variants');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'script\']/contextTransform[@type=\''.$value.'\']', '', 'script');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'territory\']/contextTransform[@type=\''.$value.'\']', '', 'territory');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'variant\']/contextTransform[@type=\''.$value.'\']', '', 'variant');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'key\']/contextTransform[@type=\''.$value.'\']', '', 'key');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'type\']/contextTransform[@type=\''.$value.'\']', '', 'type');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'era-name\']/contextTransform[@type=\''.$value.'\']', '', 'era-name');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'era-abbr\']/contextTransform[@type=\''.$value.'\']', '', 'era-abbr');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'era-narrow\']/contextTransform[@type=\''.$value.'\']', '', 'era-narrow');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'quater-format-wide\']/contextTransform[@type=\''.$value.'\']', '', 'quater-format-wide');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'quater-standalone-wide\']/contextTransform[@type=\''.$value.'\']', '', 'quater-standalone-wide');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'quater-abbreviated\']/contextTransform[@type=\''.$value.'\']', '', 'quater-abbreviated');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'quater-narrow\']/contextTransform[@type=\''.$value.'\']', '', 'quater-narrow');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'calendar-field\']/contextTransform[@type=\''.$value.'\']', '', 'calendar-field');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'symbol\']/contextTransform[@type=\''.$value.'\']', '', 'symbol');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'tense\']/contextTransform[@type=\''.$value.'\']', '', 'tense');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'zone-exemplarCity\']/contextTransform[@type=\''.$value.'\']', '', 'zone-exemplarCity');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'zone-long\']/contextTransform[@type=\''.$value.'\']', '', 'zone-long');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'zone-short\']/contextTransform[@type=\''.$value.'\']', '', 'zone-short');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'metazone-long\']/contextTransform[@type=\''.$value.'\']', '', 'metazone-long');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'metazone-short\']/contextTransform[@type=\''.$value.'\']', '', 'metazone-short');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'displayName-count\']/contextTransform[@type=\''.$value.'\']', '', 'displayName-count');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'displayName\']/contextTransform[@type=\''.$value.'\']', '', 'displayName');
+$temp += self::_getFile($locale, '/ldml/contextTransforms/contextTransformUsage[@type=\'unit-pattern\']/contextTransform[@type=\''.$value.'\']', '', 'unit-pattern');
 break;
 case 'characters':
 $temp  = self::_getFile($locale, '/ldml/characters/exemplarCharacters',                           '', 'characters');
 $temp += self::_getFile($locale, '/ldml/characters/exemplarCharacters[@type=\'auxiliary\']',      '', 'auxiliary');
-$temp += self::_getFile($locale, '/ldml/characters/exemplarCharacters[@type=\'currencySymbol\']', '', 'currencySymbol');
+// $temp += self::_getFile($locale, '/ldml/characters/exemplarCharacters[@type=\'currencySymbol\']', '', 'currencySymbol');
 break;
 case 'delimiters':
 $temp  = self::_getFile($locale, '/ldml/delimiters/quotationStart',          '', 'quoteStart');
 $temp += self::_getFile($locale, '/ldml/delimiters/quotationEnd',            '', 'quoteEnd');
 case 'months':
 if (empty($value)) {
 $value = "gregorian";
 }
-$temp  = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/default', 'choice', 'context');
+$temp['context'] = "format";
-$temp += self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/monthContext[@type=\'format\']/default', 'choice', 'default');
+$temp['default'] = "wide";
 $temp['format']['abbreviated'] = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/monthContext[@type=\'format\']/monthWidth[@type=\'abbreviated\']/month', 'type');
 $temp['format']['narrow']      = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/monthContext[@type=\'format\']/monthWidth[@type=\'narrow\']/month', 'type');
 $temp['format']['wide']        = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/monthContext[@type=\'format\']/monthWidth[@type=\'wide\']/month', 'type');
 $temp['stand-alone']['abbreviated']  = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/monthContext[@type=\'stand-alone\']/monthWidth[@type=\'abbreviated\']/month', 'type');
 $temp['stand-alone']['narrow']       = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/monthContext[@type=\'stand-alone\']/monthWidth[@type=\'narrow\']/month', 'type');
 case 'days':
 if (empty($value)) {
 $value = "gregorian";
 }
-$temp  = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/default', 'choice', 'context');
+$temp['context'] = "format";
-$temp += self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/dayContext[@type=\'format\']/default', 'choice', 'default');
+$temp['default'] = "wide";
 $temp['format']['abbreviated'] = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/dayContext[@type=\'format\']/dayWidth[@type=\'abbreviated\']/day', 'type');
 $temp['format']['narrow']      = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/dayContext[@type=\'format\']/dayWidth[@type=\'narrow\']/day', 'type');
 $temp['format']['wide']        = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/dayContext[@type=\'format\']/dayWidth[@type=\'wide\']/day', 'type');
 $temp['stand-alone']['abbreviated']  = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/dayContext[@type=\'stand-alone\']/dayWidth[@type=\'abbreviated\']/day', 'type');
 $temp['stand-alone']['narrow']       = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/dayContext[@type=\'stand-alone\']/dayWidth[@type=\'narrow\']/day', 'type');
 case 'field':
 if (empty($value)) {
 $value = "gregorian";
 }
-$temp2 = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/fields/field', 'type');
+$temp2 = self::_getFile($locale, '/ldml/dates/fields/field', 'type');
+// $temp2 = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/fields/field', 'type');
 foreach ($temp2 as $key => $keyvalue) {
-$temp += self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/fields/field[@type=\'' . $key . '\']/displayName', '', $key);
+$temp += self::_getFile($locale, '/ldml/dates/fields/field[@type=\'' . $key . '\']/displayName', '', $key);
+// $temp += self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/fields/field[@type=\'' . $key . '\']/displayName', '', $key);
 }
 break;
 case 'relative':
 if (empty($value)) {
-$value = "gregorian";
+$value = "day";
 }
-$temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/fields/field/relative', 'type');
+$temp = self::_getFile($locale, '/ldml/dates/fields/field[@type=\'' . $value . '\']/relative', 'type');
 break;
 case 'symbols':
 $temp  = self::_getFile($locale, '/ldml/numbers/symbols/decimal',         '', 'decimal');
 $temp += self::_getFile($locale, '/ldml/numbers/symbols/group',           '', 'group');
 }
 }
 break;
 case 'timezonetowindows':
-$_temp = self::_getFile('supplementalData', '/supplementalData/timezoneData/mapTimezones[@type=\'windows\']/mapZone', 'other');
+$_temp = self::_getFile('windowsZones', '/supplementalData/windowsZones/mapTimezones/mapZone', 'other');
 foreach ($_temp as $key => $found) {
-$temp += self::_getFile('supplementalData', '/supplementalData/timezoneData/mapTimezones[@type=\'windows\']/mapZone[@other=\'' . $key . '\']', 'type', $key);
+$temp += self::_getFile('windowsZones', '/supplementalData/windowsZones/mapTimezones/mapZone[@other=\'' . $key . '\']', 'type', $key);
 }
 break;
 case 'windowstotimezone':
-$_temp = self::_getFile('supplementalData', '/supplementalData/timezoneData/mapTimezones[@type=\'windows\']/mapZone', 'type');
+$_temp = self::_getFile('windowsZones', '/supplementalData/windowsZones/mapTimezones/mapZone', 'type');
 foreach ($_temp as $key => $found) {
-$temp += self::_getFile('supplementalData', '/supplementalData/timezoneData/mapTimezones[@type=\'windows\']/mapZone[@type=\'' .$key . '\']', 'other', $key);
+$temp += self::_getFile('windowsZones', '/supplementalData/windowsZones/mapTimezones/mapZone[@type=\'' .$key . '\']', 'other', $key);
 }
 break;
 case 'territorytotimezone':
-$_temp = self::_getFile('supplementalData', '/supplementalData/timezoneData/zoneFormatting/zoneItem', 'type');
+$_temp = self::_getFile('metaZones', '/supplementalData/metaZones/mapTimezones/mapZone', 'type');
 foreach ($_temp as $key => $found) {
-$temp += self::_getFile('supplementalData', '/supplementalData/timezoneData/zoneFormatting/zoneItem[@type=\'' . $key . '\']', 'territory', $key);
+$temp += self::_getFile('metaZones', '/supplementalData/metaZones/mapTimezones/mapZone[@type=\'' . $key . '\']', 'territory', $key);
 }
 break;
 case 'timezonetoterritory':
-$_temp = self::_getFile('supplementalData', '/supplementalData/timezoneData/zoneFormatting/zoneItem', 'territory');
+$_temp = self::_getFile('metaZones', '/supplementalData/metaZones/mapTimezones/mapZone', 'territory');
 foreach ($_temp as $key => $found) {
-$temp += self::_getFile('supplementalData', '/supplementalData/timezoneData/zoneFormatting/zoneItem[@territory=\'' . $key . '\']', 'type', $key);
+$temp += self::_getFile('metaZones', '/supplementalData/metaZones/mapTimezones/mapZone[@territory=\'' . $key . '\']', 'type', $key);
 }
 break;
 case 'citytotimezone':
 $_temp = self::_getFile($locale, '/ldml/dates/timeZoneNames/zone', 'type');
 $temp += self::_getFile('likelySubtags', '/supplementalData/likelySubtags/likelySubtag[@from=\'' . $key . '\']', 'to', $key);
 }
 break;
 case 'unit':
-$_temp = self::_getFile($locale, '/ldml/units/unit', 'type');
+$_temp = self::_getFile($locale, '/ldml/units/unitLength/unit', 'type');
 foreach($_temp as $key => $keyvalue) {
-$_temp2 = self::_getFile($locale, '/ldml/units/unit[@type=\'' . $key . '\']/unitPattern', 'count');
+$_temp2 = self::_getFile($locale, '/ldml/units/unitLength/unit[@type=\'' . $key . '\']/unitPattern', 'count');
 $temp[$key] = $_temp2;
 }
 break;
 default :
 }
 /**
 * Read the LDML file, get a single path defined value
 *
-* @param  string $locale
+* @param  string      $locale
-* @param  string $path
+* @param  string      $path
-* @param  string $value
+* @param  bool|string $value
 * @return string
-* @access public
+* @throws Zend_Locale_Exception
 */
 public static function getContent($locale, $path, $value = false)
 {
 $locale = self::_checkLocale($locale);
 $val = $value;
 if (is_array($value)) {
 $val = implode('_' , $value);
 }
 $val = urlencode($val);
-$id = strtr('Zend_LocaleC_' . $locale . '_' . $path . '_' . $val, array('-' => '_', '%' => '_', '+' => '_'));
+$id  = self::_filterCacheId('Zend_LocaleC_' . $locale . '_' . $path . '_' . $val);
 if (!self::$_cacheDisabled && ($result = self::$_cache->load($id))) {
 return unserialize($result);
 }
 switch(strtolower($path)) {
 case 'key':
 $temp = self::_getFile($locale, '/ldml/localeDisplayNames/keys/key[@type=\'' . $value . '\']', 'type');
 break;
 case 'defaultcalendar':
-$temp = self::_getFile($locale, '/ldml/dates/calendars/default', 'choice', 'default');
+$givenLocale = new Zend_Locale($locale);
+$territory = $givenLocale->getRegion();
+unset($givenLocale);
+$temp = self::_getFile('supplementalData', '/supplementalData/calendarPreferenceData/calendarPreference[contains(@territories,\'' . $territory . '\')]', 'ordering', 'ordering');
+if (isset($temp['ordering'])) {
+list($temp) = explode(' ', $temp['ordering']);
+} else {
+$temp = 'gregorian';
+}
 break;
 case 'monthcontext':
+/* default context is always 'format'
 if (empty ($value)) {
 $value = "gregorian";
 }
 $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/default', 'choice', 'context');
+*/
+$temp = 'format';
 break;
 case 'defaultmonth':
+/* default width is always 'wide'
 if (empty ($value)) {
 $value = "gregorian";
 }
 $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/monthContext[@type=\'format\']/default', 'choice', 'default');
+*/
+$temp = 'wide';
 break;
 case 'month':
 if (!is_array($value)) {
 $temp = $value;
 }
 $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/months/monthContext[@type=\'' . $value[1] . '\']/monthWidth[@type=\'' . $value[2] . '\']/month[@type=\'' . $value[3] . '\']', 'type');
 break;
 case 'daycontext':
+/* default context is always 'format'
 if (empty($value)) {
 $value = "gregorian";
 }
 $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/default', 'choice', 'context');
+*/
+$temp = 'format';
 break;
 case 'defaultday':
+/* default width is always 'wide'
 if (empty($value)) {
 $value = "gregorian";
 }
 $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/dayContext[@type=\'format\']/default', 'choice', 'default');
+*/
+$temp = 'wide';
 break;
 case 'day':
 if (!is_array($value)) {
 $temp = $value;
 $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/quarters/quarterContext[@type=\'' . $value[1] . '\']/quarterWidth[@type=\'' . $value[2] . '\']/quarter[@type=\'' . $value[3] . '\']', 'type');
 break;
 case 'am':
 if (empty($value)) {
-$value = "gregorian";
+$value = array("gregorian", "format", "wide");
 }
-$temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/am', '', 'am');
+if (!is_array($value)) {
+$temp = $value;
+$value = array($temp, "format", "wide");
+}
+$temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/dayPeriods/dayPeriodContext[@type=\'' . $value[1] . '\']/dayPeriodWidth[@type=\'' . $value[2] . '\']/dayPeriod[@type=\'am\']', '', 'dayPeriod');
 break;
 case 'pm':
 if (empty($value)) {
-$value = "gregorian";
+$value = array("gregorian", "format", "wide");
 }
-$temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/pm', '', 'pm');
+if (!is_array($value)) {
+$temp = $value;
+$value = array($temp, "format", "wide");
+}
+$temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/dayPeriods/dayPeriodContext[@type=\'' . $value[1] . '\']/dayPeriodWidth[@type=\'' . $value[2] . '\']/dayPeriod[@type=\'pm\']', '', 'dayPeriod');
 break;
 case 'era':
 if (!is_array($value)) {
 $temp = $value;
 }
 $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/eras/era' . $value[1] . '/era[@type=\'' . $value[2] . '\']', 'type');
 break;
 case 'defaultdate':
+/* default choice is deprecated in CDLR - should be always medium here
 if (empty($value)) {
 $value = "gregorian";
 }
 $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateFormats/default', 'choice', 'default');
+*/
+$temp = 'medium';
 break;
 case 'date':
 if (empty($value)) {
 $value = array("gregorian", "medium");
 }
 $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/dateFormats/dateFormatLength[@type=\'' . $value[1] . '\']/dateFormat/pattern', '', 'pattern');
 break;
 case 'defaulttime':
+/* default choice is deprecated in CDLR - should be always medium here
 if (empty($value)) {
 $value = "gregorian";
 }
 $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/timeFormats/default', 'choice', 'default');
+*/
+$temp = 'medium';
 break;
 case 'time':
 if (empty($value)) {
 $value = array("gregorian", "medium");
 case 'field':
 if (!is_array($value)) {
 $temp = $value;
 $value = array("gregorian", $temp);
 }
-$temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/fields/field[@type=\'' . $value[1] . '\']/displayName', '', $value[1]);
+$temp = self::_getFile($locale, '/ldml/dates/fields/field[@type=\'' . $value[1] . '\']/displayName', '', $value[1]);
 break;
 case 'relative':
 if (!is_array($value)) {
 $temp = $value;
 $value = array("gregorian", $temp);
 }
-$temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/fields/field/relative[@type=\'' . $value[1] . '\']', '', $value[1]);
+$temp = self::_getFile($locale, '/ldml/dates/fields/field[@type=\'day\']/relative[@type=\'' . $value[1] . '\']', '', $value[1]);
+// $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/fields/field/relative[@type=\'' . $value[1] . '\']', '', $value[1]);
 break;
 case 'defaultnumberingsystem':
 $temp = self::_getFile($locale, '/ldml/numbers/defaultNumberingSystem', '', 'default');
 break;
 }
 }
 break;
 case 'timezonetowindows':
-$temp = self::_getFile('supplementalData', '/supplementalData/timezoneData/mapTimezones[@type=\'windows\']/mapZone[@other=\''.$value.'\']', 'type', $value);
+$temp = self::_getFile('windowsZones', '/supplementalData/windowsZones/mapTimezones/mapZone[@other=\''.$value.'\']', 'type', $value);
 break;
 case 'windowstotimezone':
-$temp = self::_getFile('supplementalData', '/supplementalData/timezoneData/mapTimezones[@type=\'windows\']/mapZone[@type=\''.$value.'\']', 'other', $value);
+$temp = self::_getFile('windowsZones', '/supplementalData/windowsZones/mapTimezones/mapZone[@type=\''.$value.'\']', 'other', $value);
 break;
 case 'territorytotimezone':
-$temp = self::_getFile('supplementalData', '/supplementalData/timezoneData/zoneFormatting/zoneItem[@type=\'' . $value . '\']', 'territory', $value);
+$temp = self::_getFile('metaZones', '/supplementalData/metaZones/mapTimezones/mapZone[@type=\'' . $value . '\']', 'territory', $value);
 break;
 case 'timezonetoterritory':
-$temp = self::_getFile('supplementalData', '/supplementalData/timezoneData/zoneFormatting/zoneItem[@territory=\'' . $value . '\']', 'type', $value);
+$temp = self::_getFile('metaZones', '/supplementalData/metaZones/mapTimezones/mapZone[@territory=\'' . $value . '\']', 'type', $value);
 break;
 case 'citytotimezone':
 $temp = self::_getFile($locale, '/ldml/dates/timeZoneNames/zone[@type=\'' . $value . '\']/exemplarCity', '', $value);
 break;
 case 'localeupgrade':
 $temp = self::_getFile('likelySubtags', '/supplementalData/likelySubtags/likelySubtag[@from=\'' . $value . '\']', 'to', $value);
 break;
 case 'unit':
-$temp = self::_getFile($locale, '/ldml/units/unit[@type=\'' . $value[0] . '\']/unitPattern[@count=\'' . $value[1] . '\']', '');
+$temp = self::_getFile($locale, '/ldml/units/unitLength/unit[@type=\'' . $value[0] . '\']/unitPattern[@count=\'' . $value[1] . '\']', '');
 break;
 default :
 require_once 'Zend/Locale/Exception.php';
 throw new Zend_Locale_Exception("Unknown detail ($path) for parsing locale data.");
 }
 /**
 * Disables the cache
 *
-* @param unknown_type $flag
+* @param bool $flag
 */
 public static function disableCache($flag)
 {
 self::$_cacheDisabled = (boolean) $flag;
 }
 /**
 * Internal method to check if the given cache supports tags
 *
-* @param Zend_Cache $cache
+* @return bool
 */
 private static function _getTagSupportForCache()
 {
 $backend = self::$_cache->getBackend();
 if ($backend instanceof Zend_Cache_Backend_ExtendedInterface) {
 self::$_cacheTags = false;
 }
 return self::$_cacheTags;
 }
+/**
+* Filter an ID to only allow valid variable characters
+*
+* @param  string $value
+* @return string
+*/
+protected static function _filterCacheId($value)
+{
+return strtr(
+$value,
+array(
+'-' => '_',
+'%' => '_',
+'+' => '_',
+'.' => '_',
+)
+);
+}
 }

changeset 1230	68c69c656a2c
parent 807	877f952ae2bd