diff --git a/qml/components/InReplyToRow.qml b/qml/components/InReplyToRow.qml
index 1bffe27..0af7ca3 100644
--- a/qml/components/InReplyToRow.qml
+++ b/qml/components/InReplyToRow.qml
@@ -34,7 +34,7 @@ Row {
onInReplyToMessageChanged: {
if (inReplyToMessage) {
inReplyToUserText.text = (inReplyToRow.inReplyToMessage.sender_user_id !== inReplyToRow.myUserId) ? Emoji.emojify(Functions.getUserName(tdLibWrapper.getUserInformation(inReplyToRow.inReplyToMessage.sender_user_id)), inReplyToUserText.font.pixelSize) : qsTr("You");
- inReplyToMessageText.text = Emoji.emojify(Functions.getMessageText(inReplyToRow.inReplyToMessage, true), inReplyToMessageText.font.pixelSize);
+ inReplyToMessageText.text = Emoji.emojify(Functions.getMessageText(inReplyToRow.inReplyToMessage, true, inReplyToRow.inReplyToMessage.sender_user_id === inReplyToRow.myUserId), inReplyToMessageText.font.pixelSize);
}
}
diff --git a/qml/js/functions.js b/qml/js/functions.js
index f3036a1..893d0f6 100644
--- a/qml/js/functions.js
+++ b/qml/js/functions.js
@@ -23,7 +23,7 @@ function getUserName(userInformation) {
return (firstName + " " + lastName).trim();
}
-function getMessageText(message, simple) {
+function getMessageText(message, simple, myself) {
if (message.content['@type'] === 'messageText') {
if (simple) {
return message.content.text.text;
@@ -38,61 +38,61 @@ function getMessageText(message, simple) {
if (message.content.caption.text !== "") {
return simple ? qsTr("Picture: %1").arg(message.content.caption.text) : enhanceMessageText(message.content.caption)
} else {
- return simple ? qsTr("sent a picture") : "";
+ return simple ? (myself ? qsTr("sent a picture", "myself") : qsTr("sent a picture")) : "";
}
}
if (message.content['@type'] === 'messageVideo') {
if (message.content.caption.text !== "") {
return simple ? qsTr("Video: %1").arg(message.content.caption.text) : enhanceMessageText(message.content.caption)
} else {
- return simple ? qsTr("sent a video") : "";
+ return simple ? (myself ? qsTr("sent a video", "myself") : qsTr("sent a video")) : "";
}
}
if (message.content['@type'] === 'messageAnimation') {
if (message.content.caption.text !== "") {
return simple ? qsTr("Animation: %1").arg(message.content.caption.text) : enhanceMessageText(message.content.caption)
} else {
- return simple ? qsTr("sent an animation") : "";
+ return simple ? (myself ? qsTr("sent an animation", "myself") : qsTr("sent an animation")) : "";
}
}
if (message.content['@type'] === 'messageAudio') {
if (message.content.caption.text !== "") {
return simple ? qsTr("Audio: %1").arg(message.content.caption.text) : enhanceMessageText(message.content.caption)
} else {
- return simple ? qsTr("sent an audio") : "";
+ return simple ? (myself ? qsTr("sent an audio", "myself") : qsTr("sent an audio")) : "";
}
}
if (message.content['@type'] === 'messageVoiceNote') {
if (message.content.caption.text !== "") {
return simple ? qsTr("Voice Note: %1").arg(message.content.caption.text) : enhanceMessageText(message.content.caption)
} else {
- return simple ? qsTr("sent a voice note") : "";
+ return simple ? (myself ? qsTr("sent a voice note", "myself") : qsTr("sent a voice note")) : "";
}
}
if (message.content['@type'] === 'messageDocument') {
if (message.content.document.file_name !== "") {
return simple ? qsTr("Document: %1").arg(message.content.document.file_name) : message.content.document.file_name
} else {
- return simple ? qsTr("sent a document") : "";
+ return simple ? (myself ? qsTr("sent a document", "myself") : qsTr("sent a document")) : "";
}
}
if (message.content['@type'] === 'messageLocation') {
- return simple ? qsTr("sent a location") : "";
+ return simple ? (myself ? qsTr("sent a location", "myself") : qsTr("sent a location")) : "";
}
if (message.content['@type'] === 'messageVenue') {
- return simple ? qsTr("sent a venue") : ( "" + message.content.venue.title + ", " + message.content.venue.address );
+ return simple ? (myself ? qsTr("sent a venue", "myself") : qsTr("sent a venue")) : ( "" + message.content.venue.title + ", " + message.content.venue.address );
}
if (message.content['@type'] === 'messageContactRegistered') {
- return qsTr("has registered with Telegram");
+ return myself ? qsTr("have registered with Telegram") : qsTr("has registered with Telegram");
}
if (message.content['@type'] === 'messageChatJoinByLink') {
- return qsTr("joined this chat");
+ return myself ? qsTr("joined this chat", "myself") : qsTr("joined this chat");
}
if (message.content['@type'] === 'messageChatAddMembers') {
- return qsTr("was added to this chat");
+ return myself ? qsTr("were added to this chat", "myself") : qsTr("was added to this chat");
}
if (message.content['@type'] === 'messageChatDeleteMember') {
- return qsTr("left this chat");
+ return myself ? qsTr("left this chat", "myself") : qsTr("left this chat");
}
return qsTr("Unsupported message: %1").arg(message.content['@type'].substring(7));
}
diff --git a/qml/pages/ChatPage.qml b/qml/pages/ChatPage.qml
index 4c52254..4cfe1bf 100644
--- a/qml/pages/ChatPage.qml
+++ b/qml/pages/ChatPage.qml
@@ -458,7 +458,7 @@ Page {
MenuItem {
onClicked: {
newMessageColumn.editMessageId = display.id;
- newMessageTextField.text = Functions.getMessageText(display, false);
+ newMessageTextField.text = Functions.getMessageText(display, false, false);
newMessageTextField.focus = true;
}
text: qsTr("Edit Message")
@@ -610,7 +610,7 @@ Page {
id: messageText
width: parent.width
- text: Emoji.emojify(Functions.getMessageText(display, false), font.pixelSize)
+ text: Emoji.emojify(Functions.getMessageText(display, false, chatPage.myUserId === display.sender_user_id), font.pixelSize)
font.pixelSize: Theme.fontSizeSmall
color: (chatPage.myUserId === display.sender_user_id) ? Theme.highlightColor : Theme.primaryColor
wrapMode: Text.Wrap
@@ -773,7 +773,7 @@ Page {
if (index === modelIndex) {
console.log("[ChatModel] This message was updated, index " + index + ", updating content...");
messageDateText.text = getMessageStatusText(display, index, chatView.lastReadSentIndex);
- messageText.text = Emoji.emojify(Functions.getMessageText(display, false), messageText.font.pixelSize);
+ messageText.text = Emoji.emojify(Functions.getMessageText(display, false, chatPage.myUserId === display.sender_user_id), messageText.font.pixelSize);
if(locationPreviewLoader.active && locationPreviewLoader.status === Loader.Ready) {
locationPreviewLoader.item.locationData = display.content.location;
locationPreviewLoader.item.updatePicture()
diff --git a/qml/pages/OverviewPage.qml b/qml/pages/OverviewPage.qml
index 0ac6e7b..349a5ad 100644
--- a/qml/pages/OverviewPage.qml
+++ b/qml/pages/OverviewPage.qml
@@ -256,7 +256,7 @@ Page {
chatUnreadMessagesCount.text = display.unread_count > 99 ? "99+" : display.unread_count;
chatListNameText.text = display.title !== "" ? Emoji.emojify(display.title, Theme.fontSizeMedium) + ( display.notification_settings.mute_for > 0 ? Emoji.emojify(" 🔇", Theme.fontSizeMedium) : "" ) : qsTr("Unknown");
chatListLastUserText.text = (typeof display.last_message !== "undefined") ? ( display.last_message.sender_user_id !== overviewPage.ownUserId ? Emoji.emojify(Functions.getUserName(tdLibWrapper.getUserInformation(display.last_message.sender_user_id)), Theme.fontSizeExtraSmall) : qsTr("You") ) : qsTr("Unknown");
- chatListLastMessageText.text = (typeof display.last_message !== "undefined") ? Emoji.emojify(Functions.getMessageText(display.last_message, true), Theme.fontSizeExtraSmall) : qsTr("Unknown");
+ chatListLastMessageText.text = (typeof display.last_message !== "undefined") ? Emoji.emojify(Functions.getMessageText(display.last_message, true, display.last_message.sender_user_id === overviewPage.ownUserId), Theme.fontSizeExtraSmall) : qsTr("Unknown");
messageContactTimeElapsedText.text = (typeof display.last_message !== "undefined") ? Functions.getDateTimeElapsed(display.last_message.date) : qsTr("Unknown");
}
}
@@ -362,7 +362,7 @@ Page {
}
Text {
id: chatListLastMessageText
- text: (typeof display.last_message !== "undefined") ? Emoji.emojify(Functions.getMessageText(display.last_message, true), Theme.fontSizeExtraSmall) : qsTr("Unknown")
+ text: (typeof display.last_message !== "undefined") ? Emoji.emojify(Functions.getMessageText(display.last_message, true, display.last_message.sender_user_id === overviewPage.ownUserId), Theme.fontSizeExtraSmall) : qsTr("Unknown")
font.pixelSize: Theme.fontSizeExtraSmall
color: Theme.primaryColor
width: parent.width - Theme.paddingMedium - chatListLastUserText.width
@@ -392,7 +392,7 @@ Page {
chatUnreadMessagesCount.text = display.unread_count > 99 ? "99+" : display.unread_count;
chatListNameText.text = display.title !== "" ? Emoji.emojify(display.title, Theme.fontSizeMedium) + ( display.notification_settings.mute_for > 0 ? Emoji.emojify(" 🔇", Theme.fontSizeMedium) : "" ) : qsTr("Unknown");
chatListLastUserText.text = (typeof display.last_message !== "undefined") ? ( display.last_message.sender_user_id !== overviewPage.ownUserId ? Emoji.emojify(Functions.getUserName(tdLibWrapper.getUserInformation(display.last_message.sender_user_id)), Theme.fontSizeExtraSmall) : qsTr("You") ) : qsTr("Unknown");
- chatListLastMessageText.text = (typeof display.last_message !== "undefined") ? Emoji.emojify(Functions.getMessageText(display.last_message, true), Theme.fontSizeExtraSmall) : qsTr("Unknown");
+ chatListLastMessageText.text = (typeof display.last_message !== "undefined") ? Emoji.emojify(Functions.getMessageText(display.last_message, true, display.last_message.sender_user_id === overviewPage.ownUserId), Theme.fontSizeExtraSmall) : qsTr("Unknown");
}
}
}
diff --git a/translations/harbour-fernschreiber-de.ts b/translations/harbour-fernschreiber-de.ts
index 04c5b83..d7b3c66 100644
--- a/translations/harbour-fernschreiber-de.ts
+++ b/translations/harbour-fernschreiber-de.ts
@@ -526,5 +526,64 @@
sent a venue
hat einen Ort geschickt
+
+ sent a picture
+ myself
+ haben ein Bild geschickt
+
+
+ sent a video
+ myself
+ haben ein Video geschickt
+
+
+ sent an animation
+ myself
+ haben eine Animation geschickt
+
+
+ sent an audio
+ myself
+ haben eine Audiodatei geschickt
+
+
+ sent a voice note
+ myself
+ haben eine Sprachnachricht geschickt
+
+
+ sent a document
+ myself
+ haben ein Dokument geschickt
+
+
+ sent a location
+ myself
+ haben einen Standort geschickt
+
+
+ sent a venue
+ myself
+ haben einen Ort geschickt
+
+
+ have registered with Telegram
+ haben sich bei Telegram angemeldet
+
+
+ joined this chat
+ myself
+ sind diesem Chat beigetreten
+
+
+ were added to this chat
+ myself
+ wurde diesem Chat hinzugefügt
+
+
+ left this chat
+ myself
+ haben diesen Chat verlassen
+
diff --git a/translations/harbour-fernschreiber-es.ts b/translations/harbour-fernschreiber-es.ts
index 319a36a..b8575e4 100644
--- a/translations/harbour-fernschreiber-es.ts
+++ b/translations/harbour-fernschreiber-es.ts
@@ -526,5 +526,64 @@
sent a venue
+
+ sent a picture
+ myself
+ envió una imagen
+
+
+ sent a video
+ myself
+ envió un video
+
+
+ sent an animation
+ myself
+ envió una animación
+
+
+ sent an audio
+ myself
+ envió un audio
+
+
+ sent a voice note
+ myself
+ envió una nota de voz
+
+
+ sent a document
+ myself
+ envió un documento
+
+
+ sent a location
+ myself
+ envió una ubicación
+
+
+ sent a venue
+ myself
+
+
+
+ have registered with Telegram
+
+
+
+ joined this chat
+ myself
+ se unió a esta charla
+
+
+ were added to this chat
+ myself
+
+
+
+ left this chat
+ myself
+ dejó esta charla
+
diff --git a/translations/harbour-fernschreiber-hu.ts b/translations/harbour-fernschreiber-hu.ts
index 71566f7..3111587 100644
--- a/translations/harbour-fernschreiber-hu.ts
+++ b/translations/harbour-fernschreiber-hu.ts
@@ -526,5 +526,64 @@
sent a venue
+
+ sent a picture
+ myself
+ képet küldött
+
+
+ sent a video
+ myself
+ videót küldött
+
+
+ sent an animation
+ myself
+ animációt küldött
+
+
+ sent an audio
+ myself
+ audiót küldött
+
+
+ sent a voice note
+ myself
+ hangüzenetet küldött
+
+
+ sent a document
+ myself
+
+
+
+ sent a location
+ myself
+ helyzetmeghatározó információt küldött
+
+
+ sent a venue
+ myself
+
+
+
+ have registered with Telegram
+
+
+
+ joined this chat
+ myself
+ csatlakozott a csevegéshez
+
+
+ were added to this chat
+ myself
+
+
+
+ left this chat
+ myself
+ kilépett a csevegésből
+
diff --git a/translations/harbour-fernschreiber-pl.ts b/translations/harbour-fernschreiber-pl.ts
index a782b0a..22cf990 100644
--- a/translations/harbour-fernschreiber-pl.ts
+++ b/translations/harbour-fernschreiber-pl.ts
@@ -526,5 +526,64 @@
sent a venue
+
+ sent a picture
+ myself
+ wyślij obraz
+
+
+ sent a video
+ myself
+ wyślij film
+
+
+ sent an animation
+ myself
+ wyślij animację
+
+
+ sent an audio
+ myself
+ wyślij dźwięk
+
+
+ sent a voice note
+ myself
+ wyślij notatke głosową
+
+
+ sent a document
+ myself
+ wyślij dokument
+
+
+ sent a location
+ myself
+ wyślij lokalizację
+
+
+ sent a venue
+ myself
+
+
+
+ have registered with Telegram
+
+
+
+ joined this chat
+ myself
+
+
+
+ were added to this chat
+ myself
+
+
+
+ left this chat
+ myself
+
+
diff --git a/translations/harbour-fernschreiber-zh_CN.ts b/translations/harbour-fernschreiber-zh_CN.ts
index 21bcb8c..5abad32 100644
--- a/translations/harbour-fernschreiber-zh_CN.ts
+++ b/translations/harbour-fernschreiber-zh_CN.ts
@@ -526,5 +526,64 @@
sent a venue
+
+ sent a picture
+ myself
+ 发送照片
+
+
+ sent a video
+ myself
+ 发送视频
+
+
+ sent an animation
+ myself
+ 发送动画
+
+
+ sent an audio
+ myself
+ 发送音频
+
+
+ sent a voice note
+ myself
+
+
+
+ sent a document
+ myself
+ 发送文档
+
+
+ sent a location
+ myself
+ 发送位置
+
+
+ sent a venue
+ myself
+
+
+
+ have registered with Telegram
+
+
+
+ joined this chat
+ myself
+
+
+
+ were added to this chat
+ myself
+
+
+
+ left this chat
+ myself
+ 离开此对话
+
diff --git a/translations/harbour-fernschreiber.ts b/translations/harbour-fernschreiber.ts
index 52d155c..c1ca589 100644
--- a/translations/harbour-fernschreiber.ts
+++ b/translations/harbour-fernschreiber.ts
@@ -526,5 +526,64 @@
sent a venue
+
+ sent a picture
+ myself
+
+
+
+ sent a video
+ myself
+
+
+
+ sent an animation
+ myself
+
+
+
+ sent an audio
+ myself
+
+
+
+ sent a voice note
+ myself
+
+
+
+ sent a document
+ myself
+
+
+
+ sent a location
+ myself
+
+
+
+ sent a venue
+ myself
+
+
+
+ have registered with Telegram
+
+
+
+ joined this chat
+ myself
+
+
+
+ were added to this chat
+ myself
+
+
+
+ left this chat
+ myself
+
+