OpenLP

Merge lp://qastaging/~suutari-olli/openlp/bug-fixes-2-4-3 into lp://qastaging/openlp

  1. bug-fixes-2-4-3
  2. Merge into trunk
Proposed by Azaziah
Status: Merged
Merged at revision: 2706
Proposed branch: lp://qastaging/~suutari-olli/openlp/bug-fixes-2-4-3
Merge into: lp://qastaging/openlp
Diff against target: 302 lines (+90/-90)
7 files modified
openlp/core/__init__.py (+40/-6)
openlp/core/lib/__init__.py (+15/-22)
openlp/core/ui/advancedtab.py (+0/-21)
openlp/core/ui/lib/treewidgetwithdnd.py (+6/-1)
openlp/core/ui/slidecontroller.py (+2/-0)
tests/functional/openlp_core_lib/test_lib.py (+25/-37)
tests/functional/openlp_plugins/bibles/test_swordimport.py (+2/-3)
To merge this branch: bzr merge lp://qastaging/~suutari-olli/openlp/bug-fixes-2-4-3
Reviewer Review Type Date Requested Status
Tim Bentley Needs Fixing
Tomas Groth Needs Fixing
Raoul Snyman Approve
Review via email: mp+308596@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2016-10-04.

Description of the change

This branch fixes the following bugs:
Bug #1487788: Importing photos does not give focus to OpenLP
Bug #1512040: Loop tooltip gets stuck to "Stop playing..."
Bug #1513490: List of authors uses localized "and" instead of English
Bug #1624661: Missing DB in unmounted disk results in Traceback

lp:~suutari-olli/openlp/bug-fixes-2-4-3 (revision 2721)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1798/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1709/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1647/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1403/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/993/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1061/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/929/
[SUCCESS] https://ci.openlp.io/job/Branch-05c-Code_Analysis2/90/

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

Looks good, Olli!

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

Looks good, but just a little text fix...

review: Needs Fixing
Revision history for this message
Tim Bentley (trb143) wrote :

See below

review: Needs Fixing
Revision history for this message
Azaziah (suutari-olli) wrote :

Answered to trb143's notes.

lp://qastaging/~suutari-olli/openlp/bug-fixes-2-4-3 updated
2722. By Azaziah

- Modified the def create_separated_list by suggestions of TRB143

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

>The problem with the word "and" is that in English "," is used before
>it, where as in many other languages "," is never used before "and". To
>make it even more complicated there's no "," before and if the list
>only has two items.

Actually, it depends on the person. I personally hold to "no comma before 'and'", but my wife insists on adding the comma. Both are correct.

--
Raoul Snyman
082 550 3754
<email address hidden>
Sent from my Android device with K-9 Mail. Please excuse my brevity.

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.