Skip to content

Conversation

@Aspie96
Copy link
Contributor

@Aspie96 Aspie96 commented Nov 30, 2020

Fixes

Fixes #207 by @panchovm

Description

This issue fixes the attribution for CC0 correcting it from "is licensed under" to "is marked with".

Technical details

Patch #221 was accepted for the same issue, but what it does is actually incorrect, as is the explaination in #207 (comment).

That patch does not actually change the attribution generated for any license nor for CC0. What it does is changing the attribution in the footer (which is of a CC BY 4.0 work) from "licensed under a" to "marked with a", which makes little sense since CC BY is a license.

I fixed it back to "licensed", however writing "licensed under the" instead of "licensed under a". The reasoning is that, while the first is actually common, there is only one CC BY International 4.0 license, so I think "the" makes more sense. Either way "marked as" should never have been in the footer, since that was for the generated attribution for CC0 works.

Tests

Testing this PR is quite easy.

I generated a few examples of attributions, both for CC0 and for licenses, and it seems to work, both for the preview and the generated HTML.

Checklist

  • My pull request has a descriptive title (not a vague title like Update index.md).
  • My pull request targets the default branch of the repository (main or master).
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no
    visible errors.

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@Aspie96 Aspie96 requested a review from a team as a code owner November 30, 2020 22:01
@Aspie96 Aspie96 requested review from obulat and removed request for a team November 30, 2020 22:01
Commit 6d466d2 does not actually fix the issue. Instead, it changes the
attribution in the footer, which is of a work under CC BY 4.0 (for which
"licensed under" is perfectly ok).

Revert commit 6d466d2, but use "licensed under the" instead of "licensed
under a".

Actually fix generated CC0 attribution using "marked as" instead of
"licensed under".
Copy link
Contributor

@obulat obulat left a comment

Choose a reason for hiding this comment

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

Sorry for late review, I've been working on the second version changes to the Chooser. Thank you for working on this and your attention to details, @Aspie96 !
I refactored some of the files, and it's been a little tricky integrating your changes: I've merged the master branch into your branch, and added a small change to the Recommended license card.

@obulat obulat merged commit fb8e447 into creativecommons:master Dec 5, 2020
@Aspie96 Aspie96 deleted the fix-207 branch December 5, 2020 12:38
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.

Correct the attribution information for the CC0 license

2 participants