diff options
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | program/include/rcube.php | 2 | ||||
| -rw-r--r-- | program/include/rcube_plugin.php | 38 | ||||
| -rw-r--r-- | program/js/app.js | 2 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 2 |
5 files changed, 37 insertions, 9 deletions
@@ -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 8bd9b76be..272136fa8 100644 --- a/program/include/rcube.php +++ b/program/include/rcube.php @@ -631,7 +631,7 @@ class rcube $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 7048392e5..25a3b6a90 100644 --- a/program/include/rcube_plugin.php +++ b/program/include/rcube_plugin.php @@ -153,20 +153,48 @@ abstract class rcube_plugin 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(); diff --git a/program/js/app.js b/program/js/app.js index 3518712ed..615f94cae 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -767,7 +767,7 @@ function rcube_webmail() case 'always-load': if (this.env.uid && this.env.sender) { - this.add_contact(urlencode(this.env.sender)); + this.add_contact(this.env.sender); setTimeout(function(){ ref.command('load-images'); }, 300); break; } diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index ee17b3a3f..1742eee66 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1340,7 +1340,7 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null, if ($addicon && $_SESSION['writeable_abook']) { $address = html::span(null, $address . html::a(array( 'href' => "#add", - 'onclick' => sprintf("return %s.command('add-contact','%s',this)", JS_OBJECT_NAME, urlencode($string)), + 'onclick' => sprintf("return %s.command('add-contact','%s',this)", JS_OBJECT_NAME, $string), 'title' => rcube_label('addtoaddressbook'), 'class' => 'rcmaddcontact', ), |