mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 11:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Short term design choice on meetings list : display all for all accounts. As of 5.2.0 SDK and on cancel, there are no more more links between conference info and current account.

Browse source 
Fix translations on cancelled meetings.
This commit is contained in:
Julien Wadel 2022-12-07 11:25:10 +01:00
parent 75bcdc3fb7
commit 1849bd08e4
18 changed files with 90 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
linphone-app/assets/languages/da.ts
View file

@ -569,6 +569,11 @@ Server url ikke konfigureret.</translation>
<extracomment>&apos;Do you really want do cancel this meeting?&apos; : Warning message to confirm the cancellation of a meeting.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>icsCancelledMeetingInvite</source>
<extracomment>&apos;Meeting has been cancelled&apos; : ICS Title for cancelled meetings</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatConferenceInvitationMessage</name>

5
linphone-app/assets/languages/de.ts
View file

@ -569,6 +569,11 @@ Server URL ist nicht konfiguriert.</translation>
<extracomment>&apos;Do you really want do cancel this meeting?&apos; : Warning message to confirm the cancellation of a meeting.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>icsCancelledMeetingInvite</source>
<extracomment>&apos;Meeting has been cancelled&apos; : ICS Title for cancelled meetings</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatConferenceInvitationMessage</name>

5
linphone-app/assets/languages/en.ts
View file

@ -569,6 +569,11 @@ Server URL not configured.</translation>
<extracomment>&apos;Do you really want do cancel this meeting?&apos; : Warning message to confirm the cancellation of a meeting.</extracomment>
<translation>Do you really want do cancel this meeting?</translation>
</message>
<message>
<source>icsCancelledMeetingInvite</source>
<extracomment>&apos;Meeting has been cancelled&apos; : ICS Title for cancelled meetings</extracomment>
<translation>Meeting has been cancelled</translation>
</message>
</context>
<context>
<name>ChatConferenceInvitationMessage</name>

5
linphone-app/assets/languages/es.ts
View file

@ -569,6 +569,11 @@ URL del servidor no configurada.</translation>
<extracomment>&apos;Do you really want do cancel this meeting?&apos; : Warning message to confirm the cancellation of a meeting.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>icsCancelledMeetingInvite</source>
<extracomment>&apos;Meeting has been cancelled&apos; : ICS Title for cancelled meetings</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatConferenceInvitationMessage</name>

17
linphone-app/assets/languages/fr_FR.ts
View file

