raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pep8 fixes 

To do:
Test(s)
This commit is contained in:
suutari-olli 2016-03-15 12:30:37 +02:00
parent d61ded487e
commit a78565568f
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openlp/core/common/uistrings.py
View File

@ -162,14 +162,11 @@ class UiStrings(object):
's16%(range)s17%(list)s5%(verse)s7%(range)s9<br>Book Chapter%' 's16%(range)s17%(list)s5%(verse)s7%(range)s9<br>Book Chapter%'
'(verse)sVerse%(range)sChapter%(verse)sVerse | John 3%(verse)' '(verse)sVerse%(range)sChapter%(verse)sVerse | John 3%(verse)'
's16%(range)s4%(verse)s2<br><br> Book names may be shortened ' 's16%(range)s4%(verse)s2<br><br> Book names may be shortened '
'from full names, for an example: Joh 3 = John 3' 'from full names, for an example: Joh 3 = John 3',
, 'Please pay attention to the appended "s" of the wildcards and refrain ' 'Please pay attention to the appended "s" of the wildcards and refrain '
'from translating the words inside the names in the brackets.') 'from translating the words inside the names in the brackets.')
self.BibleShortSearch = translate('OpenLP.Ui', '<strong>The search you have entered is empty or shorter ' self.BibleShortSearch = translate('OpenLP.Ui', '<strong>The search you have entered is empty or shorter '
'than 3 characters long.<br>Please try again with ' 'than 3 characters long.<br>Please try again with '
'a longer search.</strong><br><br>You can separate different ' 'a longer search.</strong><br><br>You can separate different '
'keywords by a space to search for all of your keywords and you ' 'keywords by a space to search for all of your keywords and you '
'can separate them by a comma to search for one of them.') 'can separate them by a comma to search for one of them.')

31
openlp/plugins/bibles/lib/mediaitem.py
View File

@ -427,7 +427,7 @@ class BibleMediaItem(MediaManagerItem):
def update_auto_completer(self): def update_auto_completer(self):
""" """
This updates the bible book completion list for the search field. The completion depends on the bible. It is This updates the bible book completion list for the search field. The completion depends on the bible. It is
only updated when we are doing a reference search, otherwise the auto completion list is removed. only updated when we are doing reference or combined search, in text search the completion list is removed.
""" """
log.debug('update_auto_completer') log.debug('update_auto_completer')
# Save the current search type to the configuration. # Save the current search type to the configuration.
@ -754,16 +754,25 @@ class BibleMediaItem(MediaManagerItem):
if not self.search_results: if not self.search_results:
self.application.set_normal_cursor() self.application.set_normal_cursor()
reference_separators = { reference_separators = {
'verse': get_reference_separator('sep_v_display'), 'verse': get_reference_separator('sep_v_display'),
'range': get_reference_separator('sep_r_display'), 'range': get_reference_separator('sep_r_display'),
'list': get_reference_separator('sep_l_display')} 'list': get_reference_separator('sep_l_display')}
self.main_window.information_message( self.main_window.information_message(translate('BiblesPlugin.BibleManager', 'Nothing found'),
translate('BiblesPlugin.BibleManager', 'Nothing found'), translate('BiblesPlugin.BibleManager', '<strong>OpenLP '
translate('BiblesPlugin.BibleManager', '<strong>OpenLP couldn’t find ' 'couldn’t find '
'anything with your search.</strong><br><br>' 'anything with your'
'If you tried to search with Scripture Reference, please make<br>sure that ' ' search.</strong>'
'your reference follows one of these patterns:%s' '<br><br>'
% UiStrings().BibleScriptureError % reference_separators)) 'If you tried to '
'search with '
'Scripture '
'Reference, please '
'make<br>sure that '
'your reference '
'follows one of '
'these patterns:%s'
% UiStrings().BibleScriptureError %
reference_separators))
# Finalizing the search # Finalizing the search
if not self.quickLockButton.isChecked(): if not self.quickLockButton.isChecked():
self.list_view.clear() self.list_view.clear()