Merge branch 'master' of github.com:finalion/WordQuery

finalion · May 5, 2017 · 6a2b165 · 6a2b165
2 parents 2702ddc + 3de5d5a
commit 6a2b165
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/wquery/lang.py b/wquery/lang.py
@@ -35,9 +35,9 @@
     'NOTE_TYPE_FIELDS': {'zh_CN': u'<b>笔记字段</b>', 'en': u'<b>Note fields</b>', 'fr': u'<b>Champ de note</b>'},
     'DICTS': {'zh_CN': u'<b>字典</b>', 'en': u'<b>Dict</b>', 'fr': u'<b>Dico</b>'},
     'DICT_FIELDS': {'zh_CN': u'<b>字典字段</b>', 'en': u'<b>Dict fields</b>', 'fr': u'<b>Champ de dico</b>'},
-    'RADIOS_DESC': {'zh_CN': u'<b>单选框选中为待查询单词字段</b>', 'en': u'<b>Word field needs to be selected.</b>', 'fr': u'<b>Champ de mot doit être sélectionné. </b>'},
-    'NO_QUERY_WORD': {'zh_CN': u'查询字段无单词', 'en': u'No word is found in the query field', 'fr': u'Aucun est trouvée dans le champ'},
-    'CSS_NOT_FOUND': {'zh_CN': u'没有找到CSS文件，请手动选择', 'en': u'No valid css stylesheets found, please choose the file', 'fr': u'No valid css stylesheets found, please choose the file'}
+    'RADIOS_DESC': {'zh_CN': u'<b>单选框选中为待查询单词字段</b>', 'en': u'<b>Word field needs to be selected.</b>', 'fr': u'<b>Champ de mot doit d\'être sélectionné. </b>'},
+    'NO_QUERY_WORD': {'zh_CN': u'查询字段无单词', 'en': u'No word is found in the query field', 'fr': u'Aucun est trouvé dans le champ'},
+    'CSS_NOT_FOUND': {'zh_CN': u'没有找到CSS文件，请手动选择', 'en': u'No valid css stylesheets found, please choose the file', 'fr': u'Aucun fichier de style CSS valide, veuillez choisir le fichier'}
 }
 
 

diff --git a/wquery/query.py b/wquery/query.py
@@ -115,7 +115,7 @@ def query_from_browser(browser):
 
 
 def query_from_editor_all_fields(editor):
-    if not editor:
+    if not editor or not editor.note:
         return
     work_manager.reset_query_counts()
     update_progress_label.kwargs = defaultdict(str)