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

WTrackmenu: use moveToTrash() with Qt >= 5.15 #11842

Merged
merged 1 commit into from Aug 28, 2023

Conversation

ronso0
Copy link
Member

@ronso0 ronso0 commented Aug 20, 2023

No description provided.

@github-actions github-actions bot added the ui label Aug 20, 2023
@ronso0 ronso0 added library gui and removed ui labels Aug 20, 2023
Copy link
Member

@Swiftb0y Swiftb0y left a comment

Choose a reason for hiding this comment

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

LGTM otherwise.

Comment on lines +2141 to 2144
tr("%1 track files were moved to trash and purged "
"from the Mixxx database.")
#else
tr("%1 track files were deleted from disk and purged "
Copy link
Member

Choose a reason for hiding this comment

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

shouldn't this also follow the dynamic plural forms?

Suggested change
tr("%1 track files were moved to trash and purged "
"from the Mixxx database.")
#else
tr("%1 track files were deleted from disk and purged "
tr("%n track file(s) were moved to trash and purged "
"from the Mixxx database.")
#else
tr("%n track file(s) were deleted from disk and purged "

Copy link
Member Author

Choose a reason for hiding this comment

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

I just didn't want to touch existing tr strings to not lose the translations short before the release. Considering we drop support for Ubuntu 20.04 and can also switch to Qt 5.15 on macOS for Mixxx 2.5, I think the tr inconsistencies are okay.

Copy link
Member

Choose a reason for hiding this comment

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

fair.

Copy link
Member

@Swiftb0y Swiftb0y left a comment

Choose a reason for hiding this comment

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

LGTM

@Swiftb0y Swiftb0y merged commit 068633c into mixxxdj:2.4 Aug 28, 2023
13 checks passed
@Swiftb0y
Copy link
Member

Thank you

@ronso0
Copy link
Member Author

ronso0 commented Aug 28, 2023

Thanks for your review!

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

Successfully merging this pull request may close these issues.

None yet

2 participants