Skip to content

Commit bbeaa64

Browse files
author
Richard Jones
committed
fixes
1 parent 8ae6ad9 commit bbeaa64

File tree

5 files changed

+37
-14
lines changed

5 files changed

+37
-14
lines changed

I18N_PROGRESS.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ whether there is at least one use of "_()".
1717

1818
THESE FILES DO NOT USE _()
1919
==========================
20-
roundup-admin
21-
roundup-mailgw
22-
roundup-server
23-
cgi-bin/roundup.cgi
24-
roundup/__init__.py
2520
roundup/cgitb.py
2621
roundup/date.py
2722
roundup/htmltemplate.py
@@ -57,7 +52,13 @@ roundup/templates/extended/detectors/nosyreaction.py
5752

5853
THESE FILES DO USE _()
5954
======================
55+
roundup-admin
56+
roundup-mailgw
57+
roundup-server
58+
cgi-bin/roundup.cgi
59+
roundup/__init__.py
6060
roundup/cgi_client.py
61+
roundup/admin.py
6162

6263

6364
WE DON'T CARE ABOUT THESE FILES

cgi-bin/roundup.cgi

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1717
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1818
#
19-
# $Id: roundup.cgi,v 1.23 2002-01-05 02:19:03 richard Exp $
19+
# $Id: roundup.cgi,v 1.24 2002-01-05 02:21:22 richard Exp $
2020

2121
# python version check
2222
from roundup import version_check
2323
from roundup.i18n import _
24+
import sys
2425

2526
#
2627
## Configuration
@@ -51,7 +52,7 @@ ROUNDUP_INSTANCE_HOMES = {
5152
class DevNull:
5253
def write(self, info):
5354
pass
54-
def close():
55+
def close(self):
5556
pass
5657
#LOG = open('/var/log/roundup.cgi.log', 'a')
5758
LOG = DevNull()
@@ -197,6 +198,9 @@ LOG.close()
197198

198199
#
199200
# $Log: not supported by cvs2svn $
201+
# Revision 1.23 2002/01/05 02:19:03 richard
202+
# i18n'ification
203+
#
200204
# Revision 1.22 2001/12/13 00:20:01 richard
201205
# . Centralised the python version check code, bumped version to 2.1.1 (really
202206
# needs to be 2.1.2, but that isn't released yet :)

roundup-admin

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,27 @@
1616
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1717
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1818
#
19-
# $Id: roundup-admin,v 1.60 2002-01-05 02:11:22 richard Exp $
19+
# $Id: roundup-admin,v 1.61 2002-01-05 02:21:21 richard Exp $
2020

2121
# python version check
2222
from roundup import version_check
2323

2424
# import the admin tool guts and make it go
2525
from roundup.admin import AdminTool
26-
if __name__ == '__main__':
27-
tool = AdminTool()
28-
sys.exit(tool.main())
26+
from roundup.i18n import _
27+
28+
import sys
29+
tool = AdminTool()
30+
sys.exit(tool.main())
2931

3032
#
3133
# $Log: not supported by cvs2svn $
34+
# Revision 1.60 2002/01/05 02:11:22 richard
35+
# I18N'ed roundup admin - and split the code off into a module so it can be used
36+
# elsewhere.
37+
# Big issue with this is the doc strings - that's the help. We're probably going to
38+
# have to switch to not use docstrings, which will suck a little :(
39+
#
3240
# Revision 1.59 2001/12/31 05:20:34 richard
3341
# . #496360 ] table width does not work
3442
#

roundup-server

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#
1919
""" HTTP Server that serves roundup.
2020
21-
$Id: roundup-server,v 1.24 2002-01-05 02:19:03 richard Exp $
21+
$Id: roundup-server,v 1.25 2002-01-05 02:21:21 richard Exp $
2222
"""
2323

2424
# python version check
@@ -181,7 +181,7 @@ roundup-server [-n hostname] [-p port] [name=instance home]*
181181
"roundup-admin init". You may specify any number of these name=home
182182
pairs on the command-line. For convenience, you may edit the
183183
ROUNDUP_INSTANCE_HOMES variable in the roundup-server file instead.
184-
'''%locals()
184+
''')%locals()
185185
sys.exit(0)
186186

187187
def main():
@@ -248,6 +248,9 @@ if __name__ == '__main__':
248248

249249
#
250250
# $Log: not supported by cvs2svn $
251+
# Revision 1.24 2002/01/05 02:19:03 richard
252+
# i18n'ification
253+
#
251254
# Revision 1.23 2001/12/15 23:47:07 richard
252255
# sys module went away...
253256
#

roundup/templates/extended/htmlbase.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
</tr>
103103
"""
104104

105-
issueDOTitem = """<!-- dollarId: issue.item,v 1.7 2001/11/21 02:34:18 richard Exp dollar-->
105+
issueDOTitem = """<!-- dollarId: issue.item,v 1.8 2001/12/18 05:05:14 richard Exp dollar-->
106106
<table border=0 cellspacing=0 cellpadding=2>
107107
108108
<tr class="strong-header">
@@ -197,6 +197,13 @@
197197
</tr>
198198
</property>
199199
200+
<tr class="strong-header">
201+
<td colspan=4><b>History</b></td>
202+
</tr>
203+
<tr>
204+
<td colspan=4><display call="history()"></td>
205+
</tr>
206+
200207
</table>
201208
202209
"""

0 commit comments

Comments
 (0)