Merge i18n for default description and fix keys

nuxt.config.js

@@ -20,12 +20,6 @@ export const env = {
  */
 const meta = [
   { charset: 'utf-8' },
-  {
-    hid: 'description',
-    name: 'description',
-    content:
-      'The search engine for openly-licensed content, including Creative Commons licensed images, audio, and more.',
-  },
   { name: 'viewport', content: 'width=device-width,initial-scale=1' },
   { name: 'twitter:card', content: 'summary_large_image' },
   { name: 'twitter:site', content: '@wordpress' },
@@ -35,12 +29,6 @@ const meta = [
     name: 'og:image',
     content: '/cclogo-shared-image.jpg',
   },
-  {
-    hid: 'og:description',
-    name: 'og:description',
-    content:
-      'The search engine for openly-licensed content, including Creative Commons licensed images, audio, and more.',
-  },
   {
     name: 'og:url',
     content: 'https://creativecommons.org',

src/layouts/embedded-with-nav-search.vue

@@ -11,7 +11,24 @@ const embeddedWithNavSearch = {
   name: 'embedded-with-nav-search',
   layout: 'embedded-with-nav-search',
   head() {
-    return this.$nuxtI18nHead({ addSeoAttributes: true })
+    const i18nHead = this.$nuxtI18nHead({ addSeoAttributes: true })
+    return {
+      htmlAttrs: { ...i18nHead.htmlAttrs },
+      link: [...i18nHead.link],
+      meta: [
+        {
+          hid: 'description',
+          name: 'description',
+          content: this.$t('seo.descriptions.default'),
+        },
+        {
+          hid: 'og:description',
+          name: 'og:description',
+          content: this.$t('seo.descriptions.default'),
+        },
+        ...i18nHead.meta,
+      ],
+    }
   },
 }
 export default embeddedWithNavSearch

src/layouts/embedded.vue

@@ -7,12 +7,29 @@
   </div>
 </template>
 <script>
-const defaultPage = {
-  name: 'default',
-  layout: 'default',
+const embedded = {
+  name: 'embedded',
+  layout: 'embedded',
   head() {
-    return this.$nuxtI18nHead({ addSeoAttributes: true })
+    const i18nHead = this.$nuxtI18nHead({ addSeoAttributes: true })
+    return {
+      htmlAttrs: { ...i18nHead.htmlAttrs },
+      link: [...i18nHead.link],
+      meta: [
+        {
+          hid: 'description',
+          name: 'description',
+          content: this.$t('seo.descriptions.default'),
+        },
+        {
+          hid: 'og:description',
+          name: 'og:description',
+          content: this.$t('seo.descriptions.default'),
+        },
+        ...i18nHead.meta,
+      ],
+    }
   },
 }
-export default defaultPage
+export default embedded
 </script>

src/locales/en.json

@@ -538,13 +538,14 @@
   },
   "seo": {
     "titles": {
+      "default": "Openverse: Openly-licensed Images, Audio, & other Content",
       "about": "About Openverse: The search engine for openly-licensed images, audio, and more",
       "extension": "Download the Openverse Browser Extension: search and use open-licensed and public domain images",
       "singlePhoto": "{title} by {creator} | Free Image on Openverse",
-      "search": "{media} results for \"{query}\" on Openverse",
-      "home": "Openverse: Openly-licensed Images, Audio, & More"
+      "search": "{media} results for \"{query}\" on Openverse"
     },
     "descriptions": {
+      "default": "The search engine for openly-licensed content, including Creative Commons licensed images, audio, and more.",
       "extension": "The Openverse browser extension allows users to search, bookmark, and cite Creative Commons licensed images."
     }
   }

src/pages/index.vue

@@ -11,7 +11,7 @@ const HomePage = {
   mixins: [iframeHeight],
   head() {
     return {
-      title: this.$t('seo.titles.home'),
+      title: this.$t('seo.titles.default'),
     }
   },
   layout({ store }) {