WIP

Author: GreenWizard2015

core/CAIAssistant.py

@@ -39,7 +39,7 @@ def _extractParts(self, text):
     text = '\n' + text + '\n' # hack to make it work
     tmp = [x for x in text.split('\n@')]
     # split into parts by :
-    tmp = [tuple(y.strip('\n" \t\r\'{}') for y in x.split(':', maxsplit=1)) for x in tmp]
+    tmp = [tuple(y.strip('\n" \t\r\'`{}') for y in x.split(':', maxsplit=1)) for x in tmp]
     # remove empty parts
     tmp = [x for x in tmp if (len(x) == 2) and (len(x[0]) > 0) and (len(x[1]) > 0)]
     return {k: v for k, v in tmp}
@@ -71,11 +71,11 @@ def translate(self, text, fastTranslation, language):
       }
     )
     flags = res['Flags']
-    totalIssues = sum([int(v) for k, v in flags.items()])
+    totalIssues = sum([int(v) for v in flags.values()])
     if totalIssues < 2:
       yield res['Translation']
       return # all ok, no need to run deep translation
-    yield res['Translation'] + '\n\n\n' + res.get('Notification', '')
+    yield res['Translation'], res.get('Notification', '')
 
     # run deep translation
     inputLanguage = res.get('Input language', 'unknown')

core/worker.py

@@ -74,7 +74,7 @@ def _fullTranslate(self, text, fastTranslation, language):
       fastTranslation=fastTranslation,
       language=language['name']
     )
-    for translatedText in translationProcess:
-      yield translatedText
+    for translation in translationProcess:
+      yield translation
       continue
     return

main.py

@@ -119,8 +119,15 @@ def fastTranslated(self, text):
     return
 
   def fullTranslated(self, text):
+    notification = None
+    if isinstance(text, tuple):
+      text, notification = text
+
     self._fullOutputText.delete("1.0", tk.END)
     self._fullOutputText.insert(tk.END, text)
+
+    if notification is not None:
+      self._fullOutputText.insert(tk.END, "\n----------------\n" + notification)
     return
 
   def error(self, e):