diff --git a/openlp/core/common/uistrings.py b/openlp/core/common/uistrings.py index 8e98fd009..5514b0ffe 100644 --- a/openlp/core/common/uistrings.py +++ b/openlp/core/common/uistrings.py @@ -161,8 +161,9 @@ class UiStrings(object): '(list)sChapter%(verse)sVerse%(range)sVerse | John 3%(verse)' 's16%(range)s17%(list)s5%(verse)s7%(range)s9
Book Chapter%' '(verse)sVerse%(range)sChapter%(verse)sVerse | John 3%(verse)' - 's16%(range)s4%(verse)s2

', - 'Please pay attention to the appended "s" of the wildcards and refrain ' + 's16%(range)s4%(verse)s2

Book names may be shortened ' + 'from full names, for an example: Joh 3 = John 3' + , 'Please pay attention to the appended "s" of the wildcards and refrain ' 'from translating the words inside the names in the brackets.') self.BibleShortSearch = translate('OpenLP.Ui', 'The keyword you have entered is empty or shorter ' 'than 3 characters long.\nPlease try again with ' diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py index b74bc6fab..009f7e65d 100644 --- a/openlp/plugins/bibles/lib/manager.py +++ b/openlp/plugins/bibles/lib/manager.py @@ -280,10 +280,8 @@ class BibleManager(RegistryProperties): self.main_window.information_message( translate('BiblesPlugin.BibleManager', 'Scripture Reference Error'), translate('BiblesPlugin.BibleManager', 'OpenLP couldn’t find anything ' - 'with your search.

' - 'Please make sure that your reference follows one of these patterns:%sBook names may be ' - 'shortened from full names
but must not contain any ' - 'additional dots.' + 'with your search.

' + 'Please make sure that your reference follows one of these patterns:%s' % UiStrings().BibleScriptureError % reference_separators)) return None diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index d5fea2968..e761b991d 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -662,7 +662,10 @@ class BibleMediaItem(MediaManagerItem): self.application.process_events() bible = self.quickVersionComboBox.currentText() second_bible = self.quickSecondComboBox.currentText() - text = self.quick_search_edit.text() + # Get input from field and replace '. ' with '' + text_direct = self.quick_search_edit.text() + text = text_direct.replace('. ', ' ') + # This will check if field has any '.' and removes them. Eg. Gen. 1 = Gen 1 = Genesis 1 if self.quick_search_edit.current_search_type() == BibleSearch.Reference: # We are doing a 'Reference Search'. self.search_results = self.plugin.manager.get_verses(bible, text) @@ -759,10 +762,8 @@ class BibleMediaItem(MediaManagerItem): translate('BiblesPlugin.BibleManager', 'Nothing found'), translate('BiblesPlugin.BibleManager', 'OpenLP couldn’t find ' 'anything with your search.

' - 'If you tried to search with Scripture Reference, please make sure that ' - 'your reference follows one of these patterns:%sBook names may be shortened ' - 'from full names
but must not contain any ' - 'additional dots.' + 'If you tried to search with Scripture Reference, please make
sure that ' + 'your reference follows one of these patterns:%s' % UiStrings().BibleScriptureError % reference_separators)) # Finalizing the search if not self.quickLockButton.isChecked():