diff --git a/yomi_base/reader_util.py b/yomi_base/reader_util.py index 4788d12..68ad7d1 100644 --- a/yomi_base/reader_util.py +++ b/yomi_base/reader_util.py @@ -78,20 +78,13 @@ def findSentence(content, position): quoteStack.pop() elif c in quotesFwd: quoteStack.insert(0, quotesFwd[c]) - cend = len(content) - translation_start = 0 - for i in xrange(end, cend): - if content[i] == '\t': - translation_start = i+1 - break - translation_end = cend - for i in xrange(translation_start, cend): - if content[i] == '\n': - translation_end = i - break translation = '' - if translation_start > 0: - translation = content[translation_start:translation_end].strip() + translationStart = content.find('\t',end) + if translationStart >= 0: + translationEnd = content.find('\n',translationStart) + if translationEnd == -1: + translationEnd = len(content) + translation = content[translationStart+1:translationEnd].strip() return content[start:end].strip(), translation @@ -121,6 +114,7 @@ def markupVocabExp(definition): 'reading': definition['reading'] or unicode(), 'glossary': definition['glossary'], 'sentence': definition.get('sentence'), + 'translation': definition.get('translation'), 'summary': summary } @@ -132,6 +126,7 @@ def markupVocabReading(definition): 'reading': unicode(), 'glossary': definition['glossary'], 'sentence': definition.get('sentence'), + 'translation': definition.get('translation'), 'summary': definition['reading'] }