alex/yomichan-anki
1
Fork 0
Code Releases Activity

Fixing bugs related to adding kana-only cards, bumping version

Browse Source 
Former-commit-id: 298b5275a85d3f60b118846c6fc7b9885702c48a
This commit is contained in:
Alex Yatskov 2013-12-22 13:57:05 -08:00
parent 72459ba337
commit 4194570cd4
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yomi_base/constants.py
View File

@ -17,5 +17,5 @@
c = { c = {
'appVersion': '0.11b', 'appVersion': '0.12b',
} }

3
yomi_base/reader.py
View File

@ -398,6 +398,9 @@ class MainWindowReader(QtGui.QMainWindow, gen.reader_ui.Ui_MainWindowReader):
def ankiIsFactValid(self, profile, markup): def ankiIsFactValid(self, profile, markup):
if markup is None:
return False
if self.anki is None: if self.anki is None:
return False return False

12
yomi_base/reader_util.py
View File

@ -96,16 +96,22 @@ def splitTags(tags):
def markupVocabExp(definition): def markupVocabExp(definition):
if definition['reading']:
summary = u'{expression} [{reading}]'.format(**definition)
else:
summary = u'{expression}'.format(**definition)
return { return {
'expression': definition['expression'], 'expression': definition['expression'],
'reading': definition['reading'], 'reading': definition['reading'] or unicode(),
'glossary': definition['glossary'], 'glossary': definition['glossary'],
'sentence': definition.get('sentence'), 'sentence': definition.get('sentence'),
'summary': u'{expression} [{reading}]'.format(**definition) 'summary': summary
} }
def markupVocabReading(definition): def markupVocabReading(definition):
if definition['reading']:
return { return {
'expression': definition['reading'], 'expression': definition['reading'],
'reading': unicode(), 'reading': unicode(),
@ -119,7 +125,7 @@ def copyVocabDef(definition):
if definition['reading']: if definition['reading']:
result = u'{expression}\t{reading}\t{glossary}\n'.format(**definition) result = u'{expression}\t{reading}\t{glossary}\n'.format(**definition)
else: else:
result = u'{expression}\t{meanings}\n'.format(**definition) result = u'{expression}\t{glossary}\n'.format(**definition)
QtGui.QApplication.clipboard().setText(result) QtGui.QApplication.clipboard().setText(result)