From 179d9abba841fdf521308314636ed7f637077f00 Mon Sep 17 00:00:00 2001 From: Eduard Kuzmenko Date: Sat, 28 Aug 2021 00:41:39 +0300 Subject: [PATCH] more fixes --- src/lang.ts | 2 ++ src/lib/appManagers/appMessagesManager.ts | 8 ++++++-- src/lib/langPack.ts | 1 + src/scss/partials/_chatBubble.scss | 8 ++++---- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/lang.ts b/src/lang.ts index ee680939..ac9dfaa0 100644 --- a/src/lang.ts +++ b/src/lang.ts @@ -476,6 +476,7 @@ const lang = { "ActionGroupCallStarted": "un1 started a voice chat", "ActionGroupCallStartedByYou": "You started a voice chat", "ActionGroupCallJustStarted": "Voice chat started", + "ActionGroupCallEnded": "Voice chat ended (%s)", "ActionGroupCallInvited": "un1 invited un2 to the voice chat", "ActionGroupCallYouInvited": "You invited un2 to the voice chat", "ActionGroupCallInvitedYou": "un1 invited you to the voice chat", @@ -642,6 +643,7 @@ const lang = { "ChatList.Service.Call.Missed": "Missed Call", "ChatList.Service.VoiceChatScheduled": "%1$@ scheduled a voice chat for %2$@", "ChatList.Service.VoiceChatScheduledYou": "You scheduled a voice chat for %2$@", + "ChatList.Service.VoiceChatScheduled.Channel": "Voice chat scheduled for %@", "ChatList.Filter.Header": "Create folders for different groups of chats and quickly switch between them.", "ChatList.Filter.NewTitle": "Create Folder", "ChatList.Filter.List.Title": "Chat Folders", diff --git a/src/lib/appManagers/appMessagesManager.ts b/src/lib/appManagers/appMessagesManager.ts index 32980468..adb3a404 100644 --- a/src/lib/appManagers/appMessagesManager.ts +++ b/src/lib/appManagers/appMessagesManager.ts @@ -2748,10 +2748,14 @@ export class AppMessagesManager { const tomorrowDate = new Date(today); tomorrowDate.setDate(tomorrowDate.getDate() + 1); - langPackKey = 'ChatList.Service.VoiceChatScheduled'; + const isBroadcast = appPeersManager.isBroadcast(message.peerId); + langPackKey = isBroadcast ? 'ChatList.Service.VoiceChatScheduled.Channel' : 'ChatList.Service.VoiceChatScheduled'; + args = []; const myId = appUsersManager.getSelf().id; if(message.fromId === myId) { langPackKey += 'You'; + } else if(!isBroadcast) { + args.push(getNameDivHTML(message.fromId, plain)); } let k: LangPackKey, _args: any[] = []; @@ -2773,7 +2777,7 @@ export class AppMessagesManager { _args.push(formatTime(date)); const t = i18n(k, _args); - args = [t]; + args.push(t); break; } diff --git a/src/lib/langPack.ts b/src/lib/langPack.ts index 7f0bd932..926b6b43 100644 --- a/src/lib/langPack.ts +++ b/src/lib/langPack.ts @@ -53,6 +53,7 @@ export const langPack: {[actionType: string]: LangPackKey} = { "messageActionGroupCall.started": "ActionGroupCallJustStarted", "messageActionGroupCall.started_by": "ActionGroupCallStarted", "messageActionGroupCall.started_byYou": "ActionGroupCallStartedByYou", + "messageActionGroupCall.ended": "ActionGroupCallEnded", "messageActionGroupCall.ended_by": "Chat.Service.VoiceChatFinished", "messageActionGroupCall.ended_byYou": "Chat.Service.VoiceChatFinishedYou", diff --git a/src/scss/partials/_chatBubble.scss b/src/scss/partials/_chatBubble.scss index 3c45acbf..0c5bcece 100644 --- a/src/scss/partials/_chatBubble.scss +++ b/src/scss/partials/_chatBubble.scss @@ -1062,12 +1062,12 @@ $bubble-margin: .25rem; // all for audio (not voice) .message.audio-message { - min-width: 335px; - max-width: 335px !important; + width: 335px; + max-width: unquote("min(100%, 335px)") !important; @include respond-to(handhelds) { - min-width: 280px; - max-width: 300px !important; + width: 280px; + max-width: unquote("min(100%, 300px)") !important; } }