Merge branch 'main' into feature/dockerize-chooser

creativecommons · Apr 2, 2024 · 0218255 · 0218255
2 parents 4bc5152 + 5359920
commit 0218255
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 54 deletions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/README.md b/README.md
@@ -22,7 +22,20 @@ This site is built using [Vue.js](https://vuejs.org/) (and vue-cli).
 
 Tasks, issues, and discussion related to the release of the new chooser are tracked with the [`Launch Milestone`](https://github.com/creativecommons/chooser/milestone/1).
 
-# Getting Started
+## Code of conduct
+
+[`CODE_OF_CONDUCT.md`][org-coc]:
+> The Creative Commons team is committed to fostering a welcoming community.
+> This project and all other Creative Commons open source projects are governed
+> by our [Code of Conduct][code_of_conduct]. Please report unacceptable
+> behavior to [conduct@creativecommons.org](mailto:conduct@creativecommons.org)
+> per our [reporting guidelines][reporting_guide].
+
+[org-coc]: https://github.com/creativecommons/.github/blob/main/CODE_OF_CONDUCT.md
+[code_of_conduct]: https://opensource.creativecommons.org/community/code-of-conduct/
+[reporting_guide]: https://opensource.creativecommons.org/community/code-of-conduct/enforcement/
+
+## Getting Started
 
 ## Using Docker
 
@@ -115,6 +128,10 @@ If it says "No results matched your search", then there are no issues currently
 
 *If no progress has been made on an issue for seven days after assignment, the assignment will be removed to allow others to contribute.*
 
+See [`CONTRIBUTING.md`][org-contrib].
+
+[org-contrib]: https://github.com/creativecommons/.github/blob/main/CONTRIBUTING.md
+
 ## Running Tests
 
 You can run tests by executing:

diff --git a/src/utils/licenses.js b/src/utils/licenses.js
@@ -25,7 +25,7 @@ export const LICENSES = {
       NC: false,
       ND: false,
     },
-    FULL: 'Attribution 4.0 International',
+    FULL: 'Creative Commons Attribution 4.0 International',
     SHORT: 'CC BY 4.0',
     SLUG: 'cc-by',
     URL: 'http://creativecommons.org/licenses/by/4.0/',
@@ -38,7 +38,7 @@ export const LICENSES = {
       NC: false,
       ND: false,
     },
-    FULL: 'Attribution-ShareAlike 4.0 International',
+    FULL: 'Creative Commons Attribution-ShareAlike 4.0 International',
     SHORT: 'CC BY-SA 4.0',
     SLUG: 'cc-by-sa',
     URL: 'http://creativecommons.org/licenses/by-sa/4.0/',
@@ -51,7 +51,7 @@ export const LICENSES = {
       NC: true,
       ND: false,
     },
-    FULL: 'Attribution-NonCommercial 4.0 International',
+    FULL: 'Creative Commons Attribution-NonCommercial 4.0 International',
     SHORT: 'CC BY-NC 4.0',
     SLUG: 'cc-by-nc',
     URL: 'http://creativecommons.org/licenses/by-nc/4.0/',
@@ -64,7 +64,7 @@ export const LICENSES = {
       NC: true,
       ND: false,
     },
-    FULL: 'Attribution-NonCommercial-ShareAlike 4.0 International',
+    FULL: 'Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International',
     SHORT: 'CC BY-NC-SA 4.0',
     SLUG: 'cc-by-nc-sa',
     URL: 'http://creativecommons.org/licenses/by-nc-sa/4.0/',
@@ -77,7 +77,7 @@ export const LICENSES = {
       NC: true,
       ND: true,
     },
-    FULL: 'Attribution-NonCommercial-NoDerivatives 4.0 International',
+    FULL: 'Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International',
     SHORT: 'CC BY-NC-ND 4.0',
     SLUG: 'cc-by-nc-nd',
     URL: 'http://creativecommons.org/licenses/by-nc-nd/4.0/',
@@ -90,7 +90,7 @@ export const LICENSES = {
       NC: false,
       ND: true,
     },
-    FULL: 'Attribution-NoDerivatives 4.0 International',
+    FULL: 'Creative Commons Attribution-NoDerivatives 4.0 International',
     SHORT: 'CC BY-ND 4.0',
     SLUG: 'cc-by-nd',
     URL: 'http://creativecommons.org/licenses/by-nd/4.0/',