~sam92/openlp/bug-1552563

Viewing all changes in revision 2650.

  • Committer: Tim Bentley
  • Author(s): alisonken1 at gmail
  • Date: 2016-04-23 13:48:27 UTC
  • mfrom: (2640.5.6 strings_projector_ui)
  • Revision ID: tim.bentley@gmail.com-20160423134827-o6kh7i2j4r6l7dxx
- Update string format to Python3 style
- Added projector multiple lamp values test
- Updated strings for translation (they should all be ok now)
- Fix merge conflicts (projector_pjlink1 and projector_ui tests)

Convert string format from Python2
     '%s %s' % (value1, value2)
to Python3
     '{key1} {key2}'.format(key1=value1, key2=value2)

Jenkins down - local pep8 and tests (except windows tests) passed.

Previous Jenkins test:
--------------------------------
lp:~alisonken1/openlp/string...

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: