openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Fix #249 on tracker, exception on opensong files with verse name containing only number [1]

This commit is contained in:
Mattias Põldaru 2011-08-16 03:08:16 +03:00
parent a3ddb50479
commit bbba7203e3
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openlp/plugins/songs/lib/__init__.py
View File

@ -184,10 +184,11 @@ class VerseType(object):
verse_index = VerseType.from_translated_string(verse_name)
if verse_index is None:
verse_index = VerseType.from_string(verse_name)
if verse_index is None:
verse_index = VerseType.from_translated_tag(verse_name)
if verse_index is None:
verse_index = VerseType.from_tag(verse_name)
elif len(verse_name) == 1:
if verse_index is None:
verse_index = VerseType.from_translated_tag(verse_name)
if verse_index is None:
verse_index = VerseType.from_tag(verse_name)
return verse_index
def retrieve_windows_encoding(recommendation=None):

2
openlp/plugins/songs/lib/opensongimport.py
View File

@ -191,6 +191,8 @@ class OpenSongImport(SongImport):
verse_tag = content
verse_num = u'1'
verse_index = VerseType.from_loose_input(verse_tag)
if not verse_index:
verse_index = 0 # Verse
verse_tag = VerseType.Tags[verse_index]
inst = 1
if [verse_tag, verse_num, inst] in our_verse_order \