From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Thu, 6 Oct 2022 14:38:49 +0000 (+0200)
Subject: Improve user-related strings in webflow credentials
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~199^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=25ca698ad57e5e0665efac4505c854c1b4ddb074;p=nextcloud-desktop.git

Improve user-related strings in webflow credentials

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---

diff --git a/src/gui/creds/webflowcredentials.cpp b/src/gui/creds/webflowcredentials.cpp
index 278d81b94..b2e28dafd 100644
--- a/src/gui/creds/webflowcredentials.cpp
+++ b/src/gui/creds/webflowcredentials.cpp
@@ -164,7 +164,7 @@ void WebFlowCredentials::askFromUser() {
         }
 
         QString msg = tr("You have been logged out of your account %1 at %2. Please login again.")
-                          .arg(_user, _account->displayName());
+                          .arg(_account->davUser(), _account->url().toDisplayString());
         _askDialog->setInfo(msg);
 
         _askDialog->show();
@@ -188,7 +188,7 @@ void WebFlowCredentials::slotAskFromUserCredentialsProvided(const QString &user,
         qCInfo(lcWebFlowCredentials()) << "Authed with the wrong user!";
 
         QString msg = tr("Please login with the account: %1")
-                .arg(_user);
+                .arg(_account->davUser());
         _askDialog->setError(msg);
 
         if (!_askDialog->isUsingFlow2()) {