From 59041fdbc9fdcde1de6fa80efa9857450f021399 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 09 May 2012 06:47:44 -0400
Subject: [PATCH] Use similar language as a fallback for plugin localization (#1488401) Don't load en_US localization more than once
---
program/include/rcube.php | 2 +-
program/include/rcube_plugin.php | 38 +++++++++++++++++++++++++++++++++-----
CHANGELOG | 2 +-
3 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 6834fa8..f6cd2ad 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
-
+- Use similar language as a fallback for plugin localization (#1488401)
- Fix issue where signature wasn't re-added on draft compose (#1488322)
- Update to TinyMCE 3.5 (#1488459)
- Fixed multi-threaded autocompletion when number of threads > number of sources
diff --git a/program/include/rcube.php b/program/include/rcube.php
index 8bd9b76..272136f 100644
--- a/program/include/rcube.php
+++ b/program/include/rcube.php
@@ -631,7 +631,7 @@
$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');
diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
index 7048392..25a3b6a 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -153,20 +153,48 @@
public function add_texts($dir, $add2client = false)
{
$domain = $this->ID;
-
- $lang = $_SESSION['language'];
+ $lang = $_SESSION['language'];
+ $langs = array_unique(array('en_US', $lang));
$locdir = slashify(realpath(slashify($this->home) . $dir));
- $texts = array();
+ $texts = array();
+
+ // Language aliases used to find localization in similar lang, see below
+ $aliases = array(
+ 'de_CH' => 'de_DE',
+ 'es_AR' => 'es_ES',
+ 'fa_AF' => 'fa_IR',
+ 'nl_BE' => 'nl_NL',
+ 'pt_BR' => 'pt_PT',
+ 'zh_CN' => 'zh_TW',
+ );
// use buffering to handle empty lines/spaces after closing PHP tag
ob_start();
- foreach (array('en_US', $lang) as $lng) {
+ foreach ($langs as $lng) {
$fpath = $locdir . $lng . '.inc';
if (is_file($fpath) && is_readable($fpath)) {
- include($fpath);
+ include $fpath;
$texts = (array)$labels + (array)$messages + (array)$texts;
}
+ else if ($lng != 'en_US') {
+ // Find localization in similar language (#1488401)
+ $alias = null;
+ if (!empty($aliases[$lng])) {
+ $alias = $aliases[$lng];
+ }
+ else if ($key = array_search($lng, $aliases)) {
+ $alias = $key;
+ }
+
+ if (!empty($alias)) {
+ $fpath = $locdir . $alias . '.inc';
+ if (is_file($fpath) && is_readable($fpath)) {
+ include $fpath;
+ $texts = (array)$labels + (array)$messages + (array)$texts;
+ }
+ }
+ }
}
ob_end_clean();
--
Gitblit v1.9.1