Update translate module for v3.3

This commit is contained in:
Némunaire 2012-11-04 15:58:42 +01:00
parent 20f5c5f453
commit b251b3d852
2 changed files with 17 additions and 14 deletions

3
.gitignore vendored
View File

@ -1,3 +1,6 @@
*#
*~
TAGS
*.py[cod] *.py[cod]
__pycache__ __pycache__
datas/ datas/

View File

@ -6,7 +6,7 @@ import socket
import json import json
from urllib.parse import quote from urllib.parse import quote
nemubotversion = 3.2 nemubotversion = 3.3
import xmlparser import xmlparser
@ -24,28 +24,28 @@ def load(context):
def cmd_translate(msg): def cmd_translate(msg):
global LANG global LANG
startWord = 1 startWord = 1
if msg.cmd[startWord] in LANG: if msg.cmds[startWord] in LANG:
langTo = msg.cmd[startWord] langTo = msg.cmds[startWord]
startWord += 1 startWord += 1
else: else:
langTo = "fr" langTo = "fr"
if msg.cmd[startWord] in LANG: if msg.cmds[startWord] in LANG:
langFrom = langTo langFrom = langTo
langTo = msg.cmd[startWord] langTo = msg.cmds[startWord]
startWord += 1 startWord += 1
else:
if langTo == "en":
langFrom = "fr"
else: else:
if langTo == "en": langFrom = "en"
langFrom = "fr"
else:
langFrom = "en"
(res, page) = getPage(' '.join(msg.cmd[startWord:]), langFrom, langTo) (res, page) = getPage(' '.join(msg.cmds[startWord:]), langFrom, langTo)
if res == http.client.OK: if res == http.client.OK:
wres = json.loads(page.decode()) wres = json.loads(page.decode())
if "Error" in wres: if "Error" in wres:
return Response(msg.sender, wres["Note"], msg.channel) return Response(msg.sender, wres["Note"], msg.channel)
else: else:
start = "Traduction de %s : "%' '.join(msg.cmd[startWord:]) start = "Traduction de %s : "%' '.join(msg.cmds[startWord:])
if "Entries" in wres["term0"]: if "Entries" in wres["term0"]:
if "SecondTranslation" in wres["term0"]["Entries"]["0"]: if "SecondTranslation" in wres["term0"]["Entries"]["0"]:
return Response(msg.sender, start + return Response(msg.sender, start +
@ -71,7 +71,7 @@ def cmd_translate(msg):
else: else:
return Response(msg.sender, "Une erreur s'est produite durant la recherche" return Response(msg.sender, "Une erreur s'est produite durant la recherche"
" d'une traduction de %s" " d'une traduction de %s"
% ' '.join(msg.cmd[startWord:]), % ' '.join(msg.cmds[startWord:]),
msg.channel) msg.channel)