tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX Ensuring that every locale (and its lang part) are registered as languages in i18n::include_by_locale() to avoid expensive re-parsing on subsequent i18n::_t() calls to the same locale

Browse Source
This commit is contained in:
Ingo Schommer 2011-12-04 18:36:45 +01:00
parent bd23a07bba
commit 0e0e5dd07a
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
i18n/i18n.php
View File

@ -1460,16 +1460,19 @@ class i18n extends Object implements TemplateGlobalProvider {
* @return string The translated string, according to the currently set locale {@link i18n::set_locale()}
*/
static function _t($entity, $string = "", $priority = 40, $context = "") {
// get current locale (either default or user preference)
$locale = i18n::get_locale();
$lang = i18n::get_lang_from_locale($locale);
foreach(self::get_translators() as $priority => $translators) {
foreach($translators as $name => $translator) {
$adapter = $translator->getAdapter();
// get current locale (either default or user preference)
$locale = i18n::get_locale();
$adapter->setLocale($locale);
// if language table isn't loaded for this locale, get it for each of the modules
if(!$adapter->isAvailable($locale)) i18n::include_by_locale($locale);
if(!$adapter->isAvailable($locale) && !$adapter->isAvailable($lang)) {
i18n::include_by_locale($locale);
}
$translation = $adapter->translate($entity, $locale);
@ -1927,6 +1930,18 @@ class i18n extends Object implements TemplateGlobalProvider {
}
}
}
// Add empty translations to ensure the locales are "registered" with isAvailable(),
// and the next invocation of include_by_locale() doesn't cause a new reparse.
foreach($selectedLocales as $selectedLocale) {
$adapter->addTranslation(
array(
'content' => array('_' => '_'),
'locale' => $selectedLocale,
'usetranslateadapter' => true
)
);
}
}
}
}