|
@@ -99,8 +99,9 @@ class Zend_Locale_Format
|
|
|
$options['number_format'] = Zend_Locale_Data::getContent($locale, 'decimalnumber');
|
|
$options['number_format'] = Zend_Locale_Data::getContent($locale, 'decimalnumber');
|
|
|
} else if ((gettype($value) !== 'string') and ($value !== NULL)) {
|
|
} else if ((gettype($value) !== 'string') and ($value !== NULL)) {
|
|
|
require_once 'Zend/Locale/Exception.php';
|
|
require_once 'Zend/Locale/Exception.php';
|
|
|
|
|
+ $stringValue = (string)(is_array($value) ? implode(' ', $value) : $value);
|
|
|
throw new Zend_Locale_Exception("Unknown number format type '" . gettype($value) . "'. "
|
|
throw new Zend_Locale_Exception("Unknown number format type '" . gettype($value) . "'. "
|
|
|
- . "Format '$value' must be a valid number format string.");
|
|
|
|
|
|
|
+ . "Format '$stringValue' must be a valid number format string.");
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
|
|
|
|
|
@@ -113,8 +114,9 @@ class Zend_Locale_Format
|
|
|
$options['date_format'] = Zend_Locale_Format::getDateFormat($locale);
|
|
$options['date_format'] = Zend_Locale_Format::getDateFormat($locale);
|
|
|
} else if ((gettype($value) !== 'string') and ($value !== NULL)) {
|
|
} else if ((gettype($value) !== 'string') and ($value !== NULL)) {
|
|
|
require_once 'Zend/Locale/Exception.php';
|
|
require_once 'Zend/Locale/Exception.php';
|
|
|
|
|
+ $stringValue = (string)(is_array($value) ? implode(' ', $value) : $value);
|
|
|
throw new Zend_Locale_Exception("Unknown dateformat type '" . gettype($value) . "'. "
|
|
throw new Zend_Locale_Exception("Unknown dateformat type '" . gettype($value) . "'. "
|
|
|
- . "Format '$value' must be a valid ISO or PHP date format string.");
|
|
|
|
|
|
|
+ . "Format '$stringValue' must be a valid ISO or PHP date format string.");
|
|
|
} else {
|
|
} else {
|
|
|
if (((isset($options['format_type']) === true) and ($options['format_type'] == 'php')) or
|
|
if (((isset($options['format_type']) === true) and ($options['format_type'] == 'php')) or
|
|
|
((isset($options['format_type']) === false) and (self::$_options['format_type'] == 'php'))) {
|
|
((isset($options['format_type']) === false) and (self::$_options['format_type'] == 'php'))) {
|