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

Fix bug #1094809: Improve the Message when a wrong Verse order was entered

Browse Source 
bzr-revno: 2286
Fixes: https://launchpad.net/bugs/1094809
This commit is contained in:
Samuel Mehrbrodt 2013-08-16 22:50:26 +02:00 committed by Raoul Snyman
commit ed5fedbf33
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openlp/plugins/songs/forms/editsongform.py
View File

@ -171,13 +171,15 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
if invalid_verses:
valid = create_separated_list(verse_names)
if len(invalid_verses) > 1:
critical_error_message_box(message=translate('SongsPlugin.EditSongForm',
'The verse order is invalid. There are no verses corresponding to %s. Valid entries are %s.') %
(u', '.join(invalid_verses), valid))
msg = translate('SongsPlugin.EditSongForm', 'There are no verses corresponding to "%(invalid)s".'
'Valid entries are %(valid)s.\nPlease enter the verses seperated by spaces.') \
% {'invalid' : u', '.join(invalid_verses), 'valid' : valid}
else:
critical_error_message_box(message=translate('SongsPlugin.EditSongForm',
'The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s.') %
(invalid_verses[0], valid))
msg = translate('SongsPlugin.EditSongForm', 'There is no verse corresponding to "%(invalid)s".'
'Valid entries are %(valid)s.\nPlease enter the verses seperated by spaces.') \
% {'invalid' : invalid_verses[0], 'valid' : valid}
critical_error_message_box(title=translate('SongsPlugin.EditSongForm', 'Invalid Verse Order'),
message=msg)
return len(invalid_verses) == 0
def _validate_song(self):