← Back to branch summary

~mahfiaz/openlp/opensong-bible-importer-crash

« back to all changes in this revision

Viewing changes to openlp/plugins/songs/forms/editsongform.py

  • Committer: Raoul Snyman
  • Author(s): Samuel Mehrbrodt
  • Date: 2013-08-16 20:50:26 UTC
  • mfrom: (2279.2.2 bug-1094809)
  • Revision ID: raoul@snyman.info-20130816205026-m2zya1c9cp9xslgj
https://launchpad.net/bugs/1094809
Fix bug #1094809: Improve the Message when a wrong Verse order was entered

Show diffs side-by-side

added added

removed removed

Lines of Context:
openlp/plugins/songs/forms/editsongform.py
171
171
        if invalid_verses:
172
172
            valid = create_separated_list(verse_names)
173
173
            if len(invalid_verses) > 1:
174
 
                critical_error_message_box(message=translate('SongsPlugin.EditSongForm',
175
 
                    'The verse order is invalid. There are no verses corresponding to %s. Valid entries are %s.') %
176
 
                    (u', '.join(invalid_verses), valid))
 
174
                msg = translate('SongsPlugin.EditSongForm', 'There are no verses corresponding to "%(invalid)s".'
 
175
                    'Valid entries are %(valid)s.\nPlease enter the verses seperated by spaces.') \
 
176
                    % {'invalid' : u', '.join(invalid_verses), 'valid' : valid}
177
177
            else:
178
 
                critical_error_message_box(message=translate('SongsPlugin.EditSongForm',
179
 
                    'The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s.') %
180
 
                    (invalid_verses[0], valid))
 
178
                msg = translate('SongsPlugin.EditSongForm', 'There is no verse corresponding to "%(invalid)s".'
 
179
                    'Valid entries are %(valid)s.\nPlease enter the verses seperated by spaces.') \
 
180
                    % {'invalid' : invalid_verses[0], 'valid' : valid}
 
181
            critical_error_message_box(title=translate('SongsPlugin.EditSongForm', 'Invalid Verse Order'),
 
182
                                       message=msg)
181
183
        return len(invalid_verses) == 0
182
184
 
183
185
    def _validate_song(self):