Skip to content

Normalize plural form and capitalization of Various Artists #3055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Normalize plural form and capitalization of Various Artists #3055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7c2b2a
Uniformize the plural mark to Various Artists
yvanzo Oct 19, 2023
047ba3f
Uniformize the capitalization of Various Artists
yvanzo Oct 19, 2023
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
14 changes: 7 additions & 7 deletions root/artist/ArtistIndex.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,14 @@ const FooterSwitch = ({
if (showVA) {
links.push(
<a href={`${artistLink}?va=1`} key="show-va">
{l('Show official various artist release groups')}
{l('Show official Various Artists release groups')}
</a>,
);
}
if (showAllVA) {
links.push(
<a href={`${artistLink}?all=1&va=1`} key="show-all-va">
{l('Show all various artist release groups')}
{l('Show all Various Artists release groups')}
</a>,
);
}
Expand Down Expand Up @@ -140,13 +140,13 @@ const FooterSwitch = ({
{(!hasDefault && !hasExtra && !hasVariousArtists) ? (
<p>
{l(`This artist only has unofficial release groups by
various artists.`)}
Various Artists.`)}
</p>
) : null}
<p>
{(hasVariousArtists || hasVariousArtistsExtra)
? l('Showing all release groups for various artists')
: l(`This artist does not have any various artists
? l('Showing all release groups for Various Artists')
: l(`This artist does not have any Various Artists
release groups`)}
{buildLinks(hasDefault, hasExtra, hasVariousArtists, false)}
</p>
Expand All @@ -155,11 +155,11 @@ const FooterSwitch = ({
<>
{(!hasDefault && !hasExtra) ? (
<p>
{l('This artist only has release groups by various artists.')}
{l('This artist only has release groups by Various Artists.')}
</p>
) : null}
<p>
{l('Showing official release groups for various artists')}
{l('Showing official release groups for Various Artists')}
{buildLinks(hasDefault, hasExtra, false, hasVariousArtistsExtra)}
</p>
</>
Expand Down
8 changes: 4 additions & 4 deletions root/artist/ArtistReleases.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const ArtistReleases = ({

{wantVariousArtistsOnly ? (
exp.l(
`Showing Various Artist releases.
`Showing Various Artists releases.
{show_subset|Show releases by this artist instead}.`,
{show_subset: `/artist/${artist.gid}/releases?va=0`},
)
Expand All @@ -88,15 +88,15 @@ const ArtistReleases = ({
*/
<p>
{hasFilter ? (
l('This search only found releases by various artists.')
l('This search only found releases by Various Artists.')
) : (
l('This artist only has releases by various artists.')
l('This artist only has releases by Various Artists.')
)}
</p>
) : (
exp.l(
`Showing releases by this artist.
{show_all|Show Various Artist releases instead}.`,
{show_all|Show Various Artists releases instead}.`,
{show_all: `/artist/${artist.gid}/releases?va=1`},
)
)}
Expand Down
2 changes: 1 addition & 1 deletion root/statistics/Index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ const Index = ({
</tr>
<tr>
<th />
<th colSpan="2">{l('by various artists:')}</th>
<th colSpan="2">{l('by Various Artists:')}</th>
<td>{fc('release.various')}</td>
<td>{fp('release.various', 'release')}</td>
</tr>
Expand Down