changeset 1321:d0c171c168a8

Minor cleanup, added entry to my CHANGES file.
author Alexander Schremmer <alex AT alexanderweb DOT de>
date Thu, 17 Aug 2006 21:22:03 +0200
parents a36c70e5f0dd
children cd150467ee30
files MoinMoin/action/SyncPages.py docs/CHANGES.aschremmer
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/SyncPages.py	Thu Aug 17 21:05:23 2006 +0200
+++ b/MoinMoin/action/SyncPages.py	Thu Aug 17 21:22:03 2006 +0200
@@ -137,13 +137,13 @@
 
             self.sync(params, local, remote)
         except ActionStatus, e:
-            msg = u'<p class="error">%s</p><p>%s</p>\n' % (e.args[0], repr(self.status)) # XXX remove self.status
+            msg = u'<p class="error">%s</p>\n' % (e.args[0], )
         else:
-            msg = u"%s<p>%s</p>" % (_("Syncronisation finished."), repr(self.status)) # XXX remove self.status
+            msg = u"%s" % (_("Syncronisation finished."), )
 
         self.page.saveText(self.page.get_raw_body() + "\n\n" + self.generate_log_table(), 0)
+        # XXX release readlock on self.page
 
-        # XXX release readlock on self.page
         return self.page.send_page(self.request, msg=msg)
     
     def sync(self, params, local, remote):
--- a/docs/CHANGES.aschremmer	Thu Aug 17 21:05:23 2006 +0200
+++ b/docs/CHANGES.aschremmer	Thu Aug 17 21:22:03 2006 +0200
@@ -44,6 +44,7 @@
     * SyncPages action
     * XMLRPC functions may return Fault instances
     * diff3 algorithm extended, a new mode should reduce the conflicts
+    * GetText2 macro
 
   Bugfixes (only stuff that is buggy in moin/1.6 main branch):
     * Conflict resolution fixes. (merged into main)
@@ -114,7 +115,7 @@
          normalised name. Implemented preliminary mime type support, only transmission of the mime type
          and the new storage API is missing. Changed getDiff interface. Detect renamed pages (and choke :).
          Added infrastructure support for detecting deleted pages (not used in the merging logic yet).
-         Reworked i18n and logging support.
+         Reworked i18n and logging support. Added GetText2 macro.
 
 2006-07-18: the requested daily entry is missing here, see http://moinmoin.wikiwikiweb.de/GoogleSoc2006/BetterProgress
 2006-07-19: the requested daily entry is missing here, see http://moinmoin.wikiwikiweb.de/GoogleSoc2006/BetterProgress