diff MoinMoin/action/SyncPages.py @ 1393:e6e054247a58

Disabled debug mode, output GetText as well if GetText2 is not necessary, refactored my CHANGES file.
author Alexander Schremmer <alex AT alexanderweb DOT de>
date Mon, 21 Aug 2006 16:09:12 +0200
parents bcabe48fc2f6
children e6bf86b4a735
line wrap: on
line diff
--- a/MoinMoin/action/SyncPages.py	Mon Aug 21 14:28:53 2006 +0200
+++ b/MoinMoin/action/SyncPages.py	Mon Aug 21 16:09:12 2006 +0200
@@ -30,7 +30,7 @@
 from MoinMoin.util import diff3
 
 
-debug = True
+debug = False
 
 
 # map sync directions
@@ -59,10 +59,17 @@
         table = []
 
         for line in self.status:
-            macro_args = [line[1]] + list(line[2])
-            table.append(table_line % {"smiley": line[0][1], "message":
-                line[1] and (u"[[GetText2(|%s)]]" % (packLine(macro_args), )),
-                "raw_suffix": line[3]})
+            if line[1]:
+                if line[2]:
+                    macro_args = [line[1]] + list(line[2])
+                    message = u"[[GetText2(|%s)]]" % (packLine(macro_args), )
+                else:
+                    message = u"[[GetText(%s)]]" % (line[1], )
+            else:
+                message = u""
+            table.append(table_line % {"smiley": line[0][1],
+                                       "message": message,
+                                       "raw_suffix": line[3]})
 
         return "\n".join(table)