mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-29 04:08:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

Address PR comments.

Browse source 
Signed-off-by: Camila <hello@camila.codes>
This commit is contained in:
Camila 2023-09-22 08:49:48 +02:00 committed by Matthieu Gallien
parent a23b9f1280
commit d6eb5c5c7c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gui/accountmanager.cpp
View file

@ -179,7 +179,7 @@ bool AccountManager::restoreFromLegacySettings()
legacyCfgFileGrandParentFolder + legacyCfgFileRelativePath}; legacyCfgFileGrandParentFolder + legacyCfgFileRelativePath};
for (const auto &configFile : legacyLocations) { for (const auto &configFile : legacyLocations) {
auto oCSettings = std::make_unique<QSettings>(configFile, QSettings::IniFormat); const auto oCSettings = std::make_unique<QSettings>(configFile, QSettings::IniFormat);
if (oCSettings->status() != QSettings::Status::NoError) { if (oCSettings->status() != QSettings::Status::NoError) {
qCInfo(lcAccountManager) << "Error reading legacy configuration file" << oCSettings->status(); qCInfo(lcAccountManager) << "Error reading legacy configuration file" << oCSettings->status();
break; break;
@ -192,9 +192,9 @@ bool AccountManager::restoreFromLegacySettings()
qCInfo(lcAccountManager) << "Migrate: checking old config " << configFile; qCInfo(lcAccountManager) << "Migrate: checking old config " << configFile;
if (!forceLegacyImport() && accountsListSize > 0) { if (!forceLegacyImport() && accountsListSize > 0) {
const auto importQuestion = accountsListSize > 1 const auto importQuestion = accountsListSize > 1
? tr("%1 accounts were detected on a legacy desktop client.\n" ? tr("%1 accounts were detected from a legacy desktop client.\n"
"Should the accounts be imported?").arg(QString::number(accountsListSize)) "Should the accounts be imported?").arg(QString::number(accountsListSize))
: tr("1 account was detected on a legacy desktop client.\n" : tr("1 account was detected from a legacy desktop client.\n"
"Should the account be imported?"); "Should the account be imported?");
const auto importMessageBox = new QMessageBox(QMessageBox::Question, tr("Legacy import"), importQuestion); const auto importMessageBox = new QMessageBox(QMessageBox::Question, tr("Legacy import"), importQuestion);
importMessageBox->addButton(tr("Import"), QMessageBox::AcceptRole); importMessageBox->addButton(tr("Import"), QMessageBox::AcceptRole);