Roundcubemail devel
parent: 885ebb8d | patch | commit | ignore whitespace
alecpl
2008-05-10 9d9f8dc83416cb493cfab94e1008af847abe6a41 
- fix: fallback labels/messages ignored from en_US localisation files after r1360 (#1485057)


1 files modified
4 ■■■■■ changed files
program/include/rcmail.php 4 ●●●●● patch | view | raw | blame | history 
 program/include/rcmail.php


@@ -588,9 +588,9 @@


      @include(INSTALL_PATH . 'program/localization/en_US/messages.inc');




      if (is_array($labels))


        $sa_text_data = $labels;


        $this->texts = $labels;


      if (is_array($messages))


        $sa_text_data = array_merge($sa_text_data, $messages);


        $this->texts = array_merge($this->texts, $messages);




      // include user language files


      if ($lang != 'en' && is_dir(INSTALL_PATH . 'program/localization/' . $lang)) {