raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Noticed the identification for scripture reference error got messed at some point, fixed it.

Browse Source 
Also renamed "Interval" to "gap" to make constructing the message less painful.
This commit is contained in:
suutari-olli 2016-04-10 00:08:49 +03:00
parent e233631c3d
commit c0311ed8c9
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
openlp/core/common/uistrings.py
View File

@ -169,21 +169,21 @@ class UiStrings(object):
cha = chapter cha = chapter
verse = translate('OpenLP.Ui', 'Verse') verse = translate('OpenLP.Ui', 'Verse')
ver = verse ver = verse
interval = ' | ' gap = ' | '
psalm = translate('OpenLP.Ui', 'Psalm') psalm = translate('OpenLP.Ui', 'Psalm')
may_shorten = translate('OpenLP.Ui', 'Book names may be shortened from full names, for an example Ps 23 = ' may_shorten = translate('OpenLP.Ui', 'Book names may be shortened from full names, for an example Ps 23 = '
'Psalm 23') 'Psalm 23')
bible_scripture_items = [bc, interval, psalm, ' 23<br>', bible_scripture_items = [bc, gap, psalm, ' 23<br>',
bc, '%(range)s', cha, interval, psalm, ' 23%(range)s24<br>', bc, '%(range)s', cha, gap, psalm, ' 23%(range)s24<br>',
bc, '%(verse)s', ver, '%(range)s', ver, interval, psalm, ' 23%(verse)s1%(range)s2<br>', bc, '%(verse)s', ver, '%(range)s', ver, gap, psalm, ' 23%(verse)s1%(range)s2<br>',
bc, '%(verse)s', ver, '%(range)s', ver, '%(list)s', ver, '%(range)s', ver, interval, psalm, bc, '%(verse)s', ver, '%(range)s', ver, '%(list)s', ver, '%(range)s', ver, gap, psalm,
' 23%(verse)s1%(range)s2%(list)s5%(range)s6<br>', ' 23%(verse)s1%(range)s2%(list)s5%(range)s6<br>',
bc, '%(verse)s', ver, '%(range)s', ver, '%(list)s', cha, '%(verse)s', ver, '%(range)s', ver, bc, '%(verse)s', ver, '%(range)s', ver, '%(list)s', cha, '%(verse)s', ver, '%(range)s',
interval, psalm, ' 23%(verse)s1%(range)s2%(list)s24%(verse)s1%(range)s3<br>', ver, gap, psalm, ' 23%(verse)s1%(range)s2%(list)s24%(verse)s1%(range)s3<br>', bc,
bc, '%(verse)s', ver, '%(range)s', cha, '%(verse)s', ver, interval, psalm, '%(verse)s', ver, '%(range)s', cha, '%(verse)s', ver, gap, psalm,
' 23%(verse)s1%(range)s24%(verse)s1<br><br>', may_shorten] ' 23%(verse)s1%(range)s24%(verse)s1<br><br>', may_shorten]
itertools.chain.from_iterable(itertools.repeat(strings, 1) if isinstance(strings, str) else strings for strings itertools.chain.from_iterable(itertools.repeat(strings, 1) if isinstance(strings, str) else strings for strings
in bible_scripture_items) in bible_scripture_items)
bible_scripture_error_joined = ''.join(str(joined) for joined in bible_scripture_items) bible_scripture_error_joined = ''.join(str(joined) for joined in bible_scripture_items)
# This is the actual # This is what gets called to other files.
self.BibleScriptureError = bible_scripture_error_joined self.BibleScriptureError = bible_scripture_error_joined