Fix 'AlbumPhoto'
This commit is contained in:
parent
ee7ceb4974
commit
73dfc6224f
@ -2757,8 +2757,13 @@ export class AppMessagesManager {
|
|||||||
public wrapMessageForReply(message: MyMessage | MyDraftMessage, text: string = (message as Message.message).message, usingMids?: number[], plain?: boolean, highlightWord?: string, withoutMediaType?: boolean): DocumentFragment | string {
|
public wrapMessageForReply(message: MyMessage | MyDraftMessage, text: string = (message as Message.message).message, usingMids?: number[], plain?: boolean, highlightWord?: string, withoutMediaType?: boolean): DocumentFragment | string {
|
||||||
const parts: (Node | string)[] = [];
|
const parts: (Node | string)[] = [];
|
||||||
|
|
||||||
|
let hasAlbumKey = false;
|
||||||
const addPart = (langKey: LangPackKey, part?: string | HTMLElement) => {
|
const addPart = (langKey: LangPackKey, part?: string | HTMLElement) => {
|
||||||
if(langKey) {
|
if(langKey) {
|
||||||
|
if(part === undefined && hasAlbumKey) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
part = plain ? I18n.format(langKey, true) : i18n(langKey);
|
part = plain ? I18n.format(langKey, true) : i18n(langKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2795,6 +2800,7 @@ export class AppMessagesManager {
|
|||||||
|
|
||||||
if(!withoutMediaType) {
|
if(!withoutMediaType) {
|
||||||
addPart('AttachAlbum');
|
addPart('AttachAlbum');
|
||||||
|
hasAlbumKey = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -2873,7 +2879,12 @@ export class AppMessagesManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(text && parts.length) {
|
const length = parts.length;
|
||||||
|
for(let i = 1; i < length; i += 2) {
|
||||||
|
parts.splice(i, 0, ', ');
|
||||||
|
}
|
||||||
|
|
||||||
|
if(text && length) {
|
||||||
parts.push(', ');
|
parts.push(', ');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user