mirror of https://github.com/tLDP/LDP
fix language serving
This commit is contained in:
parent
772fe0d26b
commit
b5dabe9255
|
@ -66,8 +66,8 @@ def tf2bool(tf):
|
|||
"""
|
||||
Converts a t/f string value into a 1/0 integer value.
|
||||
"""
|
||||
|
||||
if tf == 't':
|
||||
|
||||
if tf:
|
||||
return 1
|
||||
else:
|
||||
return 0
|
||||
|
|
|
@ -143,11 +143,17 @@ class PageFactory:
|
|||
|
||||
# Allow the language to be specified in the URL
|
||||
#
|
||||
Log(3, 'Testing language ' + Keys[0])
|
||||
if Keys[0] in L.Languages.keys():
|
||||
Log(3, 'URL specified the ' + Keys[0] + ' translation')
|
||||
if L.Languages[Keys[0]].Supported:
|
||||
lang = Keys[0]
|
||||
else:
|
||||
Log(3, 'Language ' + Keys[0] + ' not supported')
|
||||
print L.Languages[Keys[0]].Supported
|
||||
Keys = Keys[1:]
|
||||
|
||||
|
||||
Log(3, 'Serving language ' + lang)
|
||||
pagecode = Keys[0]
|
||||
if pagecode == 'doc':
|
||||
DocID = int(Keys[1])
|
||||
|
@ -233,6 +239,7 @@ def main():
|
|||
for arg in sys.argv[1:]:
|
||||
print F.Page(arg, 'EN')
|
||||
|
||||
|
||||
def usage():
|
||||
print "HTML.py version " + VERSION
|
||||
|
||||
|
|
|
@ -238,8 +238,9 @@ class testLanguages(unittest.TestCase):
|
|||
|
||||
def testLanguages(self):
|
||||
L.Log(3, 'testing Languages')
|
||||
assert L.Languages['EN'].I18n['EN'].Name == 'English'
|
||||
assert L.Languages['EN'].Supported
|
||||
assert L.Languages['EN'].I18n['EN'].Name == 'English'
|
||||
assert L.Languages['FR'].Supported
|
||||
assert L.Languages['FR'].I18n['EN'].Name == 'French'
|
||||
assert L.Languages.Count() == 136
|
||||
L.Log(3, 'testing Languages done')
|
||||
|
|
|
@ -62,6 +62,7 @@ def WebServer():
|
|||
server = BaseHTTPServer.HTTPServer((interface, port), RequestHandler)
|
||||
server.serve_forever()
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
WebServer()
|
||||
|
||||
|
|
Loading…
Reference in New Issue