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

Fixed for now - could be better

Browse Source
This commit is contained in:
Tim Bentley 2010-06-06 18:03:48 +01:00
parent 950dc73d2b
commit b624ba0ed0
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openlp/plugins/songs/forms/__init__.py
View File

@ -33,12 +33,11 @@ class VerseType(object):
Intro = 4 Intro = 4
Ending = 5 Ending = 5
Other = 6 Other = 6
verse_string = u'verse'
@staticmethod @staticmethod
def to_string(verse_type): def to_string(verse_type):
if verse_type == VerseType.Verse: if verse_type == VerseType.Verse:
return translate('VerseType', VerseType.verse_string.title()) return translate('VerseType', 'Verse')
elif verse_type == VerseType.Chorus: elif verse_type == VerseType.Chorus:
return translate('VerseType', 'Chorus') return translate('VerseType', 'Chorus')
elif verse_type == VerseType.Bridge: elif verse_type == VerseType.Bridge:
@ -55,19 +54,19 @@ class VerseType(object):
@staticmethod @staticmethod
def from_string(verse_type): def from_string(verse_type):
verse_type = verse_type.lower() verse_type = verse_type.lower()
if verse_type == translate('VerseType', VerseType.verse_string): if verse_type == unicode(VerseType.to_string(VerseType.Verse)).lower():
return VerseType.Verse return VerseType.Verse
elif verse_type == translate('VerseType', 'chorus'): elif verse_type == unicode(VerseType.to_string(VerseType.Chorus)).lower():
return VerseType.Chorus return VerseType.Chorus
elif verse_type == translate('VerseType', 'bridge'): elif verse_type == unicode(VerseType.to_string(VerseType.Bridge)).lower():
return VerseType.Bridge return VerseType.Bridge
elif verse_type == translate('VerseType', 'pre-chorus'): elif verse_type == unicode(VerseType.to_string(VerseType.PreChorus)).lower():
return VerseType.PreChorus return VerseType.PreChorus
elif verse_type == translate('VerseType', 'intro'): elif verse_type == unicode(VerseType.to_string(VerseType.Intro)).lower():
return VerseType.Intro return VerseType.Intro
elif verse_type == translate('VerseType', 'ending'): elif verse_type == unicode(VerseType.to_string(VerseType.Ending)).lower():
return VerseType.Ending return VerseType.Ending
elif verse_type == translate('VerseType', 'other'): elif verse_type == unicode(VerseType.to_string(VerseType.Other)).lower():
return VerseType.Other return VerseType.Other
from authorsform import AuthorsForm from authorsform import AuthorsForm