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

Merge pull request #2748 from nextcloud/rakekniven-patch-1

Browse source 
Removed translation for "etag" and changed spelling
This commit is contained in:
Kevin Ottens 2020-12-28 10:01:18 +01:00 committed by GitHub
commit 23efdd2ead
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libsync/discovery.cpp
View file

@ -409,7 +409,7 @@ void ProcessDirectoryJob::processFileAnalyzeRemoteInfo(
if (serverEntry.remotePerm.isNull())
missingData.append(tr("permissions"));
if (serverEntry.etag.isEmpty())
missingData.append(tr("etag"));
missingData.append("ETag");
if (serverEntry.fileId.isEmpty())
missingData.append(tr("file id"));
if (!missingData.isEmpty()) {

2
test/testremotediscovery.cpp
View file

@ -167,7 +167,7 @@ private slots:
QCOMPARE(completeSpy.findItem("nofileid")->_instruction, CSYNC_INSTRUCTION_ERROR);
QCOMPARE(completeSpy.findItem("nopermissions")->_instruction, CSYNC_INSTRUCTION_NEW);
QCOMPARE(completeSpy.findItem("nopermissions/A")->_instruction, CSYNC_INSTRUCTION_ERROR);
QVERIFY(completeSpy.findItem("noetag")->_errorString.contains("etag"));
QVERIFY(completeSpy.findItem("noetag")->_errorString.contains("ETag"));
QVERIFY(completeSpy.findItem("nofileid")->_errorString.contains("file id"));
QVERIFY(completeSpy.findItem("nopermissions/A")->_errorString.contains("permissions"));
}