From 7a5c48e7f70b8bc938fcae3ffd2be0fdbeaab145 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 13 Dec 2006 02:17:24 -0500
Subject: [PATCH] Changed 'junk' label in French localization

---
 program/steps/settings/manage_folders.inc |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
index 2fbc780..5f2da4e 100644
--- a/program/steps/settings/manage_folders.inc
+++ b/program/steps/settings/manage_folders.inc
@@ -73,10 +73,12 @@
     
   if ($rename && $REMOTE_REQUEST)
     {
-    $commands = sprintf("this.replace_folder_row('%s','%s','%s');",
-                        rep_specialchars_output($_GET['_folder_oldname'], 'js'),
+    $commands = sprintf("this.replace_folder_row('%s','%s','%s');\n",
+                        rep_specialchars_output(get_input_value('_folder_oldname', RCUBE_INPUT_GET), 'js'),
                         rep_specialchars_output($rename, 'js'),
                         rep_specialchars_output(rcube_charset_convert($rename, 'UTF-7'), 'js'));
+
+    $commands .= "this.reset_folder_rename();\n";
                         
     rcube_remote_response($commands);
     }
@@ -165,6 +167,7 @@
     $zebra_class = $i%2 ? 'even' : 'odd';
     $folder_js = rep_specialchars_output($folder, 'js');
     $folder_js_enc = rep_specialchars_output(rcube_charset_convert($folder, 'UTF-7'), 'js');
+    $folder_html = $CONFIG['protect_default_folders'] && in_array($folder, $CONFIG['default_imap_folders']) ? rcube_label(strtolower($folder)) : rcube_charset_convert($folder, 'UTF-7');
     
     if (!$protected)
       $a_js_folders['rcmrow'.($i+1)] = array($folder_js, $folder_js_enc);
@@ -172,7 +175,7 @@
     $out .= sprintf('<tr id="rcmrow%d" class="%s"><td>%s</td>',
                     $i+1,
                     $zebra_class,
-                    rep_specialchars_output(rcube_charset_convert($folder, 'UTF-7'), 'html', 'all'));
+                    rep_specialchars_output($folder_html, 'html', 'all'));
                     
     if ($protected)
       $out .= '<td>&nbsp;'.($subscribed ? '&#x2022;' : '-').'</td>';

--
Gitblit v1.9.1