OpenLP

Merge lp://qastaging/~tomasgroth/openlp/25bugfixes2 into lp://qastaging/openlp

  1. 25bugfixes2
  2. Merge into trunk
Proposed by Tomas Groth
Status: Merged
Approved by: Raoul Snyman
Approved revision: 2640
Merged at revision: 2639
Proposed branch: lp://qastaging/~tomasgroth/openlp/25bugfixes2
Merge into: lp://qastaging/openlp
Diff against target: 195 lines (+51/-19)
9 files modified
openlp/core/ui/firsttimewizard.py (+7/-4)
openlp/core/ui/thememanager.py (+2/-2)
openlp/plugins/bibles/lib/http.py (+1/-1)
openlp/plugins/bibles/lib/mediaitem.py (+3/-0)
openlp/plugins/bibles/lib/zefania.py (+2/-1)
openlp/plugins/songs/lib/__init__.py (+2/-1)
openlp/plugins/songs/lib/importers/wordsofworship.py (+6/-6)
tests/functional/__init__.py (+3/-3)
tests/functional/openlp_plugins/songs/test_lib.py (+25/-1)
To merge this branch: bzr merge lp://qastaging/~tomasgroth/openlp/25bugfixes2
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Tim Bentley Approve
Review via email: mp+291465@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2016-03-29.

Description of the change

Fix traceback when searching for book that doesn't exists in second bible. Fixes bug 1553863.
Set progress bar steps to number of chapters in zefania import.
Use standard button text in the FTW, if possible. Fixes bug 1554554.
Translation fixes. Fixes bug 1545072
Fix song tag detection. Fixes bug 1549549.
Fix a method call with too many parentheses, which fixes getting bible books from crosswalk.

To post a comment you must log in.
Revision history for this message
Tomas Groth (tomasgroth) wrote : Posted in a previous version of this proposal

lp:~tomasgroth/openlp/25bugfixes2 (revision 2637)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1345/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1265/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1204/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1039/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/630/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/697/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/565/

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

All good, would just prefer except <SomeTypeOfExceptionHere> over a catch-all except statement.

review: Needs Information
Revision history for this message
Tomas Groth (tomasgroth) wrote :

Made the exception catch more specific, as requested.

lp:~tomasgroth/openlp/25bugfixes2 (revision 2640)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1415/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1333/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1272/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1085/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/676/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/743/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/611/

Revision history for this message
Tim Bentley (trb143) :
review: Approve
Revision history for this message
Raoul Snyman (raoul-snyman) :
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.