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

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@412 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/roundup/htmltemplate.py b/roundup/htmltemplate.py
index 4ed94ff982895c72d0cb1d9d03cbf0e7c754b305..9afbd099ae3db685bd46f99b2cf880e5bdb2a5b4 100644 (file)
--- a/roundup/htmltemplate.py
+++ b/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 @@ class TemplateFunctions:
             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 @@ class TemplateFunctions:
             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 @@ class NewItemTemplate(TemplateFunctions):
 
 #
 # $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
 #

diff --git a/tools/pygettext.py b/tools/pygettext.py
index 546874c5990755f60ec17f8ba08632b624f127ce..82d1fefd18db4ac7f47e2b8f61c966d325c282fb 100644 (file)
--- a/tools/pygettext.py
+++ b/tools/pygettext.py
@@ -411,6 +411,14 @@ def main():
     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: