diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-05-09 12:47:44 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-05-09 13:09:36 +0200 |
| commit | 71ced07735641e95bea63f67a75d6f151ef802b1 (patch) | |
| tree | 07cf71cb03313b211c428f1d1db39dbe8111996c /program/include/rcmail.php | |
| parent | f5d2f08db7a6b9c96dbd61ee4707a53ee8075671 (diff) | |
Use similar language as a fallback for plugin localization (#1488401)
Don't load en_US localization more than once
Conflicts:
CHANGELOG
program/include/rcube.php
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'); |