diff -r 5e7a0fedabdf -r 877f952ae2bd web/lib/Zend/Locale/Data.php --- a/web/lib/Zend/Locale/Data.php Thu Mar 21 17:31:31 2013 +0100 +++ b/web/lib/Zend/Locale/Data.php Thu Mar 21 19:50:53 2013 +0100 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Locale * @subpackage Data - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Data.php 22712 2010-07-29 08:24:28Z thomas $ + * @version $Id: Data.php 24766 2012-05-06 02:51:42Z adamlundrigan $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Locale * @subpackage Data - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Locale_Data @@ -361,7 +361,7 @@ break; case 'type': - if (empty($type)) { + if (empty($value)) { $temp = self::_getFile($locale, '/ldml/localeDisplayNames/types/type', 'type'); } else { if (($value == 'calendar') or @@ -1139,6 +1139,10 @@ $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; + case 'decimalnumber': $temp = self::_getFile($locale, '/ldml/numbers/decimalFormats/decimalFormatLength/decimalFormat/pattern', '', 'default'); break;