status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: unbreak "fetch more messages..." 

leftover from the qsTrId() -> qsTr() transition; obey the locale
settings a bit more
This commit is contained in:
Lukáš Tinkl 2022-07-12 10:22:53 +02:00 committed by Lukáš Tinkl
parent 5bbc80091a
commit e41d73eae3
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/imports/shared/controls/chat/FetchMoreMessagesButton.qml
View File

@ -20,8 +20,8 @@ Item {
QtObject {
id: d
property string formattedDate: nextMessageIndex > -1 ? Utils.formatLongDate(nextMsgTimestamp * 1, RootStore.accountSensitiveSettings.isDDMMYYDateFormat) :
Utils.formatLongDate(undefined, RootStore.accountSensitiveSettings.isDDMMYYDateFormat)
readonly property string formattedDate: nextMessageIndex > -1 ? Utils.formatLongDate(nextMsgTimestamp * 1, RootStore.accountSensitiveSettings.isDDMMYYDateFormat) :
Utils.formatLongDate(undefined, RootStore.accountSensitiveSettings.isDDMMYYDateFormat)
}
Timer {
@ -80,7 +80,7 @@ Item {
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter
color: Style.current.secondaryText
text: qsTr("before--%1").arg(d.formattedDate)
text: qsTr("Before %1").arg(d.formattedDate)
visible: d.formattedDate
}

6
ui/imports/shared/controls/chat/GapComponent.qml
View File

@ -1,6 +1,7 @@
import QtQuick 2.13
import shared 1.0
import shared.panels 1.0
import shared.stores 1.0
import utils 1.0
Item {
@ -23,7 +24,7 @@ Item {
font.weight: Font.Medium
font.pixelSize: Style.current.primaryTextFontSize
color: Style.current.blue
text: qsTr("fetch-messages")
text: qsTr("Fetch messages")
horizontalAlignment: Text.AlignHCenter
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: sep1.bottom
@ -45,7 +46,8 @@ Item {
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter
color: Style.current.secondaryText
text: qsTr("between--1-and--2").arg(new Date(root.gapFrom * 1000)).arg(new Date(root.gapTo * 1000))
text: qsTr("Between %1 and %2").arg(Utils.formatLongDate(root.gapFrom * 1000, RootStore.accountSensitiveSettings.isDDMMYYDateFormat))
.arg(Utils.formatLongDate(root.gapTo * 1000, RootStore.accountSensitiveSettings.isDDMMYYDateFormat))
}
Separator {
anchors.top: fetchDate.bottom