summaryrefslogtreecommitdiff
path: root/roundcubemail/program/steps
diff options
context:
space:
mode:
authorroundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c>2005-10-31 23:41:00 +0000
committerroundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c>2005-10-31 23:41:00 +0000
commit4c39bff72f5e5e63a5e3157f6fdd3ce332c40eca (patch)
tree44fb0ae35b10af5a500937b91cd2c0793f68d751 /roundcubemail/program/steps
parentb13a1d6dbdcf8a3299718bd611bccd609a83cf6d (diff)
Added Finnish, Romanian and Chinese translation
git-svn-id: https://svn.roundcube.net/trunk@67 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps')
-rw-r--r--roundcubemail/program/steps/mail/func.inc4
-rw-r--r--roundcubemail/program/steps/settings/save_prefs.inc3
2 files changed, 5 insertions, 2 deletions
diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc
index c1eafaad7..7a6b6ffd3 100644
--- a/roundcubemail/program/steps/mail/func.inc
+++ b/roundcubemail/program/steps/mail/func.inc
@@ -528,10 +528,10 @@ function rcmail_print_body($part, $safe=FALSE, $plain=FALSE) // $body, $ctype_pr
'/url\s*\(["\']?([\.\/]+[^"\'\s]+)["\']?\)/i',
'/<script.+<\/script>/Umis');
- $remote_replaces = array('\\1=\\2#\\4',
+ $remote_replaces = array('', // '\\1=\\2#\\4',
// '\\1=\\2#\\4',
'',
- '\\1#\\3',
+ '', // '\\1#\\3',
'none',
'none',
'');
diff --git a/roundcubemail/program/steps/settings/save_prefs.inc b/roundcubemail/program/steps/settings/save_prefs.inc
index 1322acaf7..16d7f2368 100644
--- a/roundcubemail/program/steps/settings/save_prefs.inc
+++ b/roundcubemail/program/steps/settings/save_prefs.inc
@@ -32,7 +32,10 @@ $a_user_prefs['prefer_html'] = isset($_POST['_prefer_html']) ? TRUE : FALSE;
$a_user_prefs['prettydate'] = isset($_POST['_pretty_date']) ? TRUE : FALSE;
if (isset($_POST['_language']))
+ {
$sess_user_lang = $_SESSION['user_lang'] = $_POST['_language'];
+ rcmail_set_locale($sess_user_lang);
+ }
$DB->query("UPDATE ".get_table_name('users')."