Merge lp:~sam92/openlp/songbook-first-slide into lp:openlp

[Samuel Mehrbrodt]

Fix songbook as first slide display

* Use same format as in footer
* Only display publisher if it is set
* Fix typo in settings

[Samuel Mehrbrodt (sam92)]

Will add a test once I get the tests working again on my machine.

[Raoul Snyman (raoul-snyman)]

Linux tests passed!

[Raoul Snyman (raoul-snyman)]

Linting passed!

[Raoul Snyman (raoul-snyman)]

macOS tests passed!

[Phill (phill-ridout)]

Looks good. Others may say a test is required ;-)

review: Approve

[Tomas Groth (tomasgroth)]

Looks good - let's get it in :)

review: Approve

=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py	2019-02-14 15:09:09 +0000
+++ openlp/plugins/songs/lib/mediaitem.py	2019-02-22 07:38:19 +0000
@@ -585,9 +585,11 @@
         if Settings().value('songs/add songbook slide') and song.songbook_entries:
             first_slide = '\n'
             for songbook_entry in song.songbook_entries:
-                first_slide = first_slide + '{book}/{num}/{pub}\n\n'.format(book=songbook_entry.songbook.name,
-                                                                            num=songbook_entry.entry,
-                                                                            pub=songbook_entry.songbook.publisher)
+                first_slide += '{book} #{num}'.format(book=songbook_entry.songbook.name,
+                                                      num=songbook_entry.entry)
+                if songbook_entry.songbook.publisher:
+                    first_slide += ' ({pub})'.format(pub=songbook_entry.songbook.publisher)
+                first_slide += '\n\n'
 
             service_item.add_from_text(first_slide, 'O1')
         # no verse list or only 1 space (in error)

=== modified file 'openlp/plugins/songs/lib/songstab.py'
--- openlp/plugins/songs/lib/songstab.py	2019-02-14 15:09:09 +0000
+++ openlp/plugins/songs/lib/songstab.py	2019-02-22 07:38:19 +0000
@@ -116,7 +116,7 @@
         self.add_from_service_check_box.setText(translate('SongsPlugin.SongsTab',
                                                           'Import missing songs from Service files'))
         self.songbook_slide_check_box.setText(translate('SongsPlugin.SongsTab',
-                                                        'Add Songbooks as first side'))
+                                                        'Add Songbooks as first slide'))
         self.display_songbook_check_box.setText(translate('SongsPlugin.SongsTab', 'Display songbook in footer'))
         self.display_written_by_check_box.setText(translate(
             'SongsPlugin.SongsTab', 'Show "Written by:" in footer for unspecified authors'))