Merge branch 'larryhynes-patch-1'

This commit is contained in:
Florian Bruhin 2015-11-23 11:26:24 +01:00
commit d68798a15b
3 changed files with 4 additions and 3 deletions

View File

@ -172,11 +172,11 @@ Contributors, sorted by the number of commits in descending order:
* jnphilipp
* Tobias Patzl
* Peter Michely
* Larry Hynes
* Johannes Altmanninger
* Samir Benmendil
* Regina Hug
* Mathias Fussenegger
* Larry Hynes
* Fritz V155 Reichwald
* Franz Fellner
* zwarag

View File

@ -530,8 +530,8 @@ class WebView(QWebView):
"match for: {}".format(text),
immediately=True)
else:
message.error(self.win_id, "Text '{}' not found on "
"page!".format(text), immediately=True)
message.warning(self.win_id, "Text '{}' not found on "
"page!".format(text), immediately=True)
else:
def check_scroll_pos():
"""Check if the scroll position got smaller and show info."""

View File

@ -391,6 +391,7 @@ def _get_authors():
'Alexey Nabrodov': 'Alexey "Averrin" Nabrodov',
'Michael': 'Halfwit',
'Error 800': 'error800',
'larryhynes': 'Larry Hynes',
}
commits = subprocess.check_output(['git', 'log', '--format=%aN'])
authors = [corrections.get(author, author)