Skip to content

[stable-4.0] chore(i18n): Change group folder to team folder #9868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nilsding merged 3 commits into from
Apr 20, 2026
+6 −6
Merged

[stable-4.0] chore(i18n): Change group folder to team folder #9868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22b7355
chore(i18n): Change group folder to team folder
rakekniven Apr 19, 2026
7f62257
chore(i18n): Change group folder to team folder
rakekniven Apr 19, 2026
115a68c
chore(i18n): Change group folder to team folder
rakekniven Apr 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/gui/tray/TrayFoldersMenuButton.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ HeaderButton {
id: tooltip
popupType: Qt.platform.os === "windows" ? Popup.Item : Popup.Native
visible: root.hovered && !foldersMenuLoader.isMenuVisible
text: root.userHasGroupFolders ? qsTr("Open local or group folders") : qsTr("Open local folder")
text: root.userHasGroupFolders ? qsTr("Open local or team folders") : qsTr("Open local folder")
}


Expand Down Expand Up @@ -169,7 +169,7 @@ HeaderButton {
property bool isGroupFolder: model.modelData.isGroupFolder

text: model.modelData.name
toolTipText: !isGroupFolder ? qsTr("Open local folder \"%1\"").arg(model.modelData.fullPath) : qsTr("Open group folder \"%1\"").arg(model.modelData.fullPath)
toolTipText: !isGroupFolder ? qsTr("Open local folder \"%1\"").arg(model.modelData.fullPath) : qsTr("Open team folder \"%1\"").arg(model.modelData.fullPath)
subline: model.modelData.parentPath
width: foldersMenuListView.width
height: Style.standardPrimaryButtonHeight
Expand Down
2 changes: 1 addition & 1 deletion src/gui/tray/TrayWindowHeader.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Rectangle {
onFolderEntryTriggered: isGroupFolder ? UserModel.openCurrentAccountFolderFromTrayInfo(fullFolderPath) : UserModel.openCurrentAccountLocalFolder()

Accessible.role: Accessible.Graphic
Accessible.name: qsTr("Open local or group folders")
Accessible.name: qsTr("Open local or team folders")
Accessible.onPressAction: openLocalFolderButton.userHasGroupFolders ? openLocalFolderButton.toggleMenuOpen() : UserModel.openCurrentAccountLocalFolder()
}

Expand Down
6 changes: 3 additions & 3 deletions src/gui/tray/usermodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1241,7 +1241,7 @@ void User::slotGroupFoldersFetched(QNetworkReply *reply)
{
Q_ASSERT(reply);
if (!reply) {
qCWarning(lcActivity) << "Group folders fetch error";
qCWarning(lcActivity) << "Team folders fetch error";
return;
}

Expand All @@ -1254,15 +1254,15 @@ void User::slotGroupFoldersFetched(QNetworkReply *reply)
if (oldSize != _trayFolderInfos.size()) {
emit groupFoldersChanged();
}
qCWarning(lcActivity) << "Group folders fetch error" << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() << replyData;
qCWarning(lcActivity) << "Team folders fetch error" << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() << replyData;
return;
}

QJsonParseError jsonParseError{};
const auto json = QJsonDocument::fromJson(replyData, &jsonParseError);

if (jsonParseError.error != QJsonParseError::NoError) {
qCWarning(lcActivity) << "Group folders JSON parse error" << jsonParseError.error << jsonParseError.errorString();
qCWarning(lcActivity) << "Team folders JSON parse error" << jsonParseError.error << jsonParseError.errorString();
if (oldSize != _trayFolderInfos.size()) {
emit groupFoldersChanged();
}
Expand Down
Loading