diff --git a/linphone-desktop/assets/languages/en.ts b/linphone-desktop/assets/languages/en.ts index 01b7792a0..bda35fcdc 100644 --- a/linphone-desktop/assets/languages/en.ts +++ b/linphone-desktop/assets/languages/en.ts @@ -315,10 +315,6 @@ callErrorNotAcceptable - - noMediaEncryption - None - CallSipAddress @@ -812,6 +808,14 @@ Server url not configured. pendingRequestLabel Please to wait, a request is pending. + + securedStringFormat + Call is encrypted with: %1. + + + callNotSecured + Call not encrypted. + InviteFriends diff --git a/linphone-desktop/assets/languages/fr.ts b/linphone-desktop/assets/languages/fr.ts index f0827c41a..112a33988 100644 --- a/linphone-desktop/assets/languages/fr.ts +++ b/linphone-desktop/assets/languages/fr.ts @@ -315,10 +315,6 @@ callErrorNotAcceptable - - noMediaEncryption - Aucun - CallSipAddress @@ -812,6 +808,14 @@ Url du serveur non configurée. pendingRequestLabel Merci de patienter, une requête est en attente. + + securedStringFormat + L'appel est chiffré avec: %1. + + + callNotSecured + Appel non chiffré. + InviteFriends diff --git a/linphone-desktop/src/components/call/CallModel.cpp b/linphone-desktop/src/components/call/CallModel.cpp index 56ba5127a..5bf42b88a 100644 --- a/linphone-desktop/src/components/call/CallModel.cpp +++ b/linphone-desktop/src/components/call/CallModel.cpp @@ -541,7 +541,7 @@ QString CallModel::getSecuredString () const { break; } - return tr("noMediaEncryption"); + return QStringLiteral(""); } // ----------------------------------------------------------------------------- diff --git a/linphone-desktop/ui/views/App/Calls/Incall.js b/linphone-desktop/ui/views/App/Calls/Incall.js index e8fb4855d..8c956b722 100644 --- a/linphone-desktop/ui/views/App/Calls/Incall.js +++ b/linphone-desktop/ui/views/App/Calls/Incall.js @@ -64,6 +64,14 @@ function handleVideoRequested () { }) } +function makeReadableSecuredString (securedString) { + if (!securedString.length) { + return qsTr('callNotSecured') + } + + return qsTr('securedStringFormat').replace('%1', securedString) +} + function showFullscreen () { if (incall._fullscreen) { return diff --git a/linphone-desktop/ui/views/App/Calls/Incall.qml b/linphone-desktop/ui/views/App/Calls/Incall.qml index 875acad4b..dc13654d5 100644 --- a/linphone-desktop/ui/views/App/Calls/Incall.qml +++ b/linphone-desktop/ui/views/App/Calls/Incall.qml @@ -111,7 +111,7 @@ Rectangle { onClicked: zrtp.visible = (incall.call.encryption === CallModel.CallEncryptionZRTP) TooltipArea { - text: incall.call.securedString + text: Logic.makeReadableSecuredString(incall.call.securedString) } } }