[15383] Add the album count attribute to message body (#15487)

This commit is contained in:
Ibrahem Khalil 2023-04-07 17:49:56 +02:00 committed by GitHub
parent 9da9427488
commit bb20c5848f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 5 deletions

View File

@ -41,7 +41,8 @@
:albumId :album-id
:imageWidth :image-width
:imageHeight :image-height
:new :new?})
:new :new?
:albumImagesCount :album-images-count})
(update :quoted-message
set/rename-keys

View File

@ -76,7 +76,8 @@
(format-reply-author from contact-name current-public-key)]])
(defn reply-message
[{:keys [from identicon content-type contentType parsed-text content deleted? deleted-for-me?]}
[{:keys [from identicon content-type contentType parsed-text content deleted? deleted-for-me?
album-images-count]}
in-chat-input? pin? recording-audio?]
(let [contact-name (rf/sub [:contacts/contact-name-by-identity from])
current-public-key (rf/sub [:multiaccount/public-key])
@ -113,9 +114,12 @@
(= constants/content-type-audio content-type))
{:color (colors/theme-colors colors/neutral-50 colors/neutral-40)}))}
(case (or content-type contentType)
constants/content-type-image "Image"
constants/content-type-sticker "Sticker"
constants/content-type-audio "Audio"
constants/content-type-image (if album-images-count
(i18n/label :t/images-albums-count
{:album-images-count album-images-count})
(i18n/label :t/image))
constants/content-type-sticker (i18n/label :t/sticker)
constants/content-type-audio (i18n/label :t/audio)
(get-quoted-text-with-mentions (or parsed-text (:parsed-text content))))]])]
(when (and in-chat-input? (not recording-audio?))
[quo2.button/button

View File

@ -2018,6 +2018,7 @@
"you-have-no-contacts": "You have no contacts",
"my-albums": "My albums",
"images": "images",
"images-albums-count": "{{album-images-count}} images",
"only-6-images": "You can only add 6 images to your message",
"delivered": "Delivered",
"mark-all-notifications-as-read": "Mark all notifications as read",