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

FIX: Allow both 3.0 and 3.1 syntax for i18n

Browse Source
This commit is contained in:
Sam Minnee 2013-05-06 18:46:03 +12:00
parent 9daff5f2d0
commit 2ab36ff777
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/model/Translatable.php
View File

@ -1464,7 +1464,8 @@ class Translatable extends DataExtension implements PermissionProvider {
foreach ($langlist as $langCode) { foreach ($langlist as $langCode) {
if($langCode && isset($allCodes[$langCode])) { if($langCode && isset($allCodes[$langCode])) {
if(is_array($allCodes[$langCode])) { if(is_array($allCodes[$langCode])) {
$returnMap[$langCode] = $allCodes[$langCode]['name']; if(isset($allCodes[$langCode]['name'])) $returnMap[$langCode] = $allCodes[$langCode]['name'];
else $returnMap[$langCode] = $allCodes[$langCode][0];
} else { } else {
$returnMap[$langCode] = $allCodes[$langCode]; $returnMap[$langCode] = $allCodes[$langCode];
} }