changeset 2468:4a199a4c5d31

Pull some more johill's changes from main.
author Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl>
date Fri, 20 Jul 2007 02:07:09 +0200
parents 31b3d03bd1ea (current diff) 3ddef6c321b1 (diff)
children 663867be4afc
files
diffstat 1 files changed, 13 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/userprefs/notification.py	Fri Jul 20 01:58:03 2007 +0200
+++ b/MoinMoin/userprefs/notification.py	Fri Jul 20 02:07:09 2007 +0200
@@ -126,14 +126,15 @@
                         type='checkbox',
                         checked=checked,
                         name='subscribe:%s:%s' % (notiftype, evname))))
-            tr.append(html.TD().append(html.Raw(evdescr)))
+            tr.append(html.TD().append(html.Raw(self.request.getText(evdescr))))
 
         return table
 
     def create_form(self):
         """ Create the complete HTML form code. """
         _ = self._
-        self._form = self.make_form()
+        self._form = self.make_form(
+            _('Select the events you want to be notified about.'))
 
         self._form.append(html.INPUT(type="hidden", name="action", value="userprefs"))
         self._form.append(html.INPUT(type="hidden", name="handler", value="prefs"))
@@ -149,19 +150,17 @@
 
         self.make_row(_('Subscribed events'), [self._event_select()])
 
-        # subscribed pages
-        if self.cfg.mail_enabled:
-            # Get list of subscribe pages, DO NOT sort! it should
-            # stay in the order the user entered it in his input
-            # box.
-            notifylist = self.request.user.getSubscriptionList()
+        # Get list of subscribe pages, DO NOT sort! it should
+        # stay in the order the user entered it in his input
+        # box.
+        notifylist = self.request.user.getSubscriptionList()
 
-            self.make_row(
-                html.Raw(_('Subscribed wiki pages[[BR]](one regex per line)')),
-                [html.TEXTAREA(name="subscribed_pages", rows="6", cols="50").append(
-                    '\n'.join(notifylist)), ],
-                valign="top"
-            )
+        self.make_row(
+            html.Raw(_('Subscribed wiki pages[[BR]](one regex per line)')),
+            [html.TEXTAREA(name="subscribed_pages", rows="6", cols="50").append(
+                '\n'.join(notifylist)), ],
+            valign="top"
+        )
 
         # Add buttons
         self.make_row('', [