tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BUGFIX Disable performance intensive Zend_Locale::isLocale() valiations in Zend_Translate_Adapter, which is only used for i18n class in SilverStripe core, so a controlled environment where valid locales are assumed

This commit is contained in:
Ingo Schommer 2012-04-12 17:18:29 +02:00
parent 95cdbe9d2c
commit 9e95ba0045
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
thirdparty/Zend/Translate/Adapter.php vendored
View File

@ -720,34 +720,37 @@ abstract class Zend_Translate_Adapter {
}
}
if (!Zend_Locale::isLocale($locale, true, false)) {
if (!Zend_Locale::isLocale($locale, false, false)) {
// language does not exist, return original string
$this->_log($messageId, $locale);
// use rerouting when enabled
if (!empty($this->_options['route'])) {
if (array_key_exists($locale, $this->_options['route']) &&
!array_key_exists($locale, $this->_routed)) {
$this->_routed[$locale] = true;
return $this->translate($messageId, $this->_options['route'][$locale]);
}
}
// CUSTOM ischommer: Skip locale checks, too computationally expensive.
// Assume correct locale value is passed in.
// if (!Zend_Locale::isLocale($locale, true, false)) {
// if (!Zend_Locale::isLocale($locale, false, false)) {
// // language does not exist, return original string
// $this->_log($messageId, $locale);
// // use rerouting when enabled
// if (!empty($this->_options['route'])) {
// if (array_key_exists($locale, $this->_options['route']) &&
// !array_key_exists($locale, $this->_routed)) {
// $this->_routed[$locale] = true;
// return $this->translate($messageId, $this->_options['route'][$locale]);
// }
// }
$this->_routed = array();
if ($plural === null) {
return $messageId;
}
// $this->_routed = array();
// if ($plural === null) {
// return $messageId;
// }
$rule = Zend_Translate_Plural::getPlural($number, $plocale);
if (!isset($plural[$rule])) {
$rule = 0;
}
// $rule = Zend_Translate_Plural::getPlural($number, $plocale);
// if (!isset($plural[$rule])) {
// $rule = 0;
// }
return $plural[$rule];
}
// return $plural[$rule];
// }
$locale = new Zend_Locale($locale);
}
// $locale = new Zend_Locale($locale);
// }
// CUSTOM END
$locale = (string) $locale;
if ((is_string($messageId) || is_int($messageId)) && isset($this->_translate[$locale][$messageId])) {