WebSVN - navi - Path Comparison - /tsimapiak Rev 145 and /tsimapiak Rev 146

Ignore whitespace Rev 145 → Rev 146

 /tsimapiak/parse.py
 ,9 → 127,5
         if word == None:
             word = parseword(sent[-left:])
         left -= len(word["word"]["navi"].split(" "))
-        if word["word"]["id"] != 0:
-            word["translated"] = dbconnector.translate(word["word"]["id"],"eng")
-        else:
-            word["translated"] = word["word"]["navi"]
         ret.append(word)
     return ret

 /tsimapiak/parsenum.py
 ,15 → 64,24
         numin = numin[:-1]
     #base numbers
-    for n in range(len(num)):
-            if (numin == num[n]) or (numin == numord[n]):
-                outoct = n
-                outdec = n
-                ret["word"]["navi"] = unicode(outdec) if not u"ve" in posts else unicode(outdec) + u"."
-                ret["dec"] = outdec
-                ret["oct"] = outoct
-                return ret
+    if u"ve" in posts:
+        for n in range(len(num)):
+                if numin == numord[n]:
+                    outoct = n
+                    outdec = n
+                    ret["word"]["navi"] = unicode(outdec) + u"."
+                    ret["dec"] = outdec
+                    ret["oct"] = outoct
+                    return ret
+    else:
+        for n in range(len(num)):
+                if numin == num[n]:
+                    outoct = n
+                    outdec = n
+                    ret["word"]["navi"] = unicode(outdec)
+                    ret["dec"] = outdec
+                    ret["oct"] = outoct
+                    return ret
     #other numbers
     for n in range(len(base)):
         if numin.startswith(base[n] + u"zazam"):

 /tsimapiak/translate.py
 ,0 → 1,10
+import parse
+def translatesent(sent, lang):
+    sent = parse.parsesent(sent)
+    for word in sent:
+        if word["word"]["id"] != 0:
+            word["translated"] = dbconnector.translate(word["word"]["id"],lang)
+        else:
+            word["translated"] = word["word"]["navi"]
+    return sent