diff --git a/autotests/messagecontentmodeltest.cpp b/autotests/messagecontentmodeltest.cpp index b6970a31f..c7e359cce 100644 --- a/autotests/messagecontentmodeltest.cpp +++ b/autotests/messagecontentmodeltest.cpp @@ -43,13 +43,13 @@ void MessageContentModelTest::missingEvent() QCOMPARE(model1.rowCount(), 1); QCOMPARE(model1.data(model1.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Loading); - QCOMPARE(model1.data(model1.index(0), MessageContentModel::DisplayRole), u"Loading"_s); + QCOMPARE(model1.data(model1.index(0), MessageContentModel::DisplayRole), u"Loading…"_s); auto model2 = EventMessageContentModel(room, u"$153456789:example.org"_s, true); QCOMPARE(model2.rowCount(), 1); QCOMPARE(model2.data(model2.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Loading); - QCOMPARE(model2.data(model2.index(0), MessageContentModel::DisplayRole), u"Loading reply"_s); + QCOMPARE(model2.data(model2.index(0), MessageContentModel::DisplayRole), u"Loading reply…"_s); room->syncNewEvents(u"test-min-sync.json"_s); QCOMPARE(model1.rowCount(), 2); diff --git a/src/messagecontent/LoadComponent.qml b/src/messagecontent/LoadComponent.qml index 071f7c3ba..5b59b89db 100644 --- a/src/messagecontent/LoadComponent.qml +++ b/src/messagecontent/LoadComponent.qml @@ -19,7 +19,7 @@ RowLayout { Layout.fillWidth: true Layout.maximumWidth: Message.maxContentWidth - spacing: Kirigami.Units.smallSpacing + spacing: 0 QQC2.BusyIndicator {} Kirigami.Heading { @@ -27,7 +27,7 @@ RowLayout { Layout.fillWidth: true verticalAlignment: Text.AlignVCenter level: 2 - text: root.display.length > 0 ? root.display : i18n("Loading") + text: root.display.length > 0 ? root.display : i18nc("@info Loading this message", "Loading…") } } diff --git a/src/messagecontent/models/eventmessagecontentmodel.cpp b/src/messagecontent/models/eventmessagecontentmodel.cpp index beaa5c2e3..c235ac14a 100644 --- a/src/messagecontent/models/eventmessagecontentmodel.cpp +++ b/src/messagecontent/models/eventmessagecontentmodel.cpp @@ -256,7 +256,8 @@ void EventMessageContentModel::resetModel() const auto event = m_room->getEvent(m_eventId); if (event.first == nullptr) { - m_components += MessageComponent{MessageComponentType::Loading, m_isReply ? i18n("Loading reply") : i18n("Loading"), {}}; + m_components += + MessageComponent{MessageComponentType::Loading, m_isReply ? i18nc("@info", "Loading reply…") : i18nc("@info Loading this message", "Loading…"), {}}; endResetModel(); return; }