Permalink
Browse files

Merge pull request #147 from stefanha/login-email-vs-username

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
  • Loading branch information...
stefanha committed Jan 2, 2017
2 parents 612c9e9 + cc1a831 commit 81dac50838950c09df3360ec3ec640a0f51f9a68
Showing with 6 additions and 2 deletions.
  1. +6 −2 qtclient/JammrLoginDialog.cpp
@@ -1,5 +1,5 @@
/*
Copyright (C) 2012 Stefan Hajnoczi <stefanha@gmail.com>
Copyright (C) 2012-2017 Stefan Hajnoczi <stefanha@gmail.com>
Wahjam is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -122,7 +122,11 @@ void JammrLoginDialog::requestFinished()
QString message;
switch (err) {
case QNetworkReply::AuthenticationRequiredError:
message = tr("Invalid username/password, please try again.");
if (username().contains('@')) {
message = tr("Invalid username/password. Your username may be different from your email address. Please try again with your username.");
} else {
message = tr("Invalid username/password, please try again.");
}
break;
case QNetworkReply::ConnectionRefusedError:

0 comments on commit 81dac50

Please sign in to comment.