- fix: fallback labels/messages ignored from en_US localisation files after r1360 (#1485057)

release-0.6
alecpl 17 years ago
parent 885ebb8da2
commit 9d9f8dc834

@ -588,9 +588,9 @@ class rcmail
@include(INSTALL_PATH . 'program/localization/en_US/messages.inc'); @include(INSTALL_PATH . 'program/localization/en_US/messages.inc');
if (is_array($labels)) if (is_array($labels))
$sa_text_data = $labels; $this->texts = $labels;
if (is_array($messages)) if (is_array($messages))
$sa_text_data = array_merge($sa_text_data, $messages); $this->texts = array_merge($this->texts, $messages);
// include user language files // include user language files
if ($lang != 'en' && is_dir(INSTALL_PATH . 'program/localization/' . $lang)) { if ($lang != 'en' && is_dir(INSTALL_PATH . 'program/localization/' . $lang)) {

Loading…
Cancel
Save