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.

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

Jump to bottom

Install Qt Translation on MacOS #11134

Merged
merged 3 commits into from
Jan 17, 2023
Merged

Install Qt Translation on MacOS #11134

merged 3 commits into from
Jan 17, 2023

Conversation

daschuer
Copy link
Member

Fixes #11110

@daschuer daschuer added the changelog This PR should be included in the changelog label Dec 19, 2022
@github-actions github-actions bot added the build label Dec 19, 2022
@daschuer daschuer added this to the 2.3.4 milestone Dec 19, 2022
@Swiftb0y
Copy link
Member

Semantically, the change is a noop? Did you forget to change the above if(WIN32) to include macos?
https://github.com/mixxxdj/mixxx/pull/11134/files#diff-1e7de1ae2d059d21e1dd75d5812d5a34b0222cef273b7c3a2af62eb747f9d20aR1485-R1489

@daschuer daschuer marked this pull request as draft December 19, 2022 17:12
@daschuer
Copy link
Member Author

My first commit enters a recursive loop with CPack. I have not yet an idea why. After reverting it seems to work again. Strange.

@daschuer daschuer force-pushed the gh11110 branch 2 times, most recently from a120202 to 69ba6bf Compare December 20, 2022 07:48
@daschuer daschuer marked this pull request as ready for review December 20, 2022 20:50
@daschuer
Copy link
Member Author

This is ready now.

@daschuer
Copy link
Member Author

Who can give this a try on MacOS?
You should find
Something like

Debug [Main]: Loaded "qt" translations for locale "de_DE" from "/home/daniel/workspace/2.3/res/translations/"

in your mixxx.log and not a warning.

Warning [Main]: Failed to load "qt" translations

@foss-
Copy link
Contributor

foss- commented Jan 16, 2023

2.3.3-120-g6afa8d6c67 (HEAD)

Debug [Main]: Loading resources from  "/Applications/mixxx.app/Contents/Resources/"
Debug [Main]: Found and will use default keyboard preset "/Applications/mixxx.app/Contents/Resources/keyboard/de_DE.kbd.cfg"
Debug [Main]: Loading resources from  "/Applications/mixxx.app/Contents/Resources/"
Debug [Main]: Failed to load "qt" translations for locale "de_DE" from "/Users/mixxx/bs-2.3-mac/amd64/environment/2.3-j00026-0b1209e3-osx10.12-x86_64-release/Qt-5.12.3/translations"
Debug [Main]: Loaded "qt" translations for locale "de_DE" from "/Applications/mixxx.app/Contents/Resources/translations/"
Debug [Main]: Loaded "mixxx" translations for locale "de_DE" from "/Applications/mixxx.app/Contents/Resources/translations/"
Debug [Main]: Loading resources from  "/Applications/mixxx.app/Contents/Resources/"

@daschuer
Copy link
Member Author

Ah, thank you for testing. I will remove the misleading debug message as well.

@daschuer
Copy link
Member Author

Please try again. Thank you.

@foss-
Copy link
Contributor

foss- commented Jan 16, 2023 

Debug [Main]: Loading resources from  "/Applications/mixxx.app/Contents/Resources/"
Debug [Main]: Found and will use default keyboard preset "/Applications/mixxx.app/Contents/Resources/keyboard/de_DE.kbd.cfg"
Debug [Main]: Loading resources from  "/Applications/mixxx.app/Contents/Resources/"
Debug [Main]: Loaded "qt" translations for locale "de_DE" from "/Applications/mixxx.app/Contents/Resources/translations/"
Debug [Main]: Loaded "mixxx" translations for locale "de_DE" from "/Applications/mixxx.app/Contents/Resources/translations/"
Debug [Main]: Loading resources from  "/Applications/mixxx.app/Contents/Resources/"

Looking good.

@daschuer
Copy link
Member Author

Thank you.

@ronso0 can you have a final look and merge this? Thank you.

@ronso0
Copy link
Member

ronso0 commented Jan 16, 2023

I assume you intended to ping @Swiftb0y, since I still have no clue of the implications here.

Swiftb0y
Swiftb0y approved these changes Jan 17, 2023
View reviewed changes
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.

Code looks good. I trust the testing from @foss-

@Swiftb0y Swiftb0y merged commit 5a3e9b8 into mixxxdj:2.3 Jan 17, 2023
@daschuer
Copy link
Member Author

Thank you.

@daschuer daschuer deleted the gh11110 branch May 4, 2023 11:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Swiftb0y Swiftb0y Swiftb0y approved these changes

Assignees
No one assigned
Labels
build changelog This PR should be included in the changelog
Projects
None yet
Milestone
2.3.4
Development

Successfully merging this pull request may close these issues.
4 participants
@daschuer @Swiftb0y @foss- @ronso0