From fbf77b4493f1b77c99751d8a86365c712ae3fb1b Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 18 Nov 2005 10:35:15 -0500
Subject: [PATCH] Added Japanese localization
---
program/include/main.inc | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/program/include/main.inc b/program/include/main.inc
index 0ebbeaa..936cad3 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -40,12 +40,16 @@
include_once('config/db.inc.php');
$CONFIG = array_merge($CONFIG, $rcmail_config);
+ if (empty($CONFIG['log_dir']))
+ $CONFIG['log_dir'] = $INSTALL_PATH.'logs';
+ else
+ $CONFIG['log_dir'] = ereg_replace('\/$', '', $CONFIG['log_dir']);
// set PHP error logging according to config
if ($CONFIG['debug_level'] & 1)
{
ini_set('log_errors', 1);
- ini_set('error_log', $INSTALL_PATH.'logs/errors');
+ ini_set('error_log', $CONFIG['log_dir'].'/errors');
}
if ($CONFIG['debug_level'] & 4)
ini_set('display_errors', 1);
@@ -64,7 +68,8 @@
$DB->sqlite_initials = $INSTALL_PATH.'SQL/sqlite.initial.sql';
// we can use the database for storing session data
- if (is_object($DB) && $DB->db_provider!='sqlite')
+ // session queries do not work with MDB2
+ if ($CONFIG['db_backend']!='mdb2' && is_object($DB) && $DB->db_provider!='sqlite')
include_once('include/session.inc');
@@ -247,22 +252,31 @@
$OUTPUT->set_charset($CONFIG['charset']);
else
rcmail_set_locale($sess_user_lang);
+
+ // add some basic label to client
+ rcube_add_label('loading');
}
// set localization charset based on the given language
function rcmail_set_locale($lang)
{
- global $OUTPUT, $INSTLL_PATH;
+ global $OUTPUT, $INSTLL_PATH, $CHARSET;
static $rcube_charsets;
if (!$rcube_charsets)
@include($INSTLL_PATH.'program/localization/index.inc');
if (isset($rcube_charsets[$lang]))
+ {
$OUTPUT->set_charset($rcube_charsets[$lang]);
+ $CHARSET = $rcube_charsets[$lang];
+ }
else
+ {
$OUTPUT->set_charset('ISO-8859-1');
+ $CHARSET = 'ISO-8859-1';
+ }
}
@@ -400,6 +414,16 @@
}
+// overwrite action variable
+function rcmail_overwrite_action($action)
+ {
+ global $OUTPUT, $JS_OBJECT_NAME;
+ $GLOBALS['_action'] = $action;
+
+ $OUTPUT->add_script(sprintf("\n%s.set_env('action', '%s');", $JS_OBJECT_NAME, $action));
+ }
+
+
function show_message($message, $type='notice')
{
global $OUTPUT, $JS_OBJECT_NAME, $REMOTE_REQUEST;
@@ -489,6 +513,20 @@
}
+// add a localized label to the client environment
+function rcube_add_label()
+ {
+ global $OUTPUT, $JS_OBJECT_NAME;
+
+ $arg_list = func_get_args();
+ foreach ($arg_list as $i => $name)
+ $OUTPUT->add_script(sprintf("%s.add_label('%s', '%s');",
+ $JS_OBJECT_NAME,
+ $name,
+ rep_specialchars_output(rcube_label($name), 'js')));
+ }
+
+
// ************** template parsing and gui functions **************
@@ -545,6 +583,7 @@
// replace all strings ($varname) with the content of the according global variable
function parse_with_globals($input)
{
+ $GLOBALS['__comm_path'] = $GLOBALS['COMM_PATH'];
$output = preg_replace('/\$(__[a-z0-9_\-]+)/e', '$GLOBALS["\\1"]', $input);
return $output;
}
--
Gitblit v1.9.1