From 5636e0de232d63f09e987f4c56cbff09d66d34f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Fri, 20 Nov 2020 16:31:38 -0500
Subject: [PATCH] i18n: translate transfer status
Change-Id: I543adcdb1f2d34caf51189fa41650202d2f3e184
GitLab: #448
---
src/chatview.cpp | 9 +++++++++
src/web-chatview/chatview.js | 13 ++-----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/chatview.cpp b/src/chatview.cpp
index 654b857b..0bc3f20d 100644
--- a/src/chatview.cpp
+++ b/src/chatview.cpp
@@ -59,6 +59,15 @@ getTranslatedStrings(bool qwebview)
{"Refuse", QObject::tr("Refuse")},
{"Delete", QObject::tr("Delete")},
{"Retry", QObject::tr("Retry")},
+ {"unjoinable peer", QObject::tr("Unjoinable peer")},
+ {"connecting", QObject::tr("Connecting")},
+ {"accepted", QObject::tr("Accepted")},
+ {"canceled", QObject::tr("Canceled")},
+ {"ongoing", QObject::tr("Ongoing")},
+ {"awaiting peer", QObject::tr("Awaiting peer")},
+ {"awaiting host", QObject::tr("Awaiting host")},
+ {"awaiting peer timeout", QObject::tr("Awaiting peer timeout")},
+ {"finished", QObject::tr("Finished")},
};
}
diff --git a/src/web-chatview/chatview.js b/src/web-chatview/chatview.js
index 9744ca8e..c6d1dbf1 100644
--- a/src/web-chatview/chatview.js
+++ b/src/web-chatview/chatview.js
@@ -774,16 +774,7 @@ function getMessageHtml(message_text) {
*/
/* exported getMessageDeliveryStatusText */
function getMessageDeliveryStatusText(message_delivery_status) {
- var formatted_delivery_status = message_delivery_status
-
- if (message_delivery_status === "failure") {
- formatted_delivery_status = use_qt ? i18nStringData["Failure"] : i18n.gettext("Failure") +
- "<svg overflow='visible' viewBox='0 -2 16 14' height='16px' width='16px'><path class='status-x x-first' stroke='#AA0000' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' fill='none' d='M4,4 L12,12'/><path class='status-x x-second' stroke='#AA0000' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' fill='none' d='M12,4 L4,12'/></svg>"
- } else {
- formatted_delivery_status = ""
- }
-
- return formatted_delivery_status
+ return use_qt ? i18nStringData[message_delivery_status] : i18n.gettext(message_delivery_status)
}
/**
@@ -985,7 +976,7 @@ function buildFileInformationText(message_object) {
}
}
- return informations_txt + " - " + message_object["delivery_status"]
+ return informations_txt + " - " + getMessageDeliveryStatusText(message_object["delivery_status"])
}
/**
--
GitLab