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

Fix some licensing unclarities #48

Merged
merged 1 commit into from Nov 24, 2021
Merged

Conversation

Wuzzy2
Copy link
Contributor

@Wuzzy2 Wuzzy2 commented Nov 24, 2021

This PR fixes some of the complaints from #46.

Changes:

  • Fix file name mention of opensfx.sfo (should be opensfx.psfo)
  • Fix missing "Unported" in opensfx.psfo (I checked this, it really is Unported)
  • Explain that the individual sound licenses are optional, i.e. that you can choose whether to use the overall OpenSFX sound license or the license of the sound in the list

@Wuzzy2 Wuzzy2 mentioned this pull request Nov 24, 2021
@Wuzzy2
Copy link
Contributor Author

Wuzzy2 commented Nov 24, 2021

@matthijskooijman: Please review this PR and tell me what I did wrong. Thanks. :D

docs/readme.ptxt Outdated Show resolved Hide resolved
@Wuzzy2
Copy link
Contributor Author

Wuzzy2 commented Nov 24, 2021

I found the typo on my own, haha. I was being too hasty …

@matthijskooijman
Copy link
Contributor

Other than the typo, I think this PR is perfect :-)

@LordAro
Copy link
Member

LordAro commented Nov 24, 2021

[CATCODEC] opensfx.cat
An error occured: Name is too long in src/opensfx.sfo at ["Toyland: Toy factory (1)". Original "ae_51_m.wav" by "Sedi", "vial-glass-square-cinnamon-sticks-open-02.wav" by Jan Schupke aka "Vehicle" and "whoosh06.wav" by Richard Frohlich aka "FreqMan". Edited by "Wuzzy". License: Creative Commons Attribution 3.0 Unported.]

Think I know why "Unported" wasn't added originally :) Needs shortening... somehow.

Also commit message should be in the usual style - Fix: ...

@matthijskooijman
Copy link
Contributor

Maybe use the customary shortenings for the licenses? CC-BY-SA-3.0 Unported? Or maybe remove unported everywhere, since that seems to be sortof implied?

@Wuzzy2
Copy link
Contributor Author

Wuzzy2 commented Nov 24, 2021

I shortened the offending line, I hope this is OK. Please check.

Copy link
Contributor

@matthijskooijman matthijskooijman left a comment

Choose a reason for hiding this comment

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

LGTM.

Copy link
Member

@LordAro LordAro left a comment

Choose a reason for hiding this comment

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

CI is happy, so it must be fine, right?

@LordAro LordAro merged commit 0326abf into OpenTTD:master Nov 24, 2021
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.

None yet

3 participants