Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Correct plurals and logic gate

Browse Source
This commit is contained in:
Jonathan White 2018-06-09 16:56:52 -04:00
parent 2e292699b7
commit 76102ee9f0
No known key found for this signature in database
GPG Key ID: 440FC65F2E0C6E01
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/EditWidgetIcons.cpp
View File

@ -335,12 +335,11 @@ void EditWidgetIcons::addCustomIconFromFile()
for (const auto& filename : filenames) {
if (!filename.isEmpty()) {
auto icon = QImage(filename);
if (!icon.isNull()) {
if (!addCustomIcon(QImage(filename))) {
++numexisting;
}
} else {
if (icon.isNull()) {
errornames << filename;
} else if (!addCustomIcon(icon)) {
// Icon already exists in database
++numexisting;
}
}
}
@ -349,20 +348,20 @@ void EditWidgetIcons::addCustomIconFromFile()
QString msg;
if (numloaded > 0) {
msg = tr("Successfully loaded %1 of %2 icons").arg(numloaded).arg(filenames.size());
msg = tr("Successfully loaded %1 of %n icon(s)", "", filenames.size()).arg(numloaded);
} else {
msg = tr("No icons were loaded");
}
if (numexisting > 0) {
msg += ", " + tr("%1 icons already existed").arg(numexisting);
msg += "\n" + tr("%n icon(s) already exist in the database", "", numexisting);
}
if (!errornames.empty()) {
// Show the first 8 icons that failed to load
errornames = errornames.mid(0, 8);
emit messageEditEntry(msg + "\n" + tr("The following icons failed:") + "\n" + errornames.join("\n"),
MessageWidget::Error);
emit messageEditEntry(msg + "\n" + tr("The following icon(s) failed:", "", errornames.size()) +
"\n" + errornames.join("\n"), MessageWidget::Error);
} else if (numloaded > 0) {
emit messageEditEntry(msg, MessageWidget::Positive);
} else {