Skip to content
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.

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

UI: Improves texts displayed to the user when picking the wrong location for syncing #7596

Open
wants to merge 7 commits into
base: master
Choose a base branch
from

Conversation

camilasan
Copy link
Member

@camilasan camilasan commented Dec 2, 2024

⚠️ It depends on #7636 ⚠️

Improves texts displayed to the user when picking the wrong location for syncing:

  • User has no permissions to write to local folder:

noperms

  • The sync folder in the network:

network-location

  • Local folder does not exist:

doesnotexist

  • Trying to sync to the same folder locally:

double-sync

  • Folder contained in sync folder:

contained

  • Network drive/root:

drive2

  • Folder is already syncing to:

already-synced2

  • Root folder is already syncing:

root-synced

src/common/vfs.cpp Outdated Show resolved Hide resolved
@camilasan camilasan marked this pull request as ready for review December 4, 2024 21:42
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-7596-f57f894fee3403f640a494ea57c6ddb3cd339d8c-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@camilasan camilasan self-assigned this Dec 9, 2024
@camilasan camilasan added this to the 3.16.0 milestone Dec 10, 2024
@camilasan camilasan changed the title Bugfix network sync folder detection Improves texts displayed to the user when picking the wrong location for syncing Dec 11, 2024
@camilasan camilasan changed the title Improves texts displayed to the user when picking the wrong location for syncing UI: Improves texts displayed to the user when picking the wrong location for syncing Dec 11, 2024
Signed-off-by: Camila Ayres <[email protected]>
Copy link

Artifact containing the AppImage: nextcloud-appimage-pr-7596.zip

SHA256 checksum: 8bd30353c907b2e36c3acc1e6e7de411b387eaeac5abafe25fc53cfcbffe07a7

To test this change/fix you can download the above artifact file, unzip it, and run it.

Please make sure to quit your existing Nextcloud app and backup your data.

Copy link
Member

@nilsding nilsding left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just two nits

return tr("The Virtual filesystem feature requires a NTFS file system, %1 is using %2").arg(path, fs);
if (const auto fileSystemForPath = FileSystem::fileSystemForPath(info.absoluteFilePath());
fileSystemForPath != QLatin1String("NTFS")) {
return tr("Please choose a different location. %1 isn't a NTFS files system. It doesn't support virtual files.").arg(path);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small typo:

Suggested change
return tr("Please choose a different location. %1 isn't a NTFS files system. It doesn't support virtual files.").arg(path);
return tr("Please choose a different location. %1 isn't a NTFS file system. It doesn't support virtual files.").arg(path);

@@ -63,9 +63,9 @@ QString FormatWarningsWizardPage::formatWarnings(const QStringList &warnings) co
{
QString ret;
if (warnings.count() == 1) {
ret = tr("<b>Warning:</b> %1").arg(warnings.first());
ret = tr("%1").arg(warnings.first());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is no need for this tr("%1"), just warnings.first() will do fine here

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants