rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace some user visible mentions of spaces

This commit is contained in:
Nicolas Werner 2022-10-01 15:20:38 +02:00
parent 30882d4aa9
commit 7ec842ba51
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/qml/CommunitiesList.qml
View File

@ -48,14 +48,14 @@ Page {
}
Platform.MenuItem {
text: qsTr("Do not show notification counts for this space or tag.")
text: qsTr("Do not show notification counts for this community or tag.")
checkable: true
checked: communityContextMenu.muted
onTriggered: Communities.toggleTagMute(communityContextMenu.tagId)
}
Platform.MenuItem {
text: qsTr("Hide rooms with this tag or from this space by default.")
text: qsTr("Hide rooms with this tag or from this community by default.")
checkable: true
checked: communityContextMenu.hidden
onTriggered: Communities.toggleTagId(communityContextMenu.tagId)

2
resources/qml/RoomList.qml
View File

@ -211,7 +211,7 @@ Page {
roomid: roomContextMenu.roomid
position: -1
title: qsTr("Add or remove from space")
title: qsTr("Add or remove from community...")
childMenu: nestedSpaceMenuLevel
}
}

2
resources/qml/components/SpaceMenuLevel.qml
View File

@ -13,7 +13,7 @@ Platform.Menu {
property Component childMenu
property int position: modelData == undefined ? -2 : modelData.treeIndex
title: modelData != undefined ? modelData.name : qsTr("Add or remove from space")
title: modelData != undefined ? modelData.name : qsTr("Add or remove from community")
property bool loadChildren: false
onAboutToShow: loadChildren = true

2
resources/qml/delegates/MessageDelegate.qml
View File

@ -322,7 +322,7 @@ Item {
isReply: d.isReply
keepFullText: d.keepFullText
isStateEvent: d.isStateEvent
formatted: qsTr("%1 changed the parent spaces for this room.").arg(d.userName)
formatted: qsTr("%1 changed the parent communities for this room.").arg(d.userName)
}
}

4
src/PowerlevelsEditModels.cpp
View File

@ -210,9 +210,9 @@ PowerlevelsTypeListModel::data(const QModelIndex &index, int role) const
return tr("Ban servers using policy rules");
else if (type.type == "m.space.child")
return tr("Edit child rooms");
return tr("Edit child communities and rooms");
else if (type.type == "m.space.parent")
return tr("Change parent spaces");
return tr("Change parent communities");
else if (type.type == "m.call.invite")
return tr("Start a call");

6
src/UserSettingsPage.cpp
View File

@ -945,7 +945,7 @@ UserSettingsModel::data(const QModelIndex &index, int role) const
case DecryptSidebar:
return tr("Decrypt messages in sidebar");
case SpaceNotifications:
return tr("Show message counts for spaces");
return tr("Show message counts for communities and tags");
case PrivacyScreen:
return tr("Privacy Screen");
case PrivacyScreenTimeout:
@ -1234,8 +1234,8 @@ UserSettingsModel::data(const QModelIndex &index, int role) const
return tr("Decrypt the messages shown in the sidebar.\nOnly affects messages in "
"encrypted chats.");
case SpaceNotifications:
return tr(
"Choose where to show the total number of notifications contained within a space.");
return tr("Choose where to show the total number of notifications contained within a "
"community or tag.");
case PrivacyScreen:
return tr("When the window loses focus, the timeline will\nbe blurred.");
case MobileMode:

10
src/timeline/CommunitiesModel.cpp
View File

@ -808,7 +808,7 @@ CommunitiesModel::spaceChildrenListFromIndex(QString room, int idx) const
}
}
nhlog::ui()->critical("Returning {} spaces", ret.size());
// nhlog::ui()->critical("Returning {} spaces", ret.size());
return ret;
}
@ -848,7 +848,7 @@ CommunitiesModel::updateSpaceStatus(QString space,
[space, room](mtx::responses::EventId, mtx::http::RequestErr err) {
if (err) {
ChatPage::instance()->showNotification(
tr("Failed to update space child: %1")
tr("Failed to update community: %1")
.arg(QString::fromStdString(err->matrix_error.error)));
nhlog::net()->error("Failed to update child {} of {}: {}",
room.toStdString(),
@ -866,7 +866,7 @@ CommunitiesModel::updateSpaceStatus(QString space,
[space, room](mtx::responses::EventId, mtx::http::RequestErr err) {
if (err) {
ChatPage::instance()->showNotification(
tr("Failed to delete space child: %1")
tr("Failed to delete room from community: %1")
.arg(QString::fromStdString(err->matrix_error.error)));
nhlog::net()->error("Failed to delete child {} of {}: {}",
room.toStdString(),
@ -889,7 +889,7 @@ CommunitiesModel::updateSpaceStatus(QString space,
[space, room](mtx::responses::EventId, mtx::http::RequestErr err) {
if (err) {
ChatPage::instance()->showNotification(
tr("Failed to update space parent: %1")
tr("Failed to update community for room: %1")
.arg(QString::fromStdString(err->matrix_error.error)));
nhlog::net()->error("Failed to update parent {} of {}: {}",
space.toStdString(),
@ -907,7 +907,7 @@ CommunitiesModel::updateSpaceStatus(QString space,
[space, room](mtx::responses::EventId, mtx::http::RequestErr err) {
if (err) {
ChatPage::instance()->showNotification(
tr("Failed to delete space parent: %1")
tr("Failed to remove community from room: %1")
.arg(QString::fromStdString(err->matrix_error.error)));
nhlog::net()->error("Failed to delete parent {} of {}: {}",
space.toStdString(),