changeset 1186:3172214eac96

Fixed some bugs, whitespaces at EOL, better i18n for SystemInfo
author Franz Pletz <fpletz AT franz-pletz DOT org>
date Tue, 18 Jul 2006 15:36:02 +0200
parents 541271bb8a56
children 1bdac55acc14
files MoinMoin/formatter/text_html.py MoinMoin/macro/SystemInfo.py MoinMoin/search/builtin.py docs/CHANGES.fpletz
diffstat 4 files changed, 15 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/formatter/text_html.py	Mon Jul 17 13:22:40 2006 +0200
+++ b/MoinMoin/formatter/text_html.py	Tue Jul 18 15:36:02 2006 +0200
@@ -388,7 +388,7 @@
             if newline:
                 result.append(self._newline())
             result.append('</%s>' % (tag))
-            tagstr = ''.join(result)            
+            tagstr = ''.join(result)
         else:
             # Inline elements 
             # Pull from stack, ignore order, that is not our problem.
@@ -455,7 +455,7 @@
         result = []
         result.append(self.anchordef(aid))
         result.append(self._close('div', newline=newline))
-        return ''.join(result) 
+        return ''.join(result)
 
     def lang(self, on, lang_name):
         """ Insert text with specific lang and direction.
@@ -826,7 +826,7 @@
         """
         tag = 'tt'
         # Maybe we don't need this, because we have tt will be in inlineStack.
-        self._in_code = on        
+        self._in_code = on
         if on:
             return self._open(tag, allowed_attrs=[], **kw)
         return self._close(tag)
@@ -1303,7 +1303,7 @@
             result.append(self._close('table'))
             result.append(self._close('div'))
 
-        return ''.join(result)    
+        return ''.join(result)
     
     def table_row(self, on, attrs=None, **kw):
         tag = 'tr'
--- a/MoinMoin/macro/SystemInfo.py	Mon Jul 17 13:22:40 2006 +0200
+++ b/MoinMoin/macro/SystemInfo.py	Tue Jul 18 15:36:02 2006 +0200
@@ -112,9 +112,10 @@
         ', '.join(wikiutil.wikiPlugins('parser', Macro.cfg)) or nonestr)
 
     state = (_('Disabled'), _('Enabled'))
+    idxState = (_('index available'), _('index unavailable'))
     from MoinMoin.search.builtin import Search
-    row(_('Xapian search'), '%s, %sactive' % (state[request.cfg.xapian_search],
-                not Search._xapianIndex(request) and 'not ' or ''))
+    row(_('Xapian search'), '%s, %s' % (state[request.cfg.xapian_search],
+                Search._xapianIndex(request) and idxState[0] or idxState[1]))
 
     row(_('Active threads'), t_count or 'N/A')
     buf.write(u'</dl>')
--- a/MoinMoin/search/builtin.py	Mon Jul 17 13:22:40 2006 +0200
+++ b/MoinMoin/search/builtin.py	Tue Jul 18 15:36:02 2006 +0200
@@ -10,7 +10,7 @@
     @license: GNU GPL, see COPYING for details
 """
 
-import time, sys, os, errno
+import time, sys, os, errno, codecs
 from MoinMoin import wikiutil, config
 from MoinMoin.Page import Page
 from MoinMoin.util import filesys, lock
@@ -251,7 +251,7 @@
             self.request.log("can't index: can't acquire lock")
             return
         try:
-            def lockedDecorator(self, f):
+            def lockedDecorator(f):
                 def func(*args, **kwargs):
                     try:
                         return f(*args, **kwargs)
--- a/docs/CHANGES.fpletz	Mon Jul 17 13:22:40 2006 +0200
+++ b/docs/CHANGES.fpletz	Tue Jul 18 15:36:02 2006 +0200
@@ -32,7 +32,7 @@
     * ...
 
   Other Changes:
-    * ...
+    * Some whitespace fixes in miscellaneous code
   
   Developer notes:
     * ...
@@ -152,4 +152,9 @@
 2006-07-17
     * SystemInfo macro now also shows if xapian is being used (index
       available) and more graceful fallback to moinSearch
+    * Explored and evaluated the current framework for macros,
+      formatters and stuff which we need to touch for the new search UI
 
+2006-07-18
+    * Fixed some bugs, whitespaces at EOL, better i18n for SystemInfo
+