lp:~alisonken1/openlp/strings-common

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2660

Raoul Snyman: Approve on 2016-05-16

Tim Bentley: Approve on 2016-05-15

Diff: 285 lines (+57/-34)

8 files modified

openlp/core/common/actions.py (+9/-7)
openlp/core/common/languagemanager.py (+6/-5)
openlp/core/common/openlpmixin.py (+3/-2)
openlp/core/common/registry.py (+6/-6)
openlp/core/common/settings.py (+5/-5)
openlp/core/common/uistrings.py (+4/-2)
openlp/core/common/versionchecker.py (+10/-7)
tests/functional/openlp_core_lib/test_projectordb.py (+14/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2661. By Ken Roberts on 2016-05-15

Fix oops

2660. By Ken Roberts on 2016-05-14

core/common convert strings to python3 format

2659. By Tim Bentley on 2016-05-12

"Allow themes to have video files so allow for background videos behind text.
move string to python 3 format

lp:~trb143/openlp/background_videos (revision 2692)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1522/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1433/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1371/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1167/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Test..."

2658. By Ken Roberts on 2016-05-12

"Convert __init__.py file strings from python2 to python3 format

Python2 "%s text" % value1
Python2 "%s text %s" % (value1, value2)
Python3 "{var1} text {var2:02d}".format(var1=text, var2=number)

- String conversions in init files
- Added test for projector power state change
- Remove extraneous print() call in mediainfo plugin
- Fix translate() string formatting
- Revert string format for re.compile() until further testing is done
- Skip crosswalk.com test until their server is fixed

-----..."

2657. By Tomas Groth on 2016-05-09

Added support for detected the new version of mutool which now contains the functionality of mudraw.
Improve mediainfo detection on windows and mac.
Fix crosswalk bible list download.

2656. By Ken Roberts on 2016-05-02

- Convert strings in mainwindow.py
- Convert strings in maindisplay.py
- Added test for projector Manufacturer.__repr__()
- pep8 in tests/functional/openlp_plugins/songs/test_openlpimporter.py

--------------------------------
lp:~alisonken1/openlp/strings_mainwindow (revision 2656)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1512/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1423/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1361/
[SUCCESS] https://ci.o...

2655. By Samuel Mehrbrodt on 2016-04-29

Fix performance regression with Songbook search

The problem was that in each iteration the database was accessed (the song object).
Fixed this by loading all neccessary information directly in the query.

2654. By Raoul Snyman on 2016-04-27

Fix bug #1557514 by auto-detecting the columns of the tables in the songs database

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1557514 (revision 2652)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1503/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1414/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1352/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1148/
[SUCCESS] https://ci.openlp...

2653. By Ian Knight on 2016-04-27

Added QR code and link to iOS remote app and test to HTML Builder.

lp:~knightrider0xd/openlp/ios-app (revision 2650)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1499/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1410/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1348/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1145/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/736/
[SUCCESS] https://ci.openlp.io/job/B...

2652. By Tomas Groth on 2016-04-27

Added support for importing SWORD bibles using PySword.