diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index fdf87e528..8ad74975f 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -760,8 +760,8 @@ class ThemeManager(OpenLPMixin, RegistryMixin, QtWidgets.QWidget, Ui_ThemeManage used_count = plugin.uses_theme(theme) if used_count: plugin_usage = "%s%s" % (plugin_usage, (translate('OpenLP.ThemeManager', - '%s time(s) by %s') % - (used_count, plugin.name))) + '%(count)s time(s) by %(plugin)s') % + {'count': used_count, 'plugin': plugin.name})) plugin_usage = "%s\n" % plugin_usage if plugin_usage: critical_error_message_box(translate('OpenLP.ThemeManager', 'Unable to delete theme'), diff --git a/openlp/plugins/songs/lib/importers/wordsofworship.py b/openlp/plugins/songs/lib/importers/wordsofworship.py index 8b87ee214..4c718162a 100644 --- a/openlp/plugins/songs/lib/importers/wordsofworship.py +++ b/openlp/plugins/songs/lib/importers/wordsofworship.py @@ -107,9 +107,9 @@ class WordsOfWorshipImport(SongImport): song_data = open(source, 'rb') if song_data.read(19).decode() != 'WoW File\nSong Words': self.log_error(source, - str(translate('SongsPlugin.WordsofWorshipSongImport', - 'Invalid Words of Worship song file. Missing "%s" header.' - % 'WoW File\\nSong Words'))) + translate('SongsPlugin.WordsofWorshipSongImport', + 'Invalid Words of Worship song file. Missing "%s" header.') + % 'WoW File\\nSong Words') continue # Seek to byte which stores number of blocks in the song song_data.seek(56) @@ -117,9 +117,9 @@ class WordsOfWorshipImport(SongImport): song_data.seek(66) if song_data.read(16).decode() != 'CSongDoc::CBlock': self.log_error(source, - str(translate('SongsPlugin.WordsofWorshipSongImport', - 'Invalid Words of Worship song file. Missing "%s" ' - 'string.' % 'CSongDoc::CBlock'))) + translate('SongsPlugin.WordsofWorshipSongImport', + 'Invalid Words of Worship song file. Missing "%s" string.') + % 'CSongDoc::CBlock') continue # Seek to the beginning of the first block song_data.seek(82)