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

Fixed merge error

Browse Source 
See 00ffe72944
This commit is contained in:
Ingo Schommer 2013-08-07 17:33:06 +02:00
parent afe06661ef
commit c78c0aa828
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
i18n/i18n.php
View File

@ -2224,12 +2224,19 @@ class i18n extends Object implements TemplateGlobalProvider {
$allLocales = Config::inst()->get('i18n', 'all_locales');
$moduleLocales = scandir("{$module}/lang/");
foreach($moduleLocales as $moduleLocale) {
preg_match('/(.*)\.[\w\d]+$/',$moduleLocale, $matches);
if($locale = @$matches[1]) {
// Normalize locale to include likely region tag.
$locale = pathinfo($moduleLocale, PATHINFO_FILENAME);
$ext = pathinfo($moduleLocale, PATHINFO_EXTENSION);
if($locale && in_array($ext, array('php','yml'))) {
// Normalize locale to include likely region tag, avoid repetition in locale labels
// TODO Replace with CLDR list of actually available languages/regions
$locale = str_replace('-', '_', self::get_locale_from_lang($locale));
$locales[$locale] = (isset($allLocales[$locale])) ? $allLocales[$locale] : $locale;
// Only allow explicitly registered locales, otherwise we'll get into trouble
// if the locale doesn't exist in Zend's CLDR data
$labelLocale = str_replace('-', '_', self::get_locale_from_lang($locale));
if(isset(self::$all_locales[$locale])) {
$locales[$locale] = self::$all_locales[$locale];
} else if(isset(self::$all_locales[$labelLocale])) {
$locales[$locale] = self::$all_locales[$labelLocale];
}
}
}
}