Add mode to license url generation to remove '?ref=ccchooser' from th…

…e link in print version

Signed-off-by: Olga Bulat <obulat@gmail.com>

src/components/LicenseCode.vue

@@ -18,7 +18,7 @@
                 {{$t(byString)}}
             </template>
             <template v-slot:licenseName>
-                <a v-if="isWeb" :href="licenseUrl" target="_blank" rel="license noopener noreferrer"
+                <a v-if="isWeb" :href="licenseUrl('web')" target="_blank" rel="license noopener noreferrer"
                    style="display: inline-block;">{{shortName}}</a>
                 <span v-else>{{shortName}}</span>
                 <LicenseIcons
@@ -28,7 +28,7 @@
             </template>
         </i18n>
         <i18n path="license-use.richtext.print-instructions" tag="span" v-if="!isWeb">
-            <template v-slot:linkToLicenseDeed>{{licenseUrl}}</template>
+            <template v-slot:linkToLicenseDeed>{{licenseUrl('print')}}</template>
         </i18n>
     </p>
 </template>

src/components/LicenseDetailsCard.vue

@@ -2,9 +2,9 @@
 <div class="selected-license-card">
     <h3 class="vocab ha h3a">{{$t('license-details-card.heading')}}</h3>
     <h4 class="vocab h4b hb">
-        <a :href="licenseUrl" class="license-name">{{fullName}} ({{shortName}})
+        <a :href="licenseUrl('web')" class="license-name">{{fullName}} ({{shortName}})
             <LicenseIcons
-                :url="licenseUrl"
+                :url="licenseUrl('web')"
                 :iconsArr="iconsList"/>
         </a>
     </h4>

src/store/index.js

@@ -30,8 +30,8 @@ export default new Vuex.Store({
         fullName: state => {
             return attrToFull(state.currentLicenseAttributes)
         },
-        licenseUrl: state => {
-            return licenseUrl(state.currentLicenseAttributes)
+        licenseUrl: state => (mode) => {
+            return licenseUrl(state.currentLicenseAttributes, mode)
         },
         iconsList: state => {
             return licenseIconsArr(state.currentLicenseAttributes)

src/utils/license-utilities.js

@@ -63,23 +63,17 @@ function attrToFull(attr) {
     base += ' 4.0 International'
     return base
 }
-// function licenseUrl(shortLicenseName) {
-//     Returns url to license from short license name with version number (eg. 'CC BY 4.0')
-//     TODO: check how it works: it doesn't use '-' to join elements ?
-//     if (shortLicenseName.includes('CC0')) {
-//         return 'https://creativecommons.org/publicdomain/zero/1.0/?ref=ccchooser'
-//     }
-//     const short = shortLicenseName.toLowerCase().slice(3, shortLicenseName.length - 4)
-//     return 'https://creativecommons.org/licenses/' + short + '/4.0/?ref=ccchooser'
-// }
-function licenseUrl(attr) {
+
+function licenseUrl(attr, mode) {
     // Returns url to license from short license name with version number (eg. 'CC BY 4.0')
+    // mode: web/ print (?ref=ccchooser is added to the end of the link if mode is web)
+    const linkRef = mode === 'web' ? '/?ref=ccchooser' : ''
     if (attr.BY === false) {
-        return 'https://creativecommons.org/publicdomain/zero/1.0/?ref=ccchooser'
+        return `https://creativecommons.org/publicdomain/zero/1.0${linkRef}`
     }
     let short = attrToShort(attr).toLowerCase().slice(3)
     short = short.slice(0, short.length - 4)
-    return 'https://creativecommons.org/licenses/' + short + '/4.0/?ref=ccchooser'
+    return `https://creativecommons.org/licenses/${short}/4.0${linkRef}`
 }
 
 function licenseSlug(shortLicenseName) {