@ -173,7 +173,7 @@
</message>
<message>
<source>usernameStatusInvalidCharacters</source>
<translation>Caractères invalides détectés (regex : `%1`).</translation>
<translation>Caractères invalides détectés (regex&#x202f;: `%1`).</translation>
</message>
<message>
<source>usernameStatusInvalid</source>
@ -189,7 +189,7 @@
</message>
<message>
<source>passwordStatusInvalidCharacters</source>
<translation>Caractères invalides détectés (regex : `%1`).</translation>
<translation>Caractères invalides détectés (regex&#x202f;: `%1`).</translation>
</message>
<message>
<source>passwordStatusMissingCharacters</source>
@ -569,6 +569,11 @@ URL du serveur non configurée.</translation>
<extracomment>&apos;Do you really want do cancel this meeting?&apos; : Warning message to confirm the cancellation of a meeting.</extracomment>
<translation>Voulez-vous supprimer cette réunion ?</translation>
</message>
<message>
<source>icsCancelledMeetingInvite</source>
<extracomment>&apos;Meeting has been cancelled&apos; : ICS Title for cancelled meetings</extracomment>
<translation type="unfinished">La réunion a été annulée</translation>
</message>
</context>
<context>
<name>ChatConferenceInvitationMessage</name>
@ -1236,7 +1241,7 @@ URL du serveur non configurée.</translation>
<message>
<source>ephemeralNotInConference!</source>
<extracomment>&apos;Ephemeral message is only supported in conference based chat room!&apos;</extracomment>
<translation>Les messages éphémères ne sont disponibles que pour une conversation définie en mode conférence !</translation>
<translation>Les messages éphémères ne sont disponibles que pour une conversation définie en mode conférence&#x202f;!</translation>
<extra-Context>Warning about not being in conference based chat room.</extra-Context>
</message>
<message>
@ -2020,7 +2025,7 @@ Cliquez ici : &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<message>
<source>newConferenceScheduleTitle</source>
<extracomment>&apos;Would you like to schedule your meeting?&apos; : Ask about setting the meeting as scheduled.</extracomment>
<translation>Voulez-vous programmer cette réunion ?</translation>
<translation>Voulez-vous programmer cette réunion&#x202f;?</translation>
</message>
<message>
<source>newConferenceDate</source>
@ -2600,7 +2605,7 @@ Cliquez ici : &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
</message>
<message>
<source>serverTooltip</source>
<translation>Serveur LDAP. ie : ldap:// pour un serveur local ou ldap://ldap.example.org/</translation>
<translation>Serveur LDAP. ie&#x202f;: ldap:// pour un serveur local ou ldap://ldap.example.org/</translation>
</message>
<message>
<source>bindDNLabel</source>
@ -3546,7 +3551,7 @@ Cliquez ici : &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<message>
<source>deleteTimeline</source>
<extracomment>&apos;Are you sure you want to delete and leave this timeline?&apos;</extracomment>
<translation>Êtes-vous certain de vouloir tout effacer et de quitter cette conversation ?</translation>
<translation>Êtes-vous certain de vouloir tout effacer et de quitter cette conversation&#x202f;?</translation>
</message>
<message>
<source>deleteTimelineTooltip</source>

5
linphone-app/assets/languages/hu.ts
View file

@ -568,6 +568,11 @@ A kiszolgáló URL-je nincs konfigurálva.</translation>
<extracomment>&apos;Do you really want do cancel this meeting?&apos; : Warning message to confirm the cancellation of a meeting.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>icsCancelledMeetingInvite</source>
<extracomment>&apos;Meeting has been cancelled&apos; : ICS Title for cancelled meetings</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatConferenceInvitationMessage</name>

5
linphone-app/assets/languages/it.ts
View file

@ -569,6 +569,11 @@ URL del server non configurato.</translation>
<extracomment>&apos;Do you really want do cancel this meeting?&apos; : Warning message to confirm the cancellation of a meeting.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>icsCancelledMeetingInvite</source>
<extracomment>&apos;Meeting has been cancelled&apos; : ICS Title for cancelled meetings</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatConferenceInvitationMessage</name>

5
linphone-app/assets/languages/ja.ts
View file

@ -568,6 +568,11 @@
<extracomment>&apos;Do you really want do cancel this meeting?&apos; : Warning message to confirm the cancellation of a meeting.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>icsCancelledMeetingInvite</source>
<extracomment>&apos;Meeting has been cancelled&apos; : ICS Title for cancelled meetings</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatConferenceInvitationMessage</name>

5
linphone-app/assets/languages/lt.ts
View file

@ -570,6 +570,11 @@ Nesukonfigūruotas serverio url.</translation>
<extracomment>&apos;Do you really want do cancel this meeting?&apos; : Warning message to confirm the cancellation of a meeting.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>icsCancelledMeetingInvite</source>
<extracomment>&apos;Meeting has been cancelled&apos; : ICS Title for cancelled meetings</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatConferenceInvitationMessage</name>

5
linphone-app/assets/languages/pt_BR.ts
View file

@ -569,6 +569,11 @@ URL do servidor não configurado.</translation>
<extracomment>&apos;Do you really want do cancel this meeting?&apos; : Warning message to confirm the cancellation of a meeting.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>icsCancelledMeetingInvite</source>
<extracomment>&apos;Meeting has been cancelled&apos; : ICS Title for cancelled meetings</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatConferenceInvitationMessage</name>

5
linphone-app/assets/languages/ru.ts
View file

@ -570,6 +570,11 @@
<extracomment>&apos;Do you really want do cancel this meeting?&apos; : Warning message to confirm the cancellation of a meeting.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>icsCancelledMeetingInvite</source>
<extracomment>&apos;Meeting has been cancelled&apos; : ICS Title for cancelled meetings</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatConferenceInvitationMessage</name>

5
linphone-app/assets/languages/sv.ts
View file

@ -569,6 +569,11 @@ Serverwebbadressen är inte konfigurerad.</translation>
<extracomment>&apos;Do you really want do cancel this meeting?&apos; : Warning message to confirm the cancellation of a meeting.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>icsCancelledMeetingInvite</source>
<extracomment>&apos;Meeting has been cancelled&apos; : ICS Title for cancelled meetings</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatConferenceInvitationMessage</name>

5
linphone-app/assets/languages/tr.ts
View file

@ -568,6 +568,11 @@ Sunucu url&apos;si yapılandırılmadı.</translation>
<extracomment>&apos;Do you really want do cancel this meeting?&apos; : Warning message to confirm the cancellation of a meeting.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>icsCancelledMeetingInvite</source>
<extracomment>&apos;Meeting has been cancelled&apos; : ICS Title for cancelled meetings</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatConferenceInvitationMessage</name>

5
linphone-app/assets/languages/uk.ts
View file

@ -570,6 +570,11 @@
<extracomment>&apos;Do you really want do cancel this meeting?&apos; : Warning message to confirm the cancellation of a meeting.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>icsCancelledMeetingInvite</source>
<extracomment>&apos;Meeting has been cancelled&apos; : ICS Title for cancelled meetings</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatConferenceInvitationMessage</name>

5
linphone-app/assets/languages/zh_CN.ts
View file

@ -568,6 +568,11 @@
<extracomment>&apos;Do you really want do cancel this meeting?&apos; : Warning message to confirm the cancellation of a meeting.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>icsCancelledMeetingInvite</source>
<extracomment>&apos;Meeting has been cancelled&apos; : ICS Title for cancelled meetings</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatConferenceInvitationMessage</name>

8
linphone-app/src/components/conferenceInfo/ConferenceInfoListModel.cpp
View file

@ -43,7 +43,7 @@ ConferenceInfoListModel::ConferenceInfoListModel (QObject *parent) : ProxyListMo
auto conferenceInfos = coreManager->getCore()->getConferenceInformationList();
QList<QSharedPointer<ConferenceInfoModel> > 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<ConferenceInfoModel> ConferenceInfoListModel::build(const std::shared_ptr<linphone::ConferenceInfo> & conferenceInfo) const{
QSharedPointer<ConferenceInfoModel> ConferenceInfoListModel::build(const std::shared_ptr<linphone::ConferenceInfo> & conferenceInfo, const bool& buildAll) const{
auto me = CoreManager::getInstance()->getCore()->getDefaultAccount()->getParams()->getIdentityAddress();
std::list<std::shared_ptr<linphone::Address>> 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<linphone::Address>& address){
return me->weakEqual(address);
@ -70,7 +70,7 @@ QSharedPointer<ConferenceInfoModel> ConferenceInfoListModel::build(const std::sh
}
void ConferenceInfoListModel::add(const std::shared_ptr<linphone::ConferenceInfo> & conferenceInfo, const bool& sendEvents){
auto item = build(conferenceInfo);
auto item = build(conferenceInfo, mBuildAll);
if( item)
ProxyListModel::add(item);
}

5
linphone-app/src/components/conferenceInfo/ConferenceInfoListModel.hpp
View file

@ -37,7 +37,7 @@ class ConferenceInfoListModel : public ProxyListModel {
public:
ConferenceInfoListModel (QObject *parent = Q_NULLPTR);
QSharedPointer<ConferenceInfoModel> build(const std::shared_ptr<linphone::ConferenceInfo> & conferenceInfo) const;
QSharedPointer<ConferenceInfoModel> build(const std::shared_ptr<linphone::ConferenceInfo> & conferenceInfo, const bool& buildAll) const;
void add(const std::shared_ptr<linphone::ConferenceInfo> & 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

4
linphone-app/ui/modules/Linphone/Chat/ChatCalendarMessage.qml
View file

@ -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