Branch '2.3-stable' - kolab-webclient/imp

Christoph Wickert wickert at kolabsys.com
Wed Jul 13 11:59:46 CEST 2011


 kolab-webclient/imp/ChangeLog                                                         |    6 
 kolab-webclient/imp/imp.spec                                                          |    2 
 kolab-webclient/imp/patches/imp-4.3.9/series                                          |    1 
 kolab-webclient/imp/patches/imp-4.3.9/t_imp_H_GW_SystemFolderPrefsDoubleEncoding.diff |   75 ++++++++++
 4 files changed, 83 insertions(+), 1 deletion(-)

New commits:
commit fc6e39d55d7e78b6bd9e8dd632a08ee7309e62e4
Author: Gunnar Wrobel <p at rdus.de>
Date:   Wed Jan 19 15:44:34 2011 +0000

    kolab/issue4690 (Umlaut problems in system folders)

diff --git a/kolab-webclient/imp/ChangeLog b/kolab-webclient/imp/ChangeLog
index a869370..90513f7 100644
--- a/kolab-webclient/imp/ChangeLog
+++ b/kolab-webclient/imp/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-11  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/imp-4.3.9/t_imp_H_GW_SystemFolderPrefsDoubleEncoding.diff:
+
+	kolab/issue4690 (Umlaut problems in system folders)
+
 2010-11-26  Gunnar Wrobel  <p at rdus.de>
 
 	* imp.spec: Update to 4.3.9.
diff --git a/kolab-webclient/imp/imp.spec b/kolab-webclient/imp/imp.spec
index d86c7fb..e0ecc43 100644
--- a/kolab-webclient/imp/imp.spec
+++ b/kolab-webclient/imp/imp.spec
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package imp
 %define         V_version 4.3.9
-%define         V_release 20101126
+%define         V_release 20110119
 
 # Package Information
 Name:		%{V_package}
diff --git a/kolab-webclient/imp/patches/imp-4.3.9/series b/kolab-webclient/imp/patches/imp-4.3.9/series
index 6a88dae..3d3e836 100644
--- a/kolab-webclient/imp/patches/imp-4.3.9/series
+++ b/kolab-webclient/imp/patches/imp-4.3.9/series
@@ -4,3 +4,4 @@ t_imp_H_GW_AclView.diff
 t_imp_H_GW_FoldersView.diff
 t_imp_HK_GW_ItipHandling.diff
 t_imp_HK_UV_fix_login_by_uid.diff
+t_imp_H_GW_SystemFolderPrefsDoubleEncoding.diff
\ No newline at end of file
diff --git a/kolab-webclient/imp/patches/imp-4.3.9/t_imp_H_GW_SystemFolderPrefsDoubleEncoding.diff b/kolab-webclient/imp/patches/imp-4.3.9/t_imp_H_GW_SystemFolderPrefsDoubleEncoding.diff
new file mode 100644
index 0000000..241fcd0
--- /dev/null
+++ b/kolab-webclient/imp/patches/imp-4.3.9/t_imp_H_GW_SystemFolderPrefsDoubleEncoding.diff
@@ -0,0 +1,75 @@
+From: Gunnar Wrobel <p at rdus.de>
+Subject: [PATCH] t/imp/H/GW/SystemFolderPrefsDoubleEncoding
+
+Fixes a double encoding issue for the folder names set in the
+imp/config/prefs.php file.
+
+kolab/issue4690 (Umlaut problems in system folders)
+https://issues.kolab.org/issue4690
+
+[#9503] Double UTF7-IMAP encoding for system folders
+http://bugs.horde.org/ticket/9503
+
+Signed-off-by: Gunnar Wrobel <p at rdus.de>
+
+---
+
+--- a/po/de_DE.po	25 Oct 2010 12:50:13 -0000	1.56.2.58
++++ b/po/de_DE.po	11 Jan 2011 20:28:00 -0000	1.56.2.59
+@@ -13,7 +13,7 @@
+ "Project-Id-Version: IMP 4.2-cvs\n"
+ "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+ "POT-Creation-Date: 2010-10-25 14:49+0200\n"
+-"PO-Revision-Date: 2009-11-20 14:49+0100\n"
++"PO-Revision-Date: 2011-01-11 21:25+0100\n"
+ "Last-Translator: Jan Schneider <jan at horde.org>\n"
+ "Language-Team: German <dev at lists.horde.org>\n"
+ "Language: de\n"
+@@ -1591,7 +1591,7 @@
+
+ #: config/prefs.php.dist:304
+ msgid "Drafts"
+-msgstr "Entw&APw-rfe"
++msgstr "Entwürfe"
+
+ #: templates/prefs/folderselect.inc:19
+ msgid "Drafts folder:"
+
+--- a/config/prefs.php.dist	2010/03/19 17:16:34	1.216.4.38
++++ b/config/prefs.php.dist	2011/01/19 13:13:42	1.216.4.39
+@@ -261,7 +261,7 @@
+ $_prefs['sent_mail_folder'] = array(
+     // The mailbox value must be encoded in the UTF7-IMAP charset (see RFC
+     // 3501 [5.1.3]).
+-    'value' => String::convertCharset(_("Sent"), null, 'UTF7-IMAP'),
++    'value' => String::convertCharset(_("Sent"), NLS::getCharset(), 'UTF7-IMAP'),
+     // For Exchange, uncomment the entry below.
+     // 'value' => 'Sent Items',
+     'locked' => false,
+@@ -301,7 +301,7 @@
+ $_prefs['drafts_folder'] = array(
+     // The mailbox value must be encoded in the UTF7-IMAP charset (see RFC
+     // 3501 [5.1.3]).
+-    'value' => String::convertCharset(_("Drafts"), null, 'UTF7-IMAP'),
++    'value' => String::convertCharset(_("Drafts"), NLS::getCharset(), 'UTF7-IMAP'),
+     'locked' => false,
+     'shared' => false,
+     'type' => 'implicit');
+@@ -314,7 +314,7 @@
+ $_prefs['trash_folder'] = array(
+     // The mailbox value must be encoded in the UTF7-IMAP charset (see RFC
+     // 3501 [5.1.3]).
+-    'value' => String::convertCharset(_("Trash"), null, 'UTF7-IMAP'),
++    'value' => String::convertCharset(_("Trash"), NLS::getCharset(), 'UTF7-IMAP'),
+     // For Exchange, uncomment the entry below.
+     // 'value' => 'Deleted Items',
+     'locked' => false,
+@@ -329,7 +329,7 @@
+ $_prefs['spam_folder'] = array(
+     // The mailbox value must be encoded in the UTF7-IMAP charset (see RFC
+     // 3501 [5.1.3]).
+-    'value' => String::convertCharset(_("Spam"), null, 'UTF7-IMAP'),
++    'value' => String::convertCharset(_("Spam"), NLS::getCharset(), 'UTF7-IMAP'),
+     'locked' => false,
+     'shared' => false,
+     'type' => 'implicit');





More information about the commits mailing list