From c0311ed8c9e8a621e398841c7aad563739629b5a Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Sun, 10 Apr 2016 00:08:49 +0300 Subject: [PATCH] Noticed the identification for scripture reference error got messed at some point, fixed it. Also renamed "Interval" to "gap" to make constructing the message less painful. --- openlp/core/common/uistrings.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/openlp/core/common/uistrings.py b/openlp/core/common/uistrings.py index 85a3fc1fc..c84c3c600 100644 --- a/openlp/core/common/uistrings.py +++ b/openlp/core/common/uistrings.py @@ -169,21 +169,21 @@ class UiStrings(object): cha = chapter verse = translate('OpenLP.Ui', 'Verse') ver = verse - interval = ' | ' + gap = ' | ' psalm = translate('OpenLP.Ui', 'Psalm') may_shorten = translate('OpenLP.Ui', 'Book names may be shortened from full names, for an example Ps 23 = ' 'Psalm 23') - bible_scripture_items = [bc, interval, psalm, ' 23
', - bc, '%(range)s', cha, interval, psalm, ' 23%(range)s24
', - bc, '%(verse)s', ver, '%(range)s', ver, interval, psalm, ' 23%(verse)s1%(range)s2
', - bc, '%(verse)s', ver, '%(range)s', ver, '%(list)s', ver, '%(range)s', ver, interval, psalm, - ' 23%(verse)s1%(range)s2%(list)s5%(range)s6
', - bc, '%(verse)s', ver, '%(range)s', ver, '%(list)s', cha, '%(verse)s', ver, '%(range)s', ver, - interval, psalm, ' 23%(verse)s1%(range)s2%(list)s24%(verse)s1%(range)s3
', - bc, '%(verse)s', ver, '%(range)s', cha, '%(verse)s', ver, interval, psalm, - ' 23%(verse)s1%(range)s24%(verse)s1

', may_shorten] + bible_scripture_items = [bc, gap, psalm, ' 23
', + bc, '%(range)s', cha, gap, psalm, ' 23%(range)s24
', + bc, '%(verse)s', ver, '%(range)s', ver, gap, psalm, ' 23%(verse)s1%(range)s2
', + bc, '%(verse)s', ver, '%(range)s', ver, '%(list)s', ver, '%(range)s', ver, gap, psalm, + ' 23%(verse)s1%(range)s2%(list)s5%(range)s6
', + bc, '%(verse)s', ver, '%(range)s', ver, '%(list)s', cha, '%(verse)s', ver, '%(range)s', + ver, gap, psalm, ' 23%(verse)s1%(range)s2%(list)s24%(verse)s1%(range)s3
', bc, + '%(verse)s', ver, '%(range)s', cha, '%(verse)s', ver, gap, psalm, + ' 23%(verse)s1%(range)s24%(verse)s1

', may_shorten] itertools.chain.from_iterable(itertools.repeat(strings, 1) if isinstance(strings, str) else strings for strings 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