Skip to content

Import legacy license data #14

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

Merged
merged 1,463 commits into from
Apr 19, 2021
Merged

Import legacy license data #14

merged 1,463 commits into from
Apr 19, 2021

Conversation

TimidRobot
Copy link
Member

@TimidRobot TimidRobot commented Apr 9, 2021

Fixes

Fixes #11

Description

Technical details

  1. Install git-filter-repo
    1. brew install git-filter-repo
  2. Assuming a directory containing git repositories
    1. cd ~/CreativeCommons/git
  3. Prepare legalcode source
    1. git clone https://github.com/creativecommons/creativecommons.org.git src-legalcode
    2. cd src-legalcode
    3. git filter-repo --path-glob 'docroot/legalcode/[bdnsz]*.*' --path-rename docroot/legalcode:legacy/legalcode
       Parsed 5109 commits
       New history written in 1.80 seconds; now repacking/cleaning...
       Repacking your repo and cleaning out old unneeded objects
       HEAD is now at 82938c83 Merge pull request #1158 from creativecommons/by-sa-4-0-pt-errata-link
       Enumerating objects: 15812, done.
       Counting objects: 100% (15812/15812), done.
       Delta compression using up to 16 threads
       Compressing objects: 100% (1557/1557), done.
       Writing objects: 100% (15812/15812), done.
       Total 15812 (delta 11789), reused 15807 (delta 11784), pack-reused 0
       Completely finished after 3.34 seconds.
      
      • excludes:
        • GPL_2.0.html (CC used to serve information about this license, but now redirects)
        • GPL_2.0_pt.html (CC used to serve information about this license, but now redirects)
        • LGPL_2.1.html (CC used to serve information about this license, but now redirects)
        • LGPL_2.1_pt.html (CC used to serve information about this license, but now redirects)
        • r (old command log)
    4. git for-each-ref --format '%(refname:short)' refs/heads | grep -v master | xargs git branch -D
    5. cd ..
  4. Prepare RDF source
    1. git clone https://github.com/creativecommons/cc.licenserdf.git src-rdf
    2. cd src-rdf
    3. git filter-repo --path-glob 'cc/licenserdf/licenses/*.rdf' --path-rename cc/licenserdf/licenses:legacy/rdf-licenses --path cc/licenserdf/rdf --path-rename cc/licenserdf/rdf:legacy/rdf-meta
       Parsed 852 commits
       New history written in 2.50 seconds; now repacking/cleaning...
       Repacking your repo and cleaning out old unneeded objects
       HEAD is now at 072756c3cc Merge pull request #16 from creativecommons/remove-sa-2-0-jp-source
       Enumerating objects: 12057, done.
       Counting objects: 100% (12057/12057), done.
       Delta compression using up to 16 threads
       Compressing objects: 100% (440/440), done.
       Writing objects: 100% (12057/12057), done.
       Total 12057 (delta 11382), reused 12053 (delta 11380), pack-reused 0
       Completely finished after 3.25 seconds.
      
    4. git for-each-ref --format '%(refname:short)' refs/heads | grep -v master | xargs git branch -D
    5. cd ..
  5. Prepare to merge legacy data
    1. cd cc-licenses-data
    2. git checkout -b legacy
  6. Merge legacy legalcode
    1. git remote add src-legalcode ../src-legalcode/
    2. git fetch src-legalcode
    3. git merge -m'Merge filtered remote-tracking branch creativecommons.org/master into legacy' --allow-unrelated-histories src-legalcode/master
    4. git remote rm src-legalcode
  7. Merge legacy RDF
    1. git remote add src-rdf ../src-rdf/
    2. git fetch src-rdf
    3. git merge -m'Merge filtered remote-tracking branch cc.licenserdf/master into legacy' --allow-unrelated-histories src-rdf/master
    4. git remote rm src-rdf
  8. Verify status
    1. git remote -v
    2. git diff --name-status main...HEAD | less
  9. Push branch used by this pull request
    1. git push
  10. Clean-up
  11. cd ..
  12. rm -rf src-legalcode src-rdf

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.

Alden S Page and others added 30 commits June 5, 2019 12:19
Take George's version of ES translations instead of the master branch.
- command: `dos2unix --keep-bom *`
- verified with:
  - spot check of `git diff`
  - that `git diff -w` was empty
- command: `gsed -e's/\t/    /g' -e's/ \+$//' -i *`
  - (gsed is GNU Sed on macOS via Homebrew)
- verified with:
  - spot check of `git diff`
  - that `git diff -w` was empty
HTML comments within 4.0 and cc0 English licenses
Rebuilt all the Czech 4.0 translations based on the new templates
Corrected link to deed in the footer
Rebuilt all 6 files based on the new template
Corrected link to deed in footer
Rebuilt the 6 files based on the new templates
Corrected misspelling in CC domain name
- Checked if the following translations use slash:
-- Copyright and Similar Rights is translated into「著作權及相似權利」 / 「版權及相似權利」
-- Moral rights is translated into 著作人格權 / 精神權利
-- Attribution is translated into 姓名標示 / 署名

- Checked if 提供更多語言的版本 is the correct translation for "Additional languages available" in all 6 files.

- Linked 返回授權標章 (which is the translation for "Back to Commons Deed") at the very end of the page to https://creativecommons.org/licenses/......./4.0/deed.zh_TW instead of https://creativecommons.org/licenses/...../4.0/legalcode.zh-Hant in all 6 files.
- Estonian shouldn't be there, it's not yet translated, I removed it.

- Until CC0 is translated, I removed the link to it in all 6 files, so now the link goes to the English version.

- I corrected the formatting of BY-ND.
Reformatted all files based on the new templates
Corrected the formatting
Added English in the list of languages in the footer
- add hrvatski language footer entry to all non-hrvatski cc0 tranlsations
- hrvatski translation
  - normalize translation FAQ URL
  - normalize languages anchor to use id instead of name
  - update language footer
samplingplus_1.0.br.html is a duplicate with a bad filename:

9d702da3695ccd09b5b8cfa016189470  samplingplus_1.0.br.html
9d702da3695ccd09b5b8cfa016189470  samplingplus_1.0_br.html
remove duplicate file with wrong filename
Publish corrected German 4.0 translation
Correct Portuguese BY-SA definitions formatting
Correct CC BY* 3.0 South Africa ports RDFs to use appropriate country code
CC 4.0 German translations - add errata text with link
CC BY-SA 4.0 Portuguese translation - add errata text with link
remove invalid dc:source value for CC SA 2.0 JP
@TimidRobot TimidRobot requested review from annatuma and a team April 9, 2021 19:11
@TimidRobot TimidRobot self-assigned this Apr 9, 2021
@TimidRobot TimidRobot requested a review from sarahpearson April 9, 2021 19:14
Copy link
Member

@kgodey kgodey left a comment

Choose a reason for hiding this comment

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

I'm glad to see all this work on the new license infrastructure. :)

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.

Add legacy data: legalcode, plaintext, RDF
5 participants