From a99bd8603f4ab101a213ff581eb3ca88b6a30b74 Mon Sep 17 00:00:00 2001 From: Olli Suutari Date: Fri, 9 Sep 2016 10:57:11 +0300 Subject: [PATCH] - Combined some tags in expection dialogue. - Added new line to the end of the test. --- openlp/core/ui/exceptiondialog.py | 6 +++--- tests/functional/openlp_plugins/bibles/test_mediaitem.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/exceptiondialog.py b/openlp/core/ui/exceptiondialog.py index 7341287c7..bcbc67552 100644 --- a/openlp/core/ui/exceptiondialog.py +++ b/openlp/core/ui/exceptiondialog.py @@ -97,9 +97,9 @@ class Ui_ExceptionDialog(object): translate('OpenLP.ExceptionDialog', 'Please describe what you were trying to do. ' ' If possible, write in English.')) exception_part1 = (translate('OpenLP.ExceptionDialog', - 'Oops, OpenLP hit a problem and couldn\'t recover!

' - 'You can help the OpenLP developers to fix this' - ' by
sending them a bug report to {email}{newlines}' + 'Oops, OpenLP hit a problem and couldn\'t recover!

' + 'You can help
the OpenLP developers to fix this' + ' by
sending them a bug report to {email}{newlines}' ).format(email=' bugs@openlp.org', newlines='

')) self.message_label.setText( diff --git a/tests/functional/openlp_plugins/bibles/test_mediaitem.py b/tests/functional/openlp_plugins/bibles/test_mediaitem.py index 3aea7d825..6d468275b 100644 --- a/tests/functional/openlp_plugins/bibles/test_mediaitem.py +++ b/tests/functional/openlp_plugins/bibles/test_mediaitem.py @@ -167,4 +167,4 @@ class TestMediaItem(TestCase, TestMixin): self.media_item.list_view.clear.assert_called_once_with(), self.media_item.check_search_result.assert_called_once_with(), self.media_item.quick_search_edit.clear.assert_called_once_with(), - self.media_item.quick_search_edit.setFocus.assert_called_once_with() \ No newline at end of file + self.media_item.quick_search_edit.setFocus.assert_called_once_with()