From 5c52d06844779efbf4034663f5e68db10619b367 Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Sun, 22 Oct 2006 02:45:54 -0400
Subject: [PATCH] Updated Russian localization
---
program/include/main.inc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/program/include/main.inc b/program/include/main.inc
index bbda83a..b2e83b7 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -365,7 +365,7 @@
// add common javascripts
$javascript = "var $JS_OBJECT_NAME = new rcube_webmail();\n";
- $javascript .= "$JS_OBJECT_NAME.set_env('comm_path', '$COMM_PATH');\n";
+ $javascript .= sprintf("%s.set_env('comm_path', '%s');\n", $JS_OBJECT_NAME, str_replace('&', '&', $COMM_PATH));
if (isset($CONFIG['javascript_config'] )){
foreach ($CONFIG['javascript_config'] as $js_config_var){
@@ -893,7 +893,7 @@
// convert string to UTF-8
if ($from=='UTF-7')
- $str = rcube_charset_convert(UTF7DecodeString($str), 'ISO-8859-1');
+ $str = utf7_to_utf8($str);
else if (($from=='ISO-8859-1') && function_exists('utf8_encode'))
$str = utf8_encode($str);
else if ($from!='UTF-8')
@@ -904,7 +904,7 @@
// encode string for output
if ($to=='UTF-7')
- return UTF7EncodeString(rcube_charset_convert($str, 'UTF-8', 'ISO-8859-1'));
+ return utf8_to_utf7($str);
else if ($to=='ISO-8859-1' && function_exists('utf8_decode'))
return utf8_decode($str);
else if ($to!='UTF-8')
--
Gitblit v1.9.1