Added globbing for win32, and sample marking in a 2nd file to test it

Author: Jürgen Hermann

roundup/htmltemplate.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: htmltemplate.py,v 1.43 2001-11-21 04:04:43 richard Exp $
+# $Id: htmltemplate.py,v 1.44 2001-11-21 23:35:45 jhermann Exp $
 
 import os, re, StringIO, urllib, cgi, errno
 
@@ -87,7 +87,7 @@ def do_plain(self, property, escape=0):
             k = linkcl.labelprop()
             value = ', '.join([linkcl.get(i, k) for i in value])
         else:
-            s = 'Plain: bad propclass "%s"'%propclass
+            s = _('Plain: bad propclass "%(propclass)s"')%locals()
         if escape:
             value = cgi.escape(value)
         return value
@@ -106,7 +106,7 @@ def do_field(self, property, size=None, height=None, showid=0):
             to be edited
         '''
         if not self.nodeid and self.form is None and self.filterspec is None:
-            return '[Field: not called from item]'
+            return _('[Field: not called from item]')
         propclass = self.properties[property]
         if self.nodeid:
             value = self.cl.get(self.nodeid, property, None)
@@ -861,6 +861,9 @@ def render(self, form):
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.43  2001/11/21 04:04:43  richard
+# *sigh* more missing value handling
+#
 # Revision 1.42  2001/11/21 03:40:54  richard
 # more new property handling
 #

tools/pygettext.py

@@ -411,6 +411,14 @@ class Options:
     else:
         options.toexclude = []
 
+    # on win32, do internal globbing
+    if sys.platform == 'win32':
+        import glob
+        expanded = []
+        for arg in args:
+            expanded.extend(glob.glob(arg))
+        args = expanded
+
     # slurp through all the files
     eater = TokenEater(options)
     for filename in args: