Commit a7c68e15 authored by damjan's avatar damjan

[TASK] Renaming variable $langDefault -> $bottomReferenceLanguage

parent f1949376
......@@ -137,10 +137,10 @@ class EditFileController extends AbstractBackendController {
$langEdit = is_array($langData[$langList]) ? $langData[$langList] : array();
$langPattern = is_array($langData[$patternList]) ? $langData[$patternList] : array();
$bottomReferenceLanguageSelection = $this->session->getDataByKey('bottomReferenceLanguageSelection');
$langDefault = is_array($langData[$bottomReferenceLanguageSelection])
$bottomReferenceLanguage = is_array($langData[$bottomReferenceLanguageSelection])
? $langData[$bottomReferenceLanguageSelection] : array();
if (empty($langDefault)) {
$langDefault = is_array($langData['default']) ? $langData['default'] : array();
if (empty($bottomReferenceLanguage)) {
$bottomReferenceLanguage = is_array($langData['default']) ? $langData['default'] : array();
}
$langDataSessionContinued = $buttonType != 3;
......@@ -169,13 +169,13 @@ class EditFileController extends AbstractBackendController {
// get language data
if ($constTypeList == 'untranslated') {
$myLangData = array_diff_key($langDefault, $langEdit);
$myLangData = array_diff_key($bottomReferenceLanguage, $langEdit);
} elseif ($constTypeList == 'unknown') {
$myLangData = array_diff_key($langEdit, $langDefault);
$myLangData = array_diff_key($langEdit, $bottomReferenceLanguage);
} elseif ($constTypeList == 'translated') {
$myLangData = array_intersect_key($langDefault, $langEdit);
$myLangData = array_intersect_key($bottomReferenceLanguage, $langEdit);
} else {
$myLangData = $langDefault;
$myLangData = $bottomReferenceLanguage;
}
$this->session->setDataByKey('langfileEditConstantsList', array_keys($myLangData));
} elseif ($buttonType == 1) // back button
......@@ -222,7 +222,7 @@ class EditFileController extends AbstractBackendController {
// save information about the constant
$constValues[$constant]['edit'] = preg_replace('/<br.*>/U', "\n", $editLangVal);
$constValues[$constant]['pattern'] = preg_replace('/<br.*>/U', "\n", $editPatternVal);
$constValues[$constant]['default'] = $langDefault[$constant];
$constValues[$constant]['default'] = $bottomReferenceLanguage[$constant];
} while (++$sessionLangDataConstantsIterator % $numConstantsPerPage);
$this->session->setDataByKey('langfileEditNewLangData', $langfileEditNewLangData);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment