diff --git a/linphone-app/assets/languages/da.ts b/linphone-app/assets/languages/da.ts index 9aa50fa99..ef140d3c4 100644 --- a/linphone-app/assets/languages/da.ts +++ b/linphone-app/assets/languages/da.ts @@ -569,6 +569,11 @@ Server url ikke konfigureret. 'Do you really want do cancel this meeting?' : Warning message to confirm the cancellation of a meeting. + + icsCancelledMeetingInvite + 'Meeting has been cancelled' : ICS Title for cancelled meetings + + ChatConferenceInvitationMessage diff --git a/linphone-app/assets/languages/de.ts b/linphone-app/assets/languages/de.ts index 695bad434..978ccf4a7 100644 --- a/linphone-app/assets/languages/de.ts +++ b/linphone-app/assets/languages/de.ts @@ -569,6 +569,11 @@ Server URL ist nicht konfiguriert. 'Do you really want do cancel this meeting?' : Warning message to confirm the cancellation of a meeting. + + icsCancelledMeetingInvite + 'Meeting has been cancelled' : ICS Title for cancelled meetings + + ChatConferenceInvitationMessage diff --git a/linphone-app/assets/languages/en.ts b/linphone-app/assets/languages/en.ts index 80206faa0..5f69dff3a 100644 --- a/linphone-app/assets/languages/en.ts +++ b/linphone-app/assets/languages/en.ts @@ -569,6 +569,11 @@ Server URL not configured. 'Do you really want do cancel this meeting?' : Warning message to confirm the cancellation of a meeting. Do you really want do cancel this meeting? + + icsCancelledMeetingInvite + 'Meeting has been cancelled' : ICS Title for cancelled meetings + Meeting has been cancelled + ChatConferenceInvitationMessage diff --git a/linphone-app/assets/languages/es.ts b/linphone-app/assets/languages/es.ts index 659fa342d..039bd89a1 100644 --- a/linphone-app/assets/languages/es.ts +++ b/linphone-app/assets/languages/es.ts @@ -569,6 +569,11 @@ URL del servidor no configurada. 'Do you really want do cancel this meeting?' : Warning message to confirm the cancellation of a meeting. + + icsCancelledMeetingInvite + 'Meeting has been cancelled' : ICS Title for cancelled meetings + + ChatConferenceInvitationMessage diff --git a/linphone-app/assets/languages/fr_FR.ts b/linphone-app/assets/languages/fr_FR.ts index 64d39b8da..57547d66e 100644 --- a/linphone-app/assets/languages/fr_FR.ts +++ b/linphone-app/assets/languages/fr_FR.ts @@ -173,7 +173,7 @@ usernameStatusInvalidCharacters - Caractères invalides détectés (regex : `%1`). + Caractères invalides détectés (regex : `%1`). usernameStatusInvalid @@ -189,7 +189,7 @@ passwordStatusInvalidCharacters - Caractères invalides détectés (regex : `%1`). + Caractères invalides détectés (regex : `%1`). passwordStatusMissingCharacters @@ -569,6 +569,11 @@ URL du serveur non configurée. 'Do you really want do cancel this meeting?' : Warning message to confirm the cancellation of a meeting. Voulez-vous supprimer cette réunion ? + + icsCancelledMeetingInvite + 'Meeting has been cancelled' : ICS Title for cancelled meetings + La réunion a été annulée + ChatConferenceInvitationMessage @@ -1236,7 +1241,7 @@ URL du serveur non configurée. ephemeralNotInConference! 'Ephemeral message is only supported in conference based chat room!' - Les messages éphémères ne sont disponibles que pour une conversation définie en mode conférence ! + Les messages éphémères ne sont disponibles que pour une conversation définie en mode conférence ! Warning about not being in conference based chat room. @@ -2020,7 +2025,7 @@ Cliquez ici : <a href="%1">%1</a> newConferenceScheduleTitle 'Would you like to schedule your meeting?' : Ask about setting the meeting as scheduled. - Voulez-vous programmer cette réunion ? + Voulez-vous programmer cette réunion ? newConferenceDate @@ -2600,7 +2605,7 @@ Cliquez ici : <a href="%1">%1</a> serverTooltip - Serveur LDAP. ie : ldap:// pour un serveur local ou ldap://ldap.example.org/ + Serveur LDAP. ie : ldap:// pour un serveur local ou ldap://ldap.example.org/ bindDNLabel @@ -3546,7 +3551,7 @@ Cliquez ici : <a href="%1">%1</a> deleteTimeline 'Are you sure you want to delete and leave this timeline?' - Êtes-vous certain de vouloir tout effacer et de quitter cette conversation ? + Êtes-vous certain de vouloir tout effacer et de quitter cette conversation ? deleteTimelineTooltip diff --git a/linphone-app/assets/languages/hu.ts b/linphone-app/assets/languages/hu.ts index 9a20f7ba0..ce392ee15 100644 --- a/linphone-app/assets/languages/hu.ts +++ b/linphone-app/assets/languages/hu.ts @@ -568,6 +568,11 @@ A kiszolgáló URL-je nincs konfigurálva. 'Do you really want do cancel this meeting?' : Warning message to confirm the cancellation of a meeting. + + icsCancelledMeetingInvite + 'Meeting has been cancelled' : ICS Title for cancelled meetings + + ChatConferenceInvitationMessage diff --git a/linphone-app/assets/languages/it.ts b/linphone-app/assets/languages/it.ts index 36fe51dec..c4d768163 100644 --- a/linphone-app/assets/languages/it.ts +++ b/linphone-app/assets/languages/it.ts @@ -569,6 +569,11 @@ URL del server non configurato. 'Do you really want do cancel this meeting?' : Warning message to confirm the cancellation of a meeting. + + icsCancelledMeetingInvite + 'Meeting has been cancelled' : ICS Title for cancelled meetings + + ChatConferenceInvitationMessage diff --git a/linphone-app/assets/languages/ja.ts b/linphone-app/assets/languages/ja.ts index d8bce574f..557a37a20 100644 --- a/linphone-app/assets/languages/ja.ts +++ b/linphone-app/assets/languages/ja.ts @@ -568,6 +568,11 @@ 'Do you really want do cancel this meeting?' : Warning message to confirm the cancellation of a meeting. + + icsCancelledMeetingInvite + 'Meeting has been cancelled' : ICS Title for cancelled meetings + + ChatConferenceInvitationMessage diff --git a/linphone-app/assets/languages/lt.ts b/linphone-app/assets/languages/lt.ts index 360c55639..29cb489f1 100644 --- a/linphone-app/assets/languages/lt.ts +++ b/linphone-app/assets/languages/lt.ts @@ -570,6 +570,11 @@ Nesukonfigūruotas serverio url. 'Do you really want do cancel this meeting?' : Warning message to confirm the cancellation of a meeting. + + icsCancelledMeetingInvite + 'Meeting has been cancelled' : ICS Title for cancelled meetings + + ChatConferenceInvitationMessage diff --git a/linphone-app/assets/languages/pt_BR.ts b/linphone-app/assets/languages/pt_BR.ts index 96a09ec62..aaced721e 100644 --- a/linphone-app/assets/languages/pt_BR.ts +++ b/linphone-app/assets/languages/pt_BR.ts @@ -569,6 +569,11 @@ URL do servidor não configurado. 'Do you really want do cancel this meeting?' : Warning message to confirm the cancellation of a meeting. + + icsCancelledMeetingInvite + 'Meeting has been cancelled' : ICS Title for cancelled meetings + + ChatConferenceInvitationMessage diff --git a/linphone-app/assets/languages/ru.ts b/linphone-app/assets/languages/ru.ts index 2509e66ac..770bd2d14 100644 --- a/linphone-app/assets/languages/ru.ts +++ b/linphone-app/assets/languages/ru.ts @@ -570,6 +570,11 @@ 'Do you really want do cancel this meeting?' : Warning message to confirm the cancellation of a meeting. + + icsCancelledMeetingInvite + 'Meeting has been cancelled' : ICS Title for cancelled meetings + + ChatConferenceInvitationMessage diff --git a/linphone-app/assets/languages/sv.ts b/linphone-app/assets/languages/sv.ts index 0f5b48209..da6160940 100644 --- a/linphone-app/assets/languages/sv.ts +++ b/linphone-app/assets/languages/sv.ts @@ -569,6 +569,11 @@ Serverwebbadressen är inte konfigurerad. 'Do you really want do cancel this meeting?' : Warning message to confirm the cancellation of a meeting. + + icsCancelledMeetingInvite + 'Meeting has been cancelled' : ICS Title for cancelled meetings + + ChatConferenceInvitationMessage diff --git a/linphone-app/assets/languages/tr.ts b/linphone-app/assets/languages/tr.ts index d4ab8547c..9b6612885 100644 --- a/linphone-app/assets/languages/tr.ts +++ b/linphone-app/assets/languages/tr.ts @@ -568,6 +568,11 @@ Sunucu url'si yapılandırılmadı. 'Do you really want do cancel this meeting?' : Warning message to confirm the cancellation of a meeting. + + icsCancelledMeetingInvite + 'Meeting has been cancelled' : ICS Title for cancelled meetings + + ChatConferenceInvitationMessage diff --git a/linphone-app/assets/languages/uk.ts b/linphone-app/assets/languages/uk.ts index 603506eca..5f7d0b467 100644 --- a/linphone-app/assets/languages/uk.ts +++ b/linphone-app/assets/languages/uk.ts @@ -570,6 +570,11 @@ 'Do you really want do cancel this meeting?' : Warning message to confirm the cancellation of a meeting. + + icsCancelledMeetingInvite + 'Meeting has been cancelled' : ICS Title for cancelled meetings + + ChatConferenceInvitationMessage diff --git a/linphone-app/assets/languages/zh_CN.ts b/linphone-app/assets/languages/zh_CN.ts index faa1aa2d5..f715c304e 100644 --- a/linphone-app/assets/languages/zh_CN.ts +++ b/linphone-app/assets/languages/zh_CN.ts @@ -568,6 +568,11 @@ 'Do you really want do cancel this meeting?' : Warning message to confirm the cancellation of a meeting. + + icsCancelledMeetingInvite + 'Meeting has been cancelled' : ICS Title for cancelled meetings + + ChatConferenceInvitationMessage diff --git a/linphone-app/src/components/conferenceInfo/ConferenceInfoListModel.cpp b/linphone-app/src/components/conferenceInfo/ConferenceInfoListModel.cpp index 764780d37..b889ecf02 100644 --- a/linphone-app/src/components/conferenceInfo/ConferenceInfoListModel.cpp +++ b/linphone-app/src/components/conferenceInfo/ConferenceInfoListModel.cpp @@ -43,7 +43,7 @@ ConferenceInfoListModel::ConferenceInfoListModel (QObject *parent) : ProxyListMo auto conferenceInfos = coreManager->getCore()->getConferenceInformationList(); QList > items; for(auto conferenceInfo : conferenceInfos){ - auto item = build(conferenceInfo); + auto item = build(conferenceInfo, mBuildAll); if(item) items << item; } @@ -53,10 +53,10 @@ ConferenceInfoListModel::ConferenceInfoListModel (QObject *parent) : ProxyListMo // ----------------------------------------------------------------------------- -QSharedPointer ConferenceInfoListModel::build(const std::shared_ptr & conferenceInfo) const{ +QSharedPointer ConferenceInfoListModel::build(const std::shared_ptr & conferenceInfo, const bool& buildAll) const{ auto me = CoreManager::getInstance()->getCore()->getDefaultAccount()->getParams()->getIdentityAddress(); std::list> participants = conferenceInfo->getParticipants(); - bool haveMe = conferenceInfo->getOrganizer()->weakEqual(me); + bool haveMe = buildAll || conferenceInfo->getOrganizer()->weakEqual(me); if(!haveMe) haveMe = (std::find_if(participants.begin(), participants.end(), [me](const std::shared_ptr& address){ return me->weakEqual(address); @@ -70,7 +70,7 @@ QSharedPointer ConferenceInfoListModel::build(const std::sh } void ConferenceInfoListModel::add(const std::shared_ptr & conferenceInfo, const bool& sendEvents){ - auto item = build(conferenceInfo); + auto item = build(conferenceInfo, mBuildAll); if( item) ProxyListModel::add(item); } diff --git a/linphone-app/src/components/conferenceInfo/ConferenceInfoListModel.hpp b/linphone-app/src/components/conferenceInfo/ConferenceInfoListModel.hpp index c7ee051f5..abf586002 100644 --- a/linphone-app/src/components/conferenceInfo/ConferenceInfoListModel.hpp +++ b/linphone-app/src/components/conferenceInfo/ConferenceInfoListModel.hpp @@ -37,7 +37,7 @@ class ConferenceInfoListModel : public ProxyListModel { public: ConferenceInfoListModel (QObject *parent = Q_NULLPTR); - QSharedPointer build(const std::shared_ptr & conferenceInfo) const; + QSharedPointer build(const std::shared_ptr & conferenceInfo, const bool& buildAll) const; void add(const std::shared_ptr & conferenceInfo, const bool& sendEvents = true); @@ -50,7 +50,8 @@ public slots: void onRemoved(bool byUser); signals: void filterTypeChanged(int filterType); - +private: + bool mBuildAll = true; // Short term design choice : display all. As of 5.2.0 SDK and on cancel, there are no more more links between conference info and current account. }; Q_DECLARE_METATYPE(ConferenceInfoListModel*) #endif diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatCalendarMessage.qml b/linphone-app/ui/modules/Linphone/Chat/ChatCalendarMessage.qml index b6c53e37d..85373bb74 100644 --- a/linphone-app/ui/modules/Linphone/Chat/ChatCalendarMessage.qml +++ b/linphone-app/ui/modules/Linphone/Chat/ChatCalendarMessage.qml @@ -144,10 +144,10 @@ Loader{ color: ChatCalendarMessageStyle.type.cancelledColor font.pointSize: ChatCalendarMessageStyle.type.pointSize font.weight: Font.Bold - text: 'You have cancelled the conference' + //: 'Meeting has been cancelled' : ICS Title for cancelled meetings + text:qsTr('icsCancelledMeetingInvite') } - Text{ id: title Layout.fillWidth: true