diff options
| author | Thomas Bruederli <bruederli@kolabsys.com> | 2012-05-12 16:47:51 +0200 |
|---|---|---|
| committer | Thomas Bruederli <bruederli@kolabsys.com> | 2012-05-12 16:47:51 +0200 |
| commit | 5c6d1ac5a25550515a20b74c1986045127a87265 (patch) | |
| tree | 46ccb174e481f842f2f18a5e9b27dd4cb2a435d7 /program/include/rcmail.php | |
| parent | 568e26c343e73d0d4e983342bf7b29bddb33715b (diff) | |
| parent | 02cf44e1838aca64e14921d30dc44d25a4d73b1c (diff) | |
Merge branch 'release-0.8' of github.com:roundcube/roundcubemail into release-0.8
Diffstat (limited to 'program/include/rcmail.php')
| -rw-r--r-- | program/include/rcmail.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php index 65c48fabf..c0defa6d4 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -1167,7 +1167,7 @@ class rcmail $this->texts = array_merge($this->texts, $messages); // include user language files - if ($lang != 'en' && is_dir(INSTALL_PATH . 'program/localization/' . $lang)) { + if ($lang != 'en' && $lang != 'en_US' && is_dir(INSTALL_PATH . 'program/localization/' . $lang)) { include_once(INSTALL_PATH . 'program/localization/' . $lang . '/labels.inc'); include_once(INSTALL_PATH . 'program/localization/' . $lang . '/messages.inc'); |