Fix attribution information for CC0 (#237)

* Fix attribution information for CC0

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".

* Add license details card heading change for cc0 (Recommended License -> Recommended)

Co-authored-by: Olga Bulat <obulat@gmail.com>

Author: Aspie96

src/components/FooterSection.vue

@@ -84,7 +84,7 @@
                                 target="_blank"
                                 rel="noopener"
                             >noted</a>,
-                            content on this site is marked with a
+                            content on this site is licensed under the
                             <a
                                 href="https://creativecommons.org/licenses/by/4.0/"
                                 target="_blank"

src/components/LicenseCode.vue

@@ -26,8 +26,8 @@
         <template #by>
             {{ $t(byString) }}
         </template>
-        <template #licensed-text>
-            <span>{{ $t('license-use.richtext.licensed-text') }}</span>
+        <template #licenseMark>
+            <span>{{ $t(licensedMarkedString) }}</span>
         </template>
         <template #license>
             <a
@@ -65,8 +65,8 @@ export default {
     computed: {
         ...mapGetters(['shortName', 'licenseUrl', 'iconsList']),
         ...mapState(['attributionDetails']),
-        byString() {
-            return this.creatorName ? 'license-use.richtext.by' : ''
+        licensedMarkedString() {
+            return this.shortName === 'CC0 1.0' ? 'license-use.richtext.marked-text' : 'license-use.richtext.licensed-text'
         },
         creatorProps() {
             const creatorAttrs = { property: 'cc:attributionName' }

src/components/LicenseCopy.vue

@@ -96,10 +96,9 @@ export default {
             const { work, creator, license, paragraph } = generateHTML(this.attributionDetails, this.shortName)
             const licenseCodeSpan = this.$i18n.t('license-use.richtext.full-text', {
                 workTitle: work || this.$i18n.t('license-use.richtext.workTitle'),
-                creator,
+                byCreator: creator ? this.$i18n.t('license-use.richtext.by') + ' ' + creator : '',
                 license,
-                by: creator ? this.$i18n.t('license-use.richtext.by') : '',
-                'licensed-text': this.$i18n.t('license-use.richtext.licensed-text')
+                licensedMarkedString: this.$i18n.t(this.shortName === 'CC0 1.0' ? 'license-use.richtext.marked-text' : 'license-use.richtext.licensed-text')
             })
             return `${paragraph}${licenseCodeSpan}</p>`
         },

src/components/LicenseDetailsCard.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="selected-license-card">
         <h3 class="vocab">
-            {{ $t('license-details-card.heading') }}
+            {{ headingText }}
         </h3>
         <h4 class="vocab b-header">
             <a
@@ -39,7 +39,7 @@
     </div>
 </template>
 <script>
-import { licenseSlug } from '../utils/license-utilities'
+import { LICENSES, licenseSlug } from '../utils/license-utilities'
 import LicenseIcons from './LicenseIcons'
 import { mapGetters } from 'vuex'
 
@@ -59,6 +59,11 @@ export default {
         },
         slug() {
             return licenseSlug(this.shortName)
+        },
+        headingText() {
+            return this.shortName === LICENSES.CC0.SHORT
+                ? this.$t('license-details-card.cc0-heading')
+                : this.$t('license-details-card.heading')
         }
     }
 }

src/locales/en.json

@@ -88,6 +88,7 @@
     },
     "license-details-card": {
         "heading": "RECOMMENDED LICENSE",
+        "cc0-heading": "RECOMMENDED",
         "full-description": {
             "cc0": "By marking your work with a CC0 public domain dedication, you are giving up your copyright and allowing reusers to distribute, remix, adapt, and build upon the material in any medium or format, even for commercial purposes.",
             "cc-by": "This license requires that reuses give credit to the creator. It allows reusers to distribute, remix, adapt, and build upon the material in any medium or format, even for commercial purposes.",
@@ -118,10 +119,11 @@
         "copy-label": "Copy",
         "copied-label": "Copied!",
         "richtext": {
-            "full-text": "{workTitle} {by} {creator}{licensed-text}{license}",
+            "full-text": "{workTitle} {byCreator} {licenseMark} {license}",
             "workTitle": "This work",
             "by": "by",
-            "licensed-text": " is licensed under ",
+            "licensed-text": "is licensed under",
+            "marked-text": "is marked with",
             "print-instructions": ". To view a copy of this license, visit {linkToLicenseDeed}"
         }
     },

src/locales/ru.json

@@ -118,11 +118,12 @@
         "copy-label": "Copy",
         "copied-label": "Copied!",
         "richtext": {
-            "full-text": "{workTitle} {by} {creator}{licensed-text}{licenseName}",
+            "full-text": "{workTitle} {byCreator} {licensedMarkedString} {license}",
             "workTitle": "This work",
             "by": "by",
-            "licensed-text": " is licensed under ",
-            "print-instructions": ". To view a copy of this license, visit {linkToLicenseDeed}."
+            "licensed-text": "is licensed under",
+            "marked-text": "is marked with",
+            "print-instructions": ". To view a copy of this license, visit {linkToLicenseDeed}"
         }
     },
     "help": {

tests/e2e/specs/LicenseCode.js

@@ -13,7 +13,7 @@ module.exports = {
             .assert.elementPresent('.next-button')
             .click('.next-button')
             .assert.elementPresent('p[class="license-text"]')
-    },
+    }
     // 'Check if the links in the license code redirects properly': function(browser) {
     //     browser
     //         .setValue('input[placeholder="Jane Doe"]', 'Jane Doe')