Skip to content

Commit 86d0117

Browse files
committed
#3357 nextclouddeck: split error message
Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>
1 parent f74fe02 commit 86d0117

File tree

2 files changed

+29
-17
lines changed

2 files changed

+29
-17
lines changed

src/languages/QOwnNotes_en.ts

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4621,52 +4621,58 @@ If the trash is enabled on your ownCloud server you should be able to restore th
46214621
<translation type="unfinished"></translation>
46224622
</message>
46234623
<message>
4624-
<location filename="../services/nextclouddeckservice.cpp" line="146"/>
4625-
<source>Error while %1 card</source>
4624+
<location filename="../services/nextclouddeckservice.cpp" line="147"/>
4625+
<source>Error while updating card</source>
46264626
<translation type="unfinished"></translation>
46274627
</message>
46284628
<message>
4629-
<location filename="../services/nextclouddeckservice.cpp" line="147"/>
4630-
<source>%1 a card failed with status code %2 and message: %3</source>
4629+
<location filename="../services/nextclouddeckservice.cpp" line="148"/>
4630+
<location filename="../services/nextclouddeckservice.cpp" line="153"/>
4631+
<source>Updating a card failed with status code %1 and message: %2</source>
4632+
<translation type="unfinished"></translation>
4633+
</message>
4634+
<message>
4635+
<location filename="../services/nextclouddeckservice.cpp" line="152"/>
4636+
<source>Error while creating card</source>
46314637
<translation type="unfinished"></translation>
46324638
</message>
46334639
<message>
4634-
<location filename="../services/nextclouddeckservice.cpp" line="204"/>
4640+
<location filename="../services/nextclouddeckservice.cpp" line="210"/>
46354641
<source>Error while archiving card</source>
46364642
<translation type="unfinished"></translation>
46374643
</message>
46384644
<message>
4639-
<location filename="../services/nextclouddeckservice.cpp" line="205"/>
4645+
<location filename="../services/nextclouddeckservice.cpp" line="211"/>
46404646
<source>Archiving the card failed with status code %2 and message: %3</source>
46414647
<translation type="unfinished"></translation>
46424648
</message>
46434649
<message>
4644-
<location filename="../services/nextclouddeckservice.cpp" line="294"/>
4650+
<location filename="../services/nextclouddeckservice.cpp" line="300"/>
46454651
<source>Error while deleting card</source>
46464652
<translation type="unfinished"></translation>
46474653
</message>
46484654
<message>
4649-
<location filename="../services/nextclouddeckservice.cpp" line="295"/>
4655+
<location filename="../services/nextclouddeckservice.cpp" line="301"/>
46504656
<source>Deleting the card failed with status code %2 and message: %3</source>
46514657
<translation type="unfinished"></translation>
46524658
</message>
46534659
<message>
4654-
<location filename="../services/nextclouddeckservice.cpp" line="409"/>
4660+
<location filename="../services/nextclouddeckservice.cpp" line="415"/>
46554661
<source>Error while loading boards</source>
46564662
<translation type="unfinished"></translation>
46574663
</message>
46584664
<message>
4659-
<location filename="../services/nextclouddeckservice.cpp" line="410"/>
4665+
<location filename="../services/nextclouddeckservice.cpp" line="416"/>
46604666
<source>Loading the boards failed with status code %1 and message: %2</source>
46614667
<translation type="unfinished"></translation>
46624668
</message>
46634669
<message>
4664-
<location filename="../services/nextclouddeckservice.cpp" line="539"/>
4670+
<location filename="../services/nextclouddeckservice.cpp" line="545"/>
46654671
<source>Error while loading cards</source>
46664672
<translation type="unfinished"></translation>
46674673
</message>
46684674
<message>
4669-
<location filename="../services/nextclouddeckservice.cpp" line="540"/>
4675+
<location filename="../services/nextclouddeckservice.cpp" line="546"/>
46704676
<source>Loading the cards failed with status code %1 and message: %2</source>
46714677
<translation type="unfinished"></translation>
46724678
</message>

src/services/nextclouddeckservice.cpp

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,17 @@ int NextcloudDeckService::storeCard(const QString& title, const QString& descrip
143143
} else {
144144
QString errorString = reply->errorString();
145145
QString operation = isUpdate ? tr("updating") : tr("creating");
146-
Utils::Gui::warning(nullptr, tr("Error while %1 card").arg(operation),
147-
tr("%1 a card failed with status code %2 and message: %3")
148-
.arg(operation.left(1).toUpper() + operation.mid(1))
149-
.arg(QString::number(returnStatusCode), errorString),
150-
"nextcloud-deck-create-update-failed");
146+
if (isUpdate) {
147+
Utils::Gui::warning(nullptr, tr("Error while updating card").arg(operation),
148+
tr("Updating a card failed with status code %1 and message: %2")
149+
.arg(QString::number(returnStatusCode), errorString),
150+
"nextcloud-deck-update-failed");
151+
} else {
152+
Utils::Gui::warning(nullptr, tr("Error while creating card").arg(operation),
153+
tr("Updating a card failed with status code %1 and message: %2")
154+
.arg(QString::number(returnStatusCode), errorString),
155+
"nextcloud-deck-create-failed");
156+
}
151157

152158
qDebug() << __func__ << " - error: " << returnStatusCode;
153159
qDebug() << __func__ << " - 'errorString': " << errorString;

0 commit comments

Comments
 (0)