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

CC-BY licenses - add optional tags where missing #2601

Merged
merged 16 commits into from
Nov 11, 2024
Merged

CC-BY licenses - add optional tags where missing #2601

merged 16 commits into from
Nov 11, 2024

Conversation

jlovejoy
Copy link
Member

@jlovejoy jlovejoy commented Nov 3, 2024

fixes #1548

Signed-off-by: Jilayne Lovejoy

@jlovejoy jlovejoy added the XML markup change potential change or addition to XML markup in license label Nov 3, 2024
@jlovejoy jlovejoy added this to the 3.26.0 milestone Nov 3, 2024
@jlovejoy jlovejoy changed the title CC licenses - add optional tags where missing CC-BY licenses - add optional tags where missing Nov 3, 2024
@jlovejoy jlovejoy self-assigned this Nov 3, 2024
@jlovejoy
Copy link
Member Author

jlovejoy commented Nov 3, 2024

This should include updates to all CC-BY and CC-BY-SA variants except the Japanese language one, as I wasn't confident of placement

Copy link
Collaborator

@xsuchy xsuchy left a comment

Choose a reason for hiding this comment

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

+1

@xsuchy
Copy link
Collaborator

xsuchy commented Nov 5, 2024

But tests are failing:

 The following warning(s) were identified:
	Test for license CC-BY-SA-3.0-AT failed: Test for license ID CC-BY-SA-3.0-AT failed due to difference found Normal text of license does not match starting at line #5 column #4 "gegenstand" when comparing to template text " >

DER GEGENSTAND DIESER LIZENZ (WIE UNTER „SCHUTZGEGENSTAND" DEFINIERT) WIRD UNTER DEN BEDINGUNGEN...".  Last optional text was not found due to the optional difference: 
	Normal text of license does not match starting at line #1 column #9 "commons" when comparing to template text "Namensnennung - Weitergabe unter gleichen Bedingungen 3.0 Österreich"

@swinslow
Copy link
Member

Tests are failing due to accidental extra > in CC-BY-SA-3.0-AT:

</optional>>

I'll submit a fix to address this.

@swinslow
Copy link
Member

Should be fixed in bc28bf0; I'll merge after tests pass.

@swinslow swinslow merged commit 91d178a into main Nov 11, 2024
5 checks passed
@swinslow swinslow deleted the CC-optional branch November 11, 2024 16:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
XML markup change potential change or addition to XML markup in license
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Clean up optional parts for CC licenses
3 participants