Fixed: Don't use "Ended" for people

Fixes #798
pull/6/head
Qstick 6 years ago
parent b2d87cccb2
commit 4a8d01f33e

@ -83,6 +83,8 @@ class AddNewArtistSearchResult extends Component {
const linkProps = isExistingArtist ? { to: `/artist/${foreignArtistId}` } : { onPress: this.onPress }; const linkProps = isExistingArtist ? { to: `/artist/${foreignArtistId}` } : { onPress: this.onPress };
const endedString = artistType === 'Person' ? 'Deceased' : 'Ended';
const height = calculateHeight(230, isSmallScreen); const height = calculateHeight(230, isSmallScreen);
return ( return (
@ -153,7 +155,7 @@ class AddNewArtistSearchResult extends Component {
kind={kinds.DANGER} kind={kinds.DANGER}
size={sizes.LARGE} size={sizes.LARGE}
> >
Ended {endedString}
</Label> : </Label> :
null null
} }

@ -191,6 +191,7 @@ class ArtistDetails extends Component {
overview, overview,
links, links,
images, images,
artistType,
alternateTitles, alternateTitles,
tags, tags,
isSaving, isSaving,
@ -230,6 +231,7 @@ class ArtistDetails extends Component {
} = this.state; } = this.state;
const continuing = status === 'continuing'; const continuing = status === 'continuing';
const endedString = artistType === 'Person' ? 'Deceased' : 'Ended';
let trackFilesCountMessage = 'No track files'; let trackFilesCountMessage = 'No track files';
@ -504,7 +506,7 @@ class ArtistDetails extends Component {
/> />
<span className={styles.qualityProfileName}> <span className={styles.qualityProfileName}>
{continuing ? 'Continuing' : 'Ended'} {continuing ? 'Continuing' : endedString}
</span> </span>
</Label> </Label>
@ -678,6 +680,7 @@ ArtistDetails.propTypes = {
statistics: PropTypes.object.isRequired, statistics: PropTypes.object.isRequired,
qualityProfileId: PropTypes.number.isRequired, qualityProfileId: PropTypes.number.isRequired,
monitored: PropTypes.bool.isRequired, monitored: PropTypes.bool.isRequired,
artistType: PropTypes.string.isRequired,
albumTypes: PropTypes.arrayOf(PropTypes.string), albumTypes: PropTypes.arrayOf(PropTypes.string),
status: PropTypes.string.isRequired, status: PropTypes.string.isRequired,
overview: PropTypes.string.isRequired, overview: PropTypes.string.isRequired,

@ -29,6 +29,7 @@ class ArtistEditorRow extends Component {
status, status,
foreignArtistId, foreignArtistId,
artistName, artistName,
artistType,
monitored, monitored,
languageProfile, languageProfile,
metadataProfile, metadataProfile,
@ -50,6 +51,7 @@ class ArtistEditorRow extends Component {
/> />
<ArtistStatusCell <ArtistStatusCell
artistType={artistType}
monitored={monitored} monitored={monitored}
status={status} status={status}
/> />
@ -107,6 +109,7 @@ ArtistEditorRow.propTypes = {
status: PropTypes.string.isRequired, status: PropTypes.string.isRequired,
foreignArtistId: PropTypes.string.isRequired, foreignArtistId: PropTypes.string.isRequired,
artistName: PropTypes.string.isRequired, artistName: PropTypes.string.isRequired,
artistType: PropTypes.string.isRequired,
monitored: PropTypes.bool.isRequired, monitored: PropTypes.bool.isRequired,
languageProfile: PropTypes.object.isRequired, languageProfile: PropTypes.object.isRequired,
metadataProfile: PropTypes.object.isRequired, metadataProfile: PropTypes.object.isRequired,

@ -139,6 +139,7 @@ class ArtistIndexRow extends Component {
<ArtistStatusCell <ArtistStatusCell
key={name} key={name}
className={styles[name]} className={styles[name]}
artistType={artistType}
monitored={monitored} monitored={monitored}
status={status} status={status}
component={VirtualTableRowCell} component={VirtualTableRowCell}

@ -8,12 +8,15 @@ import styles from './ArtistStatusCell.css';
function ArtistStatusCell(props) { function ArtistStatusCell(props) {
const { const {
className, className,
artistType,
monitored, monitored,
status, status,
component: Component, component: Component,
...otherProps ...otherProps
} = props; } = props;
const endedString = artistType === 'Person' ? 'Deceased' : 'Ended';
return ( return (
<Component <Component
className={className} className={className}
@ -28,7 +31,7 @@ function ArtistStatusCell(props) {
<Icon <Icon
className={styles.statusIcon} className={styles.statusIcon}
name={status === 'ended' ? icons.ARTIST_ENDED : icons.ARTIST_CONTINUING} name={status === 'ended' ? icons.ARTIST_ENDED : icons.ARTIST_CONTINUING}
title={status === 'ended' ? 'Ended' : 'Continuing'} title={status === 'ended' ? endedString : 'Continuing'}
/> />
</Component> </Component>
); );
@ -36,6 +39,7 @@ function ArtistStatusCell(props) {
ArtistStatusCell.propTypes = { ArtistStatusCell.propTypes = {
className: PropTypes.string.isRequired, className: PropTypes.string.isRequired,
artistType: PropTypes.string.isRequired,
monitored: PropTypes.bool.isRequired, monitored: PropTypes.bool.isRequired,
status: PropTypes.string.isRequired, status: PropTypes.string.isRequired,
component: PropTypes.func component: PropTypes.func

Loading…
Cancel
Save