From 71ced07735641e95bea63f67a75d6f151ef802b1 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 9 May 2012 12:47:44 +0200 Subject: 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 --- program/include/rcmail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'program/include/rcmail.php') 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'); -- cgit v1.2.3