From 1e139b3afacdd98cedaa219d7783189846641383 Mon Sep 17 00:00:00 2001 From: nemunaire Date: Fri, 8 Aug 2014 18:22:14 +0200 Subject: [PATCH] Translate module: fix order of meanings --- modules/translate.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/translate.py b/modules/translate.py index 7e0fe0d..fb8f649 100644 --- a/modules/translate.py +++ b/modules/translate.py @@ -73,14 +73,15 @@ def cmd_translate(msg): res = Response(msg.sender, channel=msg.channel, count=" (%d more meanings)", nomore="No more translation") - for k, t in wres.items(): + for k in sorted(wres.keys()): + t = wres[k] if len(k) > 4 and k[:4] == "term": if "Entries" in t: ent = t["Entries"] else: ent = t["PrincipalTranslations"] - for i in ent: + for i in sorted(ent.keys()): res.append_message("Translation of %s%s: %s" % ( ent[i]["OriginalTerm"]["term"], meaning(ent[i]["OriginalTerm"]), @@ -103,4 +104,6 @@ def extract_traslation(entry): for i in [ "FirstTranslation", "SecondTranslation", "ThirdTranslation", "FourthTranslation" ]: if i in entry: ret.append("\x03\x02%s\x03\x02%s" % (entry[i]["term"], meaning(entry[i]))) + if "Note" in entry and entry["Note"]: + ret.append("note: %s" % entry["Note"]) return ", ".join(ret)