From bc92ca56ef6c51393d2782b7654eaa162dfc2e10 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 30 Jul 2012 07:20:56 -0400
Subject: [PATCH] Fixes after default->classic switch
---
program/include/rcube_plugin.php | 60 +++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 15 deletions(-)
diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
index aeb05af..b1ec32a 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -17,9 +17,6 @@
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
/**
@@ -110,9 +107,10 @@
public function load_config($fname = 'config.inc.php')
{
$fpath = $this->home.'/'.$fname;
- $rcmail = rcmail::get_instance();
- if (is_file($fpath) && !$rcmail->config->load_from_file($fpath)) {
- raise_error(array('code' => 527, 'type' => 'php',
+ $rcube = rcube::get_instance();
+ if (is_file($fpath) && !$rcube->config->load_from_file($fpath)) {
+ rcube::raise_error(array(
+ 'code' => 527, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__,
'message' => "Failed to load config from $fpath"), true, false);
return false;
@@ -152,19 +150,47 @@
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;
+ }
+ }
}
}
@@ -196,7 +222,7 @@
*/
public function gettext($p)
{
- return rcmail::get_instance()->gettext($p, $this->ID);
+ return rcube::get_instance()->gettext($p, $this->ID);
}
/**
@@ -309,9 +335,13 @@
*/
public function local_skin_path()
{
- $skin_path = 'skins/'.$this->api->config->get('skin');
- if (!is_dir(realpath(slashify($this->home) . $skin_path)))
- $skin_path = 'skins/default';
+ $rcmail = rcube::get_instance();
+ foreach (array($rcmail->config->get('skin'),'default') as $skin) {
+ $skin_path = 'skins/' . $skin;
+ if (is_dir(realpath(slashify($this->home) . $skin_path)))
+ break;
+ }
+
return $skin_path;
}
--
Gitblit v1.9.1