Commit 8fb2b326 authored by Karel Slaný's avatar Karel Slaný

Using kB instead of KB to denote a kilobyte.

parent 8f441e4b
......@@ -54,7 +54,7 @@ Item {
/* Return file size string in bytes or kilobytes */
function getFileSizeString(fileSize) {
return (fileSize >= 1000) ? "~" + Math.ceil(fileSize / 1000) + " KB"
return (fileSize >= 1000) ? "~" + Math.ceil(fileSize / 1000) + " kB"
: "~" + (fileSize) + " B"
}
......
......@@ -40,7 +40,7 @@ QString getApproximatelyAttachmentFileSizeFromBase64(int base64Length)
QString str = "";
base64Length = base64Length * 3 / 4;
if (base64Length >= 1000) {
str = "~" + QString::number(base64Length / 1000) + " KB" ;
str = "~" + QString::number(base64Length / 1000) + " kB" ;
} else {
str = "~" + QString::number(base64Length) + " B" ;
}
......
......@@ -740,7 +740,7 @@ bool Files::parseAndShowXmlData(enum MsgInfo::ZfoType type, QString *idStr,
html += strongInfoLine(QObject::tr("Subject"), msg.dmAnnotation());
QString size = QString::number(msg.dmAttachmentSize());
html += strongInfoLine(QObject::tr("Attachment size"),
(size == "0") ? "<1 KB" : "~" + size + " KB");
(size == "0") ? "<1 kB" : "~" + size + " kB");
html += strongInfoLine(QObject::tr("Personal delivery"),
(msg.dmPersonalDelivery()) ? QObject::tr("Yes") : QObject::tr("No"));
html += strongInfoLine(QObject::tr("Delivery by fiction"),
......
......@@ -110,7 +110,7 @@
#define DOWNLOAD_ALL_MESSAGES 2046
/*!
* @brief Maximum attachment size in KB for message sending (ISDS 20MB).
* @brief Maximum attachment size in kB for message sending (ISDS 20 MB).
*/
#define SEND_ATTACH_SIZE_LIMIT_KB 20000
......
......@@ -582,7 +582,7 @@ void IsdsWrapper::sendMessage(const QString &userName, qint64 dmID,
Dialogues::errorMessage(Dialogues::CRITICAL,
tr("%1: Error sending message!").arg(userName),
tr("Total attachment size exceeds the limit!"),
tr("Current total attachment size is %1 KB. ISDS limits its size to %2 KB. Reduce the total attachment size and try sending the message again.")
tr("Current total attachment size is %1 kB. ISDS limits its size to %2 kB. Reduce the total attachment size and try sending the message again.")
.arg(totalAttachmentSizeKBs).arg(SEND_ATTACH_SIZE_LIMIT_KB)
);
return;
......
......@@ -137,7 +137,7 @@ private:
QString m_dmFileMetaType; /*!< File meta mime type. */
QString m_dmEncodedContent; /*!< Base64 file content. */
QString m_dmFileSize; /*!< File size string in KB. */
QString m_dmFileSize; /*!< File size string in kB. */
QString m_dmDownloadDate; /*!< File download date. */
QString m_icon; /*!< File icon resource. */
};
......
......@@ -380,7 +380,7 @@ QString MessageDb::getMessageDetailDataFromDb(qint64 dmId) const
query.value(1).toString());
QString size = query.value(2).toString();
html += strongInfoLine(QObject::tr("Attachment size"),
(size == "0") ? "&lt;1 KB" : "~" + size + " KB");
(size == "0") ? "&lt;1 kB" : "~" + size + " kB");
html += strongInfoLine(QObject::tr("Personal delivery"),
(query.value(10).toBool()) ? QObject::tr("Yes") : QObject::tr("No"));
html += strongInfoLine(QObject::tr("Delivery by fiction"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment