wilde: server/patches/horde-webmail/1.2.0/merges t_dimp_H_GW_AclView.diff, 1.1.4.1, 1.1.4.2 t_dimp_H_GW_FoldersView.diff, 1.1.4.1, 1.1.4.2
cvs at kolab.org
cvs at kolab.org
Tue Oct 13 17:58:54 CEST 2009
Author: wilde
Update of /kolabrepository/server/patches/horde-webmail/1.2.0/merges
In directory doto:/tmp/cvs-serv20591/patches/horde-webmail/1.2.0/merges
Modified Files:
Tag: kolab_2_2_branch
t_dimp_H_GW_AclView.diff t_dimp_H_GW_FoldersView.diff
Log Message:
Translations and minor display improvements in dimp. (Merged from sug branch)
Index: t_dimp_H_GW_AclView.diff
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/merges/Attic/t_dimp_H_GW_AclView.diff,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- t_dimp_H_GW_AclView.diff 14 May 2009 16:17:37 -0000 1.1.4.1
+++ t_dimp_H_GW_AclView.diff 13 Oct 2009 15:58:51 -0000 1.1.4.2
@@ -12,12 +12,14 @@
Signed-off-by: Gunnar Wrobel <p at rdus.de>
---
- horde-webmail/dimp/js/DimpBase.js | 1 +
- horde-webmail/dimp/lib/DIMP.php | 1 +
- horde-webmail/dimp/templates/index/index.inc | 1 +
- horde-webmail/imp/acl.php | 12 ++++++++++--
- horde-webmail/imp/templates/acl/acl.html | 6 ++++++
- 5 files changed, 19 insertions(+), 2 deletions(-)
+ horde-webmail/dimp/js/DimpBase.js | 1 +
+ horde-webmail/dimp/lib/DIMP.php | 1 +
+ .../dimp/locale/de_DE/LC_MESSAGES/dimp.mo | Bin 168731 -> 168778 bytes
+ horde-webmail/dimp/po/de_DE.po | 3 +++
+ horde-webmail/dimp/templates/index/index.inc | 1 +
+ horde-webmail/imp/acl.php | 12 ++++++++++--
+ horde-webmail/imp/templates/acl/acl.html | 13 +++++++++++++
+ 7 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/horde-webmail/dimp/js/DimpBase.js b/horde-webmail/dimp/js/DimpBase.js
index 39a728b..c4eb9f4 100644
@@ -43,6 +45,20 @@
'sortthread' => SORTTHREAD,
'sortdate' => SORTDATE,
+diff --git a/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo b/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo
+index 2f1c11c..973776f 100644
+Binary files a/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo and b/horde-webmail/dimp/locale/de_DE/LC_MESSAGES/dimp.mo differ
+diff --git a/horde-webmail/dimp/po/de_DE.po b/horde-webmail/dimp/po/de_DE.po
+index a536db6..0486297 100644
+--- a/horde-webmail/dimp/po/de_DE.po
++++ b/horde-webmail/dimp/po/de_DE.po
+@@ -791,3 +791,6 @@ msgstr "entfernen"
+ #: lib/DIMP.php:191
+ msgid "results found"
+ msgstr "Ergebnisse gefunden"
++
++msgid "Share Folder"
++msgstr "Berechtigungen"
diff --git a/horde-webmail/dimp/templates/index/index.inc b/horde-webmail/dimp/templates/index/index.inc
index 21939e0..7c02fe7 100644
--- a/horde-webmail/dimp/templates/index/index.inc
@@ -85,26 +101,38 @@
$t->set('sharedimg', Horde::img('shared.png', _("Change Folder")));
$t->set('options', IMP::flistSelect('', true, array(), $folder));
diff --git a/horde-webmail/imp/templates/acl/acl.html b/horde-webmail/imp/templates/acl/acl.html
-index 79580aa..72cf1c5 100644
+index 79580aa..ae85ff4 100644
--- a/horde-webmail/imp/templates/acl/acl.html
+++ b/horde-webmail/imp/templates/acl/acl.html
-@@ -7,6 +7,7 @@
+@@ -2,11 +2,14 @@
+ <input type="hidden" name="actionID" value="" />
+ <tag:forminput />
+
++<if:imp_view>
+ <div class="header">
+ <tag:aclnavcell />
<gettext>Share mail folders</gettext>
</div>
++</if:imp_view>
+<if:imp_view>
<div class="header">
<ul>
<li>
-@@ -17,6 +18,7 @@
+@@ -17,6 +20,12 @@
<span class="smallheader"><tag:current /></span>
</div>
</form>
++<else:imp_view>
++<div class="header">
++ <span class="smallheader"><tag:current /></span>
++</div>
++</else:imp_view>
+</if:imp_view>
<form method="post" name="acl" id="acl" action="<tag:aclurl />">
<input type="hidden" name="actionID" value="imp_acl_set" />
-@@ -76,9 +78,13 @@
+@@ -76,9 +85,13 @@
</tr>
<tr>
<td colspan = "<tag:maxrule />" class="header" valign="middle">
@@ -119,10 +147,22 @@
<td class="header"> </td>
</tr>
--
-tg: (3c3721f..) t/dimp/H/GW/AclView (depends on: t/dimp/H/GW/FoldersView)
+tg: (f251c16..) t/dimp/H/GW/AclView (depends on: t/dimp/H/GW/FoldersView)
--
TOPGIT patch commit log
=======================
+
+commit e9630629c7479c73d3eb156f00544c34e95f0597
+Author: Gunnar Wrobel <p at rdus.de>
+Date: Mon Jul 20 09:36:01 2009 +0200
+
+ Fix translation and improve header.
+
+commit 57041c04c322dd7dc57da5b171923b7ab000ec0a
+Author: Gunnar Wrobel <p at rdus.de>
+Date: Sun Jun 21 23:58:30 2009 +0200
+
+ German translation.
commit cac1482cec6c96a8a1d7fb7c0e8c2433877728f5
Author: Gunnar Wrobel <p at rdus.de>
Index: t_dimp_H_GW_FoldersView.diff
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/merges/Attic/t_dimp_H_GW_FoldersView.diff,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- t_dimp_H_GW_FoldersView.diff 14 May 2009 16:22:39 -0000 1.1.4.1
+++ t_dimp_H_GW_FoldersView.diff 13 Oct 2009 15:58:51 -0000 1.1.4.2
@@ -12,28 +12,46 @@
Signed-off-by: Gunnar Wrobel <p at rdus.de>
---
- horde-webmail/dimp/config/menu.php | 6 ++++++
+ horde-webmail/dimp/config/menu.php | 9 ++++++++-
+ horde-webmail/dimp/po/de_DE.po | 3 +++
horde-webmail/imp/folders.php | 17 ++++++++++++-----
horde-webmail/imp/templates/folders/actions.html | 2 ++
- 3 files changed, 20 insertions(+), 5 deletions(-)
+ 4 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/horde-webmail/dimp/config/menu.php b/horde-webmail/dimp/config/menu.php
-index 5dcf354..99a4b8c 100644
+index 0c6ebe9..b5e0a5c 100644
--- a/horde-webmail/dimp/config/menu.php
+++ b/horde-webmail/dimp/config/menu.php
-@@ -28,6 +28,12 @@
+@@ -28,7 +28,14 @@
// 'text' => 'Say Hi!',
// 'icon' => $GLOBALS['registry']->getImageDir('horde') . '/horde.png'),
// );
++
+$site_menu = array(
+ 'folders' => array(
+ 'action' => 'DimpBase.go("app:horde", "' . Horde::url($GLOBALS['registry']->get('webroot', 'imp') . '/folders.php', true) . '")',
-+ 'text' => _('Folders'),
-+ 'icon' => $GLOBALS['registry']->getImageDir('imp') . '/folders/folder.png'),
++ 'text' => _('Folder Subscription'),
++ 'icon' => $GLOBALS['registry']->getImageDir('horde') . '/prefs.png'),
+);
++
if (file_exists(dirname(__FILE__) . '/menu.local.php')) {
- require_once(dirname(__FILE__) . '/menu.local.php');
+ require(dirname(__FILE__) . '/menu.local.php');
}
+-
+diff --git a/horde-webmail/dimp/po/de_DE.po b/horde-webmail/dimp/po/de_DE.po
+index 65e8824..a536db6 100644
+--- a/horde-webmail/dimp/po/de_DE.po
++++ b/horde-webmail/dimp/po/de_DE.po
+@@ -16,6 +16,9 @@ msgstr ""
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
++msgid "Folder Subscription"
++msgstr "Ordner verwalten"
++
+ #: lib/Views/ShowMessage.php:295
+ #, php-format
+ msgid "%d Attachment"
diff --git a/horde-webmail/imp/folders.php b/horde-webmail/imp/folders.php
index a0425aa..c46b0e5 100644
--- a/horde-webmail/imp/folders.php
@@ -103,10 +121,22 @@
<option value="expunge_folder"><gettext>Purge</gettext></option>
</if:notrash>
--
-tg: (eff636a..) t/dimp/H/GW/FoldersView (depends on: t/kronolith/H/GW/UseDayHourStartEndAlsoInFBView)
+tg: (3678979..) t/dimp/H/GW/FoldersView (depends on: t/kronolith/H/GW/UseDayHourStartEndAlsoInFBView)
--
TOPGIT patch commit log
=======================
+
+commit 93403a869ff14d7868d4cc9c4687ea1270e3c225
+Author: Gunnar Wrobel <p at rdus.de>
+Date: Mon Jun 22 08:39:51 2009 +0200
+
+ Typo
+
+commit ad147a4b42d61800400a2a779e884ee050358811
+Author: Gunnar Wrobel <p at rdus.de>
+Date: Mon Jun 22 00:06:14 2009 +0200
+
+ Fixed menu entry name, added translation, fixed image.
commit a1966161022108d9bf4831a8613b1db9a4e68c4d
Author: Gunnar Wrobel <p at rdus.de>
More information about the commits
mailing list