OpenLP

Merge lp://qastaging/~phill-ridout/openlp/wow_import_fixes into lp://qastaging/openlp

  1. wow_import_fixes
  2. Merge into trunk
Proposed by Phill
Status: Merged
Merged at revision: 2883
Proposed branch: lp://qastaging/~phill-ridout/openlp/wow_import_fixes
Merge into: lp://qastaging/openlp
Diff against target: 746 lines (+467/-100)
12 files modified
openlp/core/common/i18n.py (+2/-1)
openlp/core/lib/__init__.py (+54/-1)
openlp/core/ui/formattingtagcontroller.py (+1/-1)
openlp/core/widgets/edits.py (+1/-1)
openlp/plugins/songs/lib/importers/wordsofworship.py (+146/-79)
tests/functional/openlp_core/lib/test_lib.py (+180/-2)
tests/functional/openlp_plugins/songs/test_wordsofworshipimport.py (+36/-12)
tests/resources/songs/wordsofworship/Amazing Grace (6 Verses)_v2_1_2.json (+1/-1)
tests/resources/songs/wordsofworship/Holy Holy Holy Lord God Almighty_v2_1_2.json (+1/-1)
tests/resources/songs/wordsofworship/Test_Song_v2_0_0.json (+18/-0)
tests/resources/songs/wordsofworship/Test_Song_v2_1_2.json (+26/-0)
tests/resources/songs/wordsofworship/When morning gilds the skies_v2_0_0.json (+1/-1)
To merge this branch: bzr merge lp://qastaging/~phill-ridout/openlp/wow_import_fixes
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Review via email: mp+369468@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2019-06-28.

Commit message

Fix up and improve the Words Of Worship importer

To post a comment you must log in.
Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

Linux tests failed, please see https://ci.openlp.io/job/MP-02-Linux_Tests/192/ for more details

Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

Linux tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

Linting failed, please see https://ci.openlp.io/job/MP-03-Linting/127/ for more details

Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

Linux tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

Linting passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

macOS tests passed!

Revision history for this message
Tim Bentley (trb143) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Linux tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Linting passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

macOS tests passed!

Revision history for this message
Tim Bentley (trb143) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.