Fixed bug #6903: Translated language files are not loaded
authorDmitry Dulepov <dmitry.dulepov@gmail.com>
Fri, 7 Dec 2007 07:34:21 +0000 (07:34 +0000)
committerDmitry Dulepov <dmitry.dulepov@gmail.com>
Fri, 7 Dec 2007 07:34:21 +0000 (07:34 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/branches/TYPO3_4-1@2806 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/class.t3lib_div.php

index 209628e..f3ecdd5 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-07     Dmitry Dulepov  <dmitry@typo3.org>
+
+       * Fixed bug #6903: Translated language files are not loaded
+
 2007-12-06  Benjamin Mack  <mack@xnos.org>
 
         * (bugfix) Fixed #1678: limit to language; still can delete and move content element (Thanks to Helmut Hummel)
index e35a53f..d2d3484 100755 (executable)
@@ -3655,9 +3655,8 @@ class t3lib_div {
                                if ($langKey!='default')        {
 
                                                // If no entry is found for the language key, then force a value depending on meta-data setting. By default an automated filename will be used:
-                                       if (!isset($xmlContent['data'][$langKey]))      {
-                                               $LOCAL_LANG[$langKey] = t3lib_div::llXmlAutoFileName($fileRef, $langKey);
-                                       } else {
+                                       $LOCAL_LANG[$langKey] = t3lib_div::llXmlAutoFileName($fileRef, $langKey);
+                                       if (!$LOCAL_LANG[$langKey] && isset($xmlContent['data'][$langKey]))     {
                                                $LOCAL_LANG[$langKey] = $xmlContent['data'][$langKey];
                                        }