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

MINOR Hardcoding correct module priorities in i18n.php

Browse Source
This commit is contained in:
Ingo Schommer 2012-04-13 17:39:25 +02:00
parent 9e95ba0045
commit 3002598a5e
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
i18n/i18n.php
View File

@ -1876,12 +1876,25 @@ class i18n extends Object implements TemplateGlobalProvider {
// TODO Also include custom Zend_Translate routing languages // TODO Also include custom Zend_Translate routing languages
$selectedLocales = array_unique(array($lang, $locale)); $selectedLocales = array_unique(array($lang, $locale));
// Sort modules by inclusion priority, then alphabetically
// TODO Should be handled by priority flags within modules
$prios = array('sapphire' => 10, 'framework' => 10, 'admin' => 11, 'cms' => 12, 'mysite' => 90);
$modules = SS_ClassLoader::instance()->getManifest()->getModules();
ksort($modules);
uksort(
$modules,
function($a, $b) use(&$prios) {
$prioA = (isset($prios[$a])) ? $prios[$a] : 50;
$prioB = (isset($prios[$b])) ? $prios[$b] : 50;
return ($prioA > $prioB);
}
);
// Loop in reverse order, meaning the translator with the highest priority goes first // Loop in reverse order, meaning the translator with the highest priority goes first
$translators = array_reverse(self::get_translators(), true); $translators = array_reverse(self::get_translators(), true);
foreach($translators as $priority => $translators) { foreach($translators as $priority => $translators) {
foreach($translators as $name => $translator) { foreach($translators as $name => $translator) {
$adapter = $translator->getAdapter(); $adapter = $translator->getAdapter();
$modules = SS_ClassLoader::instance()->getManifest()->getModules();
// Load translations from modules // Load translations from modules
foreach($modules as $module) { foreach($modules as $module) {