fixes

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

diff --git a/I18N_PROGRESS.txt b/I18N_PROGRESS.txt
index ecc5cf94164e31632768043d2d0119a4a3d64633..a664c53e658b06b22b5de4cbdaac78e36664ae6a 100644 (file)
--- a/I18N_PROGRESS.txt
+++ b/I18N_PROGRESS.txt
@@ -17,11 +17,6 @@ whether there is at least one use of "_()".
 
 THESE FILES DO NOT USE _()
 ==========================
-roundup-admin
-roundup-mailgw
-roundup-server
-cgi-bin/roundup.cgi
-roundup/__init__.py
 roundup/cgitb.py
 roundup/date.py
 roundup/htmltemplate.py
@@ -57,7 +52,13 @@ roundup/templates/extended/detectors/nosyreaction.py
 
 THESE FILES DO USE _()
 ======================
+roundup-admin
+roundup-mailgw
+roundup-server
+cgi-bin/roundup.cgi
+roundup/__init__.py
 roundup/cgi_client.py
+roundup/admin.py
 
 
 WE DON'T CARE ABOUT THESE FILES

diff --git a/cgi-bin/roundup.cgi b/cgi-bin/roundup.cgi
index 93c1ebd5cdbfa3de3d42bfa5cc266435a872bfa8..ca146d34e09c3586c789c5b01ae2b2a993fafc9e 100755 (executable)
--- a/cgi-bin/roundup.cgi
+++ b/cgi-bin/roundup.cgi
@@ -16,11 +16,12 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: roundup.cgi,v 1.23 2002-01-05 02:19:03 richard Exp $
+# $Id: roundup.cgi,v 1.24 2002-01-05 02:21:22 richard Exp $
 
 # python version check
 from roundup import version_check
 from roundup.i18n import _
+import sys
 
 #
 ##  Configuration
@@ -51,7 +52,7 @@ ROUNDUP_INSTANCE_HOMES = {
 class DevNull:
     def write(self, info):
         pass
-    def close():
+    def close(self):
         pass
 #LOG = open('/var/log/roundup.cgi.log', 'a')
 LOG = DevNull()
@@ -197,6 +198,9 @@ LOG.close()
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.23  2002/01/05 02:19:03  richard
+# i18n'ification
+#
 # Revision 1.22  2001/12/13 00:20:01  richard
 #  . Centralised the python version check code, bumped version to 2.1.1 (really
 #    needs to be 2.1.2, but that isn't released yet :)

diff --git a/roundup-admin b/roundup-admin
index 67490f30452a8f20cceca8c57bb0bd76a88179a4..9a1f74ce823545ebaf47545e139e563ffa0365ed 100755 (executable)
--- a/roundup-admin
+++ b/roundup-admin
@@ -16,19 +16,27 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: roundup-admin,v 1.60 2002-01-05 02:11:22 richard Exp $
+# $Id: roundup-admin,v 1.61 2002-01-05 02:21:21 richard Exp $
 
 # python version check
 from roundup import version_check
 
 # import the admin tool guts and make it go
 from roundup.admin import AdminTool
-if __name__ == '__main__':
-    tool = AdminTool()
-    sys.exit(tool.main())
+from roundup.i18n import _
+
+import sys
+tool = AdminTool()
+sys.exit(tool.main())
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.60  2002/01/05 02:11:22  richard
+# I18N'ed roundup admin - and split the code off into a module so it can be used
+# elsewhere.
+# Big issue with this is the doc strings - that's the help. We're probably going to
+# have to switch to not use docstrings, which will suck a little :(
+#
 # Revision 1.59  2001/12/31 05:20:34  richard
 #  . #496360 ] table width does not work
 #

diff --git a/roundup-server b/roundup-server
index d7432d1177c4da3b0a37e157910c648dc2d2545a..5c8222c601d6e1137ef7701c9bf3395251dc7f09 100755 (executable)
--- a/roundup-server
+++ b/roundup-server
@@ -18,7 +18,7 @@
 # 
 """ HTTP Server that serves roundup.
 
-$Id: roundup-server,v 1.24 2002-01-05 02:19:03 richard Exp $
+$Id: roundup-server,v 1.25 2002-01-05 02:21:21 richard Exp $
 """
 
 # python version check
@@ -181,7 +181,7 @@ roundup-server [-n hostname] [-p port] [name=instance home]*
    "roundup-admin init". You may specify any number of these name=home
    pairs on the command-line. For convenience, you may edit the
    ROUNDUP_INSTANCE_HOMES variable in the roundup-server file instead.
-'''%locals()
+''')%locals()
     sys.exit(0)
 
 def main():
@@ -248,6 +248,9 @@ if __name__ == '__main__':
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.24  2002/01/05 02:19:03  richard
+# i18n'ification
+#
 # Revision 1.23  2001/12/15 23:47:07  richard
 # sys module went away...
 #

diff --git a/roundup/templates/extended/htmlbase.py b/roundup/templates/extended/htmlbase.py
index cdf463a21ef206691028c8e781a7640fefc6fb42..b6ba31b423f8e131b7cda7f9797d344a0d72b2ba 100644 (file)
--- a/roundup/templates/extended/htmlbase.py
+++ b/roundup/templates/extended/htmlbase.py
@@ -102,7 +102,7 @@ issueDOTindex = """<!-- dollarId: issue.index,v 1.3 2001/08/01 05:15:09 richard
 </tr>
 """
 
-issueDOTitem = """<!-- dollarId: issue.item,v 1.7 2001/11/21 02:34:18 richard Exp dollar-->
+issueDOTitem = """<!-- dollarId: issue.item,v 1.8 2001/12/18 05:05:14 richard Exp dollar-->
 <table border=0 cellspacing=0 cellpadding=2>
 
 <tr class="strong-header">
@@ -197,6 +197,13 @@ issueDOTitem = """<!-- dollarId: issue.item,v 1.7 2001/11/21 02:34:18 richard Ex
  </tr>
 </property>
 
+<tr class="strong-header">
+    <td colspan=4><b>History</b></td>
+</tr>
+<tr>
+    <td colspan=4><display call="history()"></td>
+</tr>
+
 </table>
 
 """