diff --git a/linphone-app/assets/languages/da.ts b/linphone-app/assets/languages/da.ts index 934bc3be0..f720f9998 100644 --- a/linphone-app/assets/languages/da.ts +++ b/linphone-app/assets/languages/da.ts @@ -528,6 +528,37 @@ Server url ikke konfigureret. + + ChatNoticeModel + + nMinute + + + + + + + nHour + + + + + + + nDay + + + + + + + nWeek + + + + + + Cli @@ -1488,6 +1519,11 @@ Klik her: <a href="%1">%1</a> 'New subject : %1' : Little message to show on the event when the subject of the chat room has been changed. %1 is the new subject. + + conferenceEphemeralMessageLifetimeChangedEvent + 'Ephemeral messages have been updated: %1' : Little message to show on the event when ephemeral has been updated. %1 is a date time + + Notifier diff --git a/linphone-app/assets/languages/de.ts b/linphone-app/assets/languages/de.ts index 5acaf6908..b7da5fe33 100644 --- a/linphone-app/assets/languages/de.ts +++ b/linphone-app/assets/languages/de.ts @@ -528,6 +528,37 @@ Server URL ist nicht konfiguriert. + + ChatNoticeModel + + nMinute + + + + + + + nHour + + + + + + + nDay + + + + + + + nWeek + + + + + + Cli @@ -1488,6 +1519,11 @@ Klicken Sie hier: <a href="%1">%1</a> 'New subject : %1' : Little message to show on the event when the subject of the chat room has been changed. %1 is the new subject. + + conferenceEphemeralMessageLifetimeChangedEvent + 'Ephemeral messages have been updated: %1' : Little message to show on the event when ephemeral has been updated. %1 is a date time + + Notifier diff --git a/linphone-app/assets/languages/en.ts b/linphone-app/assets/languages/en.ts index b1b05620a..783b35d5c 100644 --- a/linphone-app/assets/languages/en.ts +++ b/linphone-app/assets/languages/en.ts @@ -528,6 +528,37 @@ Server URL not configured. Hide delivery status + + ChatNoticeModel + + nMinute + + %1 minute + %1 minutes + + + + nHour + + %1 hour + %1 hours + + + + nDay + + %1 day + %1 days + + + + nWeek + + %1 week + %1 weeks + + + Cli @@ -1488,6 +1519,11 @@ Click here: <a href="%1">%1</a> 'New subject : %1' : Little message to show on the event when the subject of the chat room has been changed. %1 is the new subject. New subject: %1 + + conferenceEphemeralMessageLifetimeChangedEvent + 'Ephemeral messages have been updated: %1' : Little message to show on the event when ephemeral has been updated. %1 is a date time + Ephemeral messages have been updated: %1 + Notifier diff --git a/linphone-app/assets/languages/es.ts b/linphone-app/assets/languages/es.ts index 6fc9b3bb8..aed2e928c 100644 --- a/linphone-app/assets/languages/es.ts +++ b/linphone-app/assets/languages/es.ts @@ -528,6 +528,37 @@ URL del servidor no configurada. + + ChatNoticeModel + + nMinute + + + + + + + nHour + + + + + + + nDay + + + + + + + nWeek + + + + + + Cli @@ -1488,6 +1519,11 @@ Haga clic aquí: <a href="%1">%1 </a> 'New subject : %1' : Little message to show on the event when the subject of the chat room has been changed. %1 is the new subject. + + conferenceEphemeralMessageLifetimeChangedEvent + 'Ephemeral messages have been updated: %1' : Little message to show on the event when ephemeral has been updated. %1 is a date time + + Notifier diff --git a/linphone-app/assets/languages/fr_FR.ts b/linphone-app/assets/languages/fr_FR.ts index 8a8b41b74..728bbf292 100644 --- a/linphone-app/assets/languages/fr_FR.ts +++ b/linphone-app/assets/languages/fr_FR.ts @@ -528,6 +528,37 @@ URL du serveur non configurée. Cacher le statut du message + + ChatNoticeModel + + nMinute + + %1 minute + %1 minutes + + + + nHour + + %1 heure + %1 heures + + + + nDay + + %1 jour + %1 jours + + + + nWeek + + %1 semaine + %1 semaines + + + Cli @@ -1488,6 +1519,11 @@ Cliquez ici : <a href="%1">%1</a> 'New subject : %1' : Little message to show on the event when the subject of the chat room has been changed. %1 is the new subject. Nouveau sujet : %1 + + conferenceEphemeralMessageLifetimeChangedEvent + 'Ephemeral messages have been updated: %1' : Little message to show on the event when ephemeral has been updated. %1 is a date time + + Notifier diff --git a/linphone-app/assets/languages/hu.ts b/linphone-app/assets/languages/hu.ts index fe767d81c..378480516 100644 --- a/linphone-app/assets/languages/hu.ts +++ b/linphone-app/assets/languages/hu.ts @@ -527,6 +527,33 @@ A kiszolgáló URL-je nincs konfigurálva. Kézbesítési állapot elrejtése + + ChatNoticeModel + + nMinute + + %1 perc + + + + nHour + + %1 óra + + + + nDay + + %1 nap + + + + nWeek + + %1 hét + + + Cli @@ -956,7 +983,6 @@ Ephemeral message is only supported in conference based chat room!''%1 hour' %1 óra - @@ -1365,7 +1391,6 @@ Kattintson ide: <a href="%1">%1</a> 'You need at least %1 participant.' : Tooltip to warn a user that there are not enough participants for the chat creation. Legalább %1 résztvevő szükséges. - @@ -1484,6 +1509,11 @@ Kattintson ide: <a href="%1">%1</a> 'New subject : %1' : Little message to show on the event when the subject of the chat room has been changed. %1 is the new subject. Új téma: %1 + + conferenceEphemeralMessageLifetimeChangedEvent + 'Ephemeral messages have been updated: %1' : Little message to show on the event when ephemeral has been updated. %1 is a date time + + Notifier diff --git a/linphone-app/assets/languages/it.ts b/linphone-app/assets/languages/it.ts index 06bd1336f..75ba56915 100644 --- a/linphone-app/assets/languages/it.ts +++ b/linphone-app/assets/languages/it.ts @@ -528,6 +528,37 @@ URL del server non configurato. + + ChatNoticeModel + + nMinute + + + + + + + nHour + + + + + + + nDay + + + + + + + nWeek + + + + + + Cli @@ -1488,6 +1519,11 @@ Clicca: <a href="%1">%1</a> 'New subject : %1' : Little message to show on the event when the subject of the chat room has been changed. %1 is the new subject. + + conferenceEphemeralMessageLifetimeChangedEvent + 'Ephemeral messages have been updated: %1' : Little message to show on the event when ephemeral has been updated. %1 is a date time + + Notifier diff --git a/linphone-app/assets/languages/ja.ts b/linphone-app/assets/languages/ja.ts index d063bcd7f..6b0223f15 100644 --- a/linphone-app/assets/languages/ja.ts +++ b/linphone-app/assets/languages/ja.ts @@ -527,6 +527,33 @@ + + ChatNoticeModel + + nMinute + + + + + + nHour + + + + + + nDay + + + + + + nWeek + + + + + Cli @@ -1482,6 +1509,11 @@ Ephemeral message is only supported in conference based chat room!''New subject : %1' : Little message to show on the event when the subject of the chat room has been changed. %1 is the new subject. + + conferenceEphemeralMessageLifetimeChangedEvent + 'Ephemeral messages have been updated: %1' : Little message to show on the event when ephemeral has been updated. %1 is a date time + + Notifier diff --git a/linphone-app/assets/languages/lt.ts b/linphone-app/assets/languages/lt.ts index fb3bf56dd..f53287cf3 100644 --- a/linphone-app/assets/languages/lt.ts +++ b/linphone-app/assets/languages/lt.ts @@ -529,6 +529,41 @@ Nesukonfigūruotas serverio url. + + ChatNoticeModel + + nMinute + + + + + + + + nHour + + + + + + + + nDay + + + + + + + + nWeek + + + + + + + Cli @@ -1494,6 +1529,11 @@ Spustelėkite čia: <a href="%1">%1</a> 'New subject : %1' : Little message to show on the event when the subject of the chat room has been changed. %1 is the new subject. + + conferenceEphemeralMessageLifetimeChangedEvent + 'Ephemeral messages have been updated: %1' : Little message to show on the event when ephemeral has been updated. %1 is a date time + + Notifier diff --git a/linphone-app/assets/languages/pt_BR.ts b/linphone-app/assets/languages/pt_BR.ts index be56d9d69..58eccf57e 100644 --- a/linphone-app/assets/languages/pt_BR.ts +++ b/linphone-app/assets/languages/pt_BR.ts @@ -528,6 +528,37 @@ URL do servidor não configurado. + + ChatNoticeModel + + nMinute + + + + + + + nHour + + + + + + + nDay + + + + + + + nWeek + + + + + + Cli @@ -1488,6 +1519,11 @@ Clique aqui: <a href="%1">%1 </a> 'New subject : %1' : Little message to show on the event when the subject of the chat room has been changed. %1 is the new subject. + + conferenceEphemeralMessageLifetimeChangedEvent + 'Ephemeral messages have been updated: %1' : Little message to show on the event when ephemeral has been updated. %1 is a date time + + Notifier diff --git a/linphone-app/assets/languages/ru.ts b/linphone-app/assets/languages/ru.ts index 838e025e1..f6136bea0 100644 --- a/linphone-app/assets/languages/ru.ts +++ b/linphone-app/assets/languages/ru.ts @@ -529,6 +529,41 @@ + + ChatNoticeModel + + nMinute + + + + + + + + nHour + + + + + + + + nDay + + + + + + + + nWeek + + + + + + + Cli @@ -1494,6 +1529,11 @@ Ephemeral message is only supported in conference based chat room!''New subject : %1' : Little message to show on the event when the subject of the chat room has been changed. %1 is the new subject. + + conferenceEphemeralMessageLifetimeChangedEvent + 'Ephemeral messages have been updated: %1' : Little message to show on the event when ephemeral has been updated. %1 is a date time + + Notifier diff --git a/linphone-app/assets/languages/sv.ts b/linphone-app/assets/languages/sv.ts index 0945c008a..74c291b3e 100644 --- a/linphone-app/assets/languages/sv.ts +++ b/linphone-app/assets/languages/sv.ts @@ -528,6 +528,37 @@ Serverwebbadressen är inte konfigurerad. + + ChatNoticeModel + + nMinute + + + + + + + nHour + + + + + + + nDay + + + + + + + nWeek + + + + + + Cli @@ -1488,6 +1519,11 @@ Klicka här: <a href="%1">%1</a> 'New subject : %1' : Little message to show on the event when the subject of the chat room has been changed. %1 is the new subject. + + conferenceEphemeralMessageLifetimeChangedEvent + 'Ephemeral messages have been updated: %1' : Little message to show on the event when ephemeral has been updated. %1 is a date time + + Notifier diff --git a/linphone-app/assets/languages/tr.ts b/linphone-app/assets/languages/tr.ts index 45591a553..13841a920 100644 --- a/linphone-app/assets/languages/tr.ts +++ b/linphone-app/assets/languages/tr.ts @@ -527,6 +527,33 @@ Sunucu url'si yapılandırılmadı. + + ChatNoticeModel + + nMinute + + + + + + nHour + + + + + + nDay + + + + + + nWeek + + + + + Cli @@ -1482,6 +1509,11 @@ Buraya tıklayın: <a href="%1">%1</a> 'New subject : %1' : Little message to show on the event when the subject of the chat room has been changed. %1 is the new subject. + + conferenceEphemeralMessageLifetimeChangedEvent + 'Ephemeral messages have been updated: %1' : Little message to show on the event when ephemeral has been updated. %1 is a date time + + Notifier diff --git a/linphone-app/assets/languages/uk.ts b/linphone-app/assets/languages/uk.ts index 2a6db4af8..364364e23 100644 --- a/linphone-app/assets/languages/uk.ts +++ b/linphone-app/assets/languages/uk.ts @@ -529,6 +529,41 @@ + + ChatNoticeModel + + nMinute + + + + + + + + nHour + + + + + + + + nDay + + + + + + + + nWeek + + + + + + + Cli @@ -1494,6 +1529,11 @@ Ephemeral message is only supported in conference based chat room!''New subject : %1' : Little message to show on the event when the subject of the chat room has been changed. %1 is the new subject. + + conferenceEphemeralMessageLifetimeChangedEvent + 'Ephemeral messages have been updated: %1' : Little message to show on the event when ephemeral has been updated. %1 is a date time + + Notifier diff --git a/linphone-app/assets/languages/zh_CN.ts b/linphone-app/assets/languages/zh_CN.ts index eef2e8123..b9d92c1d5 100644 --- a/linphone-app/assets/languages/zh_CN.ts +++ b/linphone-app/assets/languages/zh_CN.ts @@ -527,6 +527,33 @@ + + ChatNoticeModel + + nMinute + + + + + + nHour + + + + + + nDay + + + + + + nWeek + + + + + Cli @@ -1482,6 +1509,11 @@ Ephemeral message is only supported in conference based chat room!''New subject : %1' : Little message to show on the event when the subject of the chat room has been changed. %1 is the new subject. + + conferenceEphemeralMessageLifetimeChangedEvent + 'Ephemeral messages have been updated: %1' : Little message to show on the event when ephemeral has been updated. %1 is a date time + + Notifier diff --git a/linphone-app/src/components/chat-events/ChatNoticeModel.cpp b/linphone-app/src/components/chat-events/ChatNoticeModel.cpp index 8894cd416..d1006678f 100644 --- a/linphone-app/src/components/chat-events/ChatNoticeModel.cpp +++ b/linphone-app/src/components/chat-events/ChatNoticeModel.cpp @@ -89,18 +89,20 @@ bool ChatNoticeModel::update(){ handledEvent = false; break; } - case linphone::EventLog::Type::ConferenceEphemeralMessageEnabled :{ + case linphone::EventLog::Type::ConferenceEphemeralMessageEnabled : + case linphone::EventLog::Type::ConferenceEphemeralMessageLifetimeChanged : + { int selectedTime = mEventLog->getEphemeralMessageLifetime(); if(selectedTime == 60) - setName( "1 minute" ); + setName( tr("nMinute", "", 1).arg(1) ); else if(selectedTime == 3600) - setName( "1 heure" ); + setName( tr("nHour", "", 1).arg(1)); else if(selectedTime == 86400) - setName( "1 jour" ); + setName(tr("nDay", "", 1).arg(1) ); else if(selectedTime == 259200) - setName( "3 jours" ); + setName( tr("nDay", "", 3).arg(3) ); else if(selectedTime == 604800) - setName( "1 semaine" ); + setName( tr("nWeek", "", 1).arg(1) ); setStatus(NoticeType::NoticeMessage); break; } diff --git a/linphone-app/ui/modules/Linphone/Chat/Notice.qml b/linphone-app/ui/modules/Linphone/Chat/Notice.qml index 1c28a9595..2394e720f 100644 --- a/linphone-app/ui/modules/Linphone/Chat/Notice.qml +++ b/linphone-app/ui/modules/Linphone/Chat/Notice.qml @@ -66,7 +66,8 @@ RowLayout{ return qsTr('conferenceSecurityEvent'); } if (status == LinphoneEnums.EventLogTypeConferenceEphemeralMessageLifetimeChanged) { - return 'EventLogTypeConferenceEphemeralMessageLifetimeChanged'; + //: 'Ephemeral messages have been updated: %1' : Little message to show on the event when ephemeral has been updated. %1 is a date time + return qsTr('conferenceEphemeralMessageLifetimeChangedEvent'); } if (status == LinphoneEnums.EventLogTypeConferenceEphemeralMessageEnabled) { //: 'Ephemeral messages have been enabled: %1' : Little message to show on the event when ephemeral has been activated. %1 is a date time diff --git a/linphone-sdk b/linphone-sdk index 9ce33db5f..be371edc5 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit 9ce33db5f105dc81578faae25c2bdd66f857361b +Subproject commit be371edc5f80698464bd613036e423732959fa9b