sprainbrains/harbour-fernschreiber
1
0
Fork 0
forked from medvedych/harbour-fernschreiber
Code Pull requests Activity

Merge remote-tracking branch 'origin/master' into messageOptionsDrawer

Browse source
This commit is contained in:
Sebastian Wolf 2021-02-16 21:55:04 +01:00
commit 8ae148ec90
No known key found for this signature in database
GPG key ID: CEA9522B5F38A90A
2 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
qml/pages/ChatPage.qml
View file

@ -575,6 +575,7 @@ Page {
}
chatViewCooldownTimer.restart();
chatViewStartupReadTimer.restart();
}
onNewMessageReceived: {
if (chatView.manuallyScrolledToBottom || message.sender.user_id === chatPage.myUserId) {
@ -604,6 +605,7 @@ Page {
viewMessageTimer.queueViewMessage(chatView.count - 1);
}
chatViewCooldownTimer.restart();
chatViewStartupReadTimer.restart();
}
onNotificationSettingsUpdated: {
chatInformation = chatModel.getChatInformation();
@ -1007,6 +1009,7 @@ Page {
}
}
PinnedMessageItem {
id: pinnedMessageItem
onRequestShowMessage: {
@ -1053,6 +1056,20 @@ Page {
}
}
Timer {
id: chatViewStartupReadTimer
interval: 200
repeat: false
running: false
onTriggered: {
if (!chatPage.isInitialized) {
Debug.log("Page is initialized!");
chatPage.isInitialized = true;
chatView.handleScrollPositionChanged();
}
}
}
Loader {
asynchronous: true
active: chatView.blurred

24
translations/harbour-fernschreiber-ru.ts
View file

@ -208,7 +208,7 @@
</message>
<message>
<source>You</source>
<translation>Вы</translation>
<translation>Я</translation>
</message>
<message>
<source>You don&apos;t have any groups in common with this user.</source>
@ -249,7 +249,7 @@
</message>
<message>
<source>You</source>
<translation>Вы</translation>
<translation>Я</translation>
</message>
<message>
<source>User Info</source>
@ -912,15 +912,15 @@
<name>InReplyToRow</name>
<message>
<source>You</source>
<translation>Вы</translation>
<translation>Я</translation>
</message>
<message>
<source>Unknown</source>
<translation type="unfinished">Неизвестный(ая)</translation>
<translation>Неизвестный(ая)</translation>
</message>
<message>
<source>This message was deleted</source>
<translation type="unfinished">Сообщение было удалено</translation>
<translation>Сообщение было удалено</translation>
</message>
</context>
<context>
@ -1021,7 +1021,7 @@
<name>MessageListViewItemSimple</name>
<message>
<source>You</source>
<translation>Вы</translation>
<translation>Я</translation>
</message>
<message numerus="yes">
<source>scored %Ln points in %2</source>
@ -1052,7 +1052,7 @@
<name>MessageOverlayFlickable</name>
<message>
<source>You</source>
<translation>Вы</translation>
<translation>Я</translation>
</message>
<message>
<source>This message was forwarded. Original author: %1</source>
@ -1248,7 +1248,7 @@
<name>PinnedMessageItem</name>
<message>
<source>You</source>
<translation>Вы</translation>
<translation>Я</translation>
</message>
<message>
<source>Pinned Message</source>
@ -1705,22 +1705,22 @@
</message>
<message>
<source>Removing sticker set</source>
<translation type="unfinished"></translation>
<translation>Удаление набора стикеров</translation>
</message>
<message>
<source>Sticker set successfully removed!</source>
<translation type="unfinished"></translation>
<translation>Набор стикеров успешно удалён!</translation>
</message>
</context>
<context>
<name>StickerSetOverlay</name>
<message>
<source>Sticker set successfully installed!</source>
<translation type="unfinished"></translation>
<translation>Набор стикеров успешно установлен!</translation>
</message>
<message>
<source>Sticker set successfully removed!</source>
<translation type="unfinished"></translation>
<translation>Набор стикеров успешно удалён!</translation>
</message>
</context>
<context>