OpenLP

Merge lp://qastaging/~sam92/openlp/bug-1326664-2.0 into lp://qastaging/openlp/2.0

Proposed by Samuel Mehrbrodt on 2014-06-11

Status:	Merged
Approved by:	Tim Bentley on 2014-06-12
Approved revision:	2198
Merged at revision:	2196
Proposed branch:	lp://qastaging/~sam92/openlp/bug-1326664-2.0
Merge into:	lp://qastaging/openlp/2.0
Diff against target:	50 lines (+17/-3) 1 file modified openlp/plugins/songs/lib/ewimport.py (+17/-3)
To merge this branch:	bzr merge lp://qastaging/~sam92/openlp/bug-1326664-2.0
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Tim Bentley		Approve on 2014-06-12
Raoul Snyman	2014-06-11	Approve on 2014-06-12
Review via email: mp+222746@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2014-06-09.

Add proper error messages to EasyWorship import.
Also make sure that Songs.db (lowercase ending) is also being recognized.

Revision history for this message

Raoul Snyman (raoul-snyman) on 2014-06-10: Posted in a previous version of this proposal

review: Needs Fixing

Revision history for this message

Raoul Snyman (raoul-snyman) on 2014-06-10: Posted in a previous version of this proposal

Revision history for this message

Raoul Snyman (raoul-snyman) wrote on 2014-06-10: Posted in a previous version of this proposal

<samuel_m> superfly, concerning https://code.launchpad.net/~sam92/openlp/bug-1326664-2.0/+merge/222473 : The log is presented to the user with first the file name and then the error message. So it doesn't make much sense to include the filename in the error message.