Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

Add license explanation to close button label #1398

Merged
merged 2 commits into from
May 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/components/VFilters/VFilterChecklist.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<template #default="{ close }">
<div class="relative">
<VIconButton
:aria-label="$t('modal.close')"
:aria-label="getLicenseExplanationCloseAria(item.code)"
class="absolute top-0 end-0 border-none text-dark-charcoal-70"
size="small"
:icon-props="{ iconPath: icons.closeSmall }"
Expand All @@ -57,6 +57,7 @@

<script>
import { useSearchStore } from '~/stores/search'
import { getElements } from '~/utils/license'

import VLicenseExplanation from '~/components/VFilters/VLicenseExplanation.vue'
import VCheckbox from '~/components/VCheckbox/VCheckbox.vue'
Expand Down Expand Up @@ -116,6 +117,16 @@ export default {
this.disabled
)
},
getLicenseExplanationCloseAria(license) {
const elements = getElements(license).filter((icon) => icon !== 'cc')
const descriptions = elements
.map((element) => this.$t(`browse-page.license-description.${element}`))
.join(' ')
const close = this.$t('modal.close-named', {
name: this.$t('browse-page.aria.license-explanation'),
})
return `${descriptions} - ${close}`
},
},
}
</script>
3 changes: 2 additions & 1 deletion src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,8 @@
},
"interpunct": "•",
"modal": {
"close": "Close"
"close": "Close",
"close-named": "Close {name}"
},
"error-images": {
"depressed-musician": "A depressed pianist rests their head in their hands.",
Expand Down
10 changes: 8 additions & 2 deletions src/locales/po-files/openverse.pot
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Openverse \n"
"Report-Msgid-Bugs-To: https://github.com/wordpress/openverse/issues \n"
"POT-Creation-Date: 2022-05-09T13:20:52+00:00\n"
"POT-Creation-Date: 2022-05-10T15:31:18+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down Expand Up @@ -141,6 +141,12 @@ msgctxt "modal.close"
msgid "Close"
msgstr ""

#. Do not translate words between ### ###.
#: src/components/VFilters/VFilterChecklist.vue:125
msgctxt "modal.close-named"
msgid "Close ###name###"
msgstr ""

#: src/components/VAudioTrack/layouts/VFullLayout.vue:63
msgctxt "download-button.download"
msgid "Download"
Expand Down Expand Up @@ -920,7 +926,7 @@ msgctxt "filters.license-explanation.more.read-more"
msgid "Read more"
msgstr ""

#: src/components/VFilters/VFilterChecklist.vue:97
#: src/components/VFilters/VFilterChecklist.vue:98
msgctxt "filters.search-by.title"
msgid "Search By"
msgstr ""
Expand Down