Fix locale and license text generation regressions

Author: obulat

src/components/CopyTools.vue

@@ -5,8 +5,8 @@
             @change-copy-type="changeCopyType"
         />
         <v-button
-            class="donate small copy-button"
             v-if="clipboardTarget!=='.xmp'"
+            class="donate small copy-button"
             :data-clipboard-target="clipboardTarget"
             @click="handleCopy"
         >
@@ -104,7 +104,6 @@ export default {
     padding: 0 1.5rem 1.5rem;
 }
 .button.donate.small {
-    width: 5rem;
     justify-content: center;
     &.is-xmp {
         width: fit-content;

src/components/LicenseText.vue

@@ -16,15 +16,15 @@
         </template>
         <template #creator>
             <component
-                :is="creatorName && creatorProfileUrl && isWeb ? 'a' : 'span'"
+                :is="isCreatorLink ? 'a' : 'span'"
                 v-if="creatorName"
                 v-bind="creatorProps"
             >
                 {{ creatorName }}
             </component>
         </template>
         <template #by>
-            {{ $t(byString) }}
+            {{ byString }}
         </template>
         <template #licenseMark>
             <span>{{ $t(licensedMarkedString) }}</span>
@@ -45,7 +45,7 @@
             <span v-else>{{ licenseName }}.</span>
         </template>
         <template #print-instructions>
-            <span v-if="!isWeb">{{ $t('license-use.print.text', {linkToLicenseDeed: licenseUrl('print')}) }}</span>
+            <span v-if="!isWeb">{{ $t('license-use.print.text', { linkToLicenseDeed: licenseUrl('print') }) }}</span>
         </template>
     </i18n>
 </template>
@@ -66,9 +66,6 @@ export default {
             validate: function(val) {
                 return ['web', 'print'].indexOf(val) > -1
             }
-        },
-        ltid: {
-            type: String
         }
     },
     computed: {
@@ -77,15 +74,18 @@ export default {
         licensedMarkedString() {
             return this.shortName === 'CC0 1.0' ? 'license-use.richtext.marked-text' : 'license-use.richtext.licensed-text'
         },
+        isCreatorLink() {
+            return this.creatorName && this.creatorProfileUrl && this.isWeb
+        },
         licenseName() {
             return this.attributionType === 'short' ? this.shortName : this.fullName
         },
         byString() {
-            return this.creatorName ? 'license-use.richtext.by' : ''
+            return this.creatorName ? this.$t('license-use.richtext.by') : ''
         },
         creatorProps() {
             const creatorAttrs = { property: 'cc:attributionName' }
-            if (this.creatorName && this.creatorProfileUrl && this.isWeb) {
+            if (this.isCreatorLink) {
                 creatorAttrs.href = this.creatorProfileUrl
                 creatorAttrs.rel = 'cc:attributionURL'
             }

src/i18n.js

@@ -4,13 +4,13 @@ import VueI18n from 'vue-i18n'
 Vue.use(VueI18n)
 
 function loadLocaleMessages() {
-    const locales = require.context('./locales', true, /[A-Za-z0-9-_,\s]+\.js$/i)
+    const locales = require.context('./locales', true, /[A-Za-z0-9-_,\s]+\.json$/i)
     const messages = {}
     locales.keys().forEach(key => {
         const matched = key.match(/([A-Za-z0-9-_]+)\./i)
         if (matched && matched.length > 1) {
             const locale = matched[1]
-            messages[locale] = locales(key).messages
+            messages[locale] = locales(key)
         }
     })
     return messages

src/locales/en.js

@@ -107,24 +107,28 @@
         }
     },
     "license-use": {
-        "heading": "Use your license",
-        "common-instructions": "Choose what kind of work you are licensing to get appropriate license code.",
-        "web-instructions": "If you are licensing one work, paste the code next to it. If you are licensing the whole page or blog, you can paste the license code at the bottom of the page.",
+        "heading": "Mark your work",
+        "common-instructions": "Choose what kind of work to get appropriate license code or public domain marking.",
+        "web-instructions": "If you are licensing or marking one work, paste the code next to it. If you are licensing the whole page or blog, you can paste the license code at the bottom of the page.",
         "web-tab-heading": "Website",
         "print-media-tab-heading": "Print Work or Media",
         "print-media-instructions": "Copy the text below and paste it on the title and/or copyright page of your print work or presentation, or in the credits of your media.",
         "rich-text-label": "Rich Text",
         "html-label": "HTML",
         "plain-text-label": "Plain Text",
+        "xmp-label": "Download meta data XMP",
         "copy-label": "Copy",
         "copied-label": "Copied!",
         "richtext": {
-            "full-text": "{workTitle} {byCreator} {licenseMark} {license}",
+            "full-text": "{workTitle} {by} {creator}{licenseMark} {license}{print-instructions}",
             "workTitle": "This work",
             "by": "by",
             "licensed-text": "is licensed under",
             "marked-text": "is marked with",
             "print-instructions": ". To view a copy of this license, visit {linkToLicenseDeed}"
+        },
+        "print": {
+            "text": " To view a copy of this license, visit {linkToLicenseDeed}"
         }
     },
     "help": {