diff --git a/ui/src/album/AlbumActions.js b/ui/src/album/AlbumActions.js index 518ff19f2..eb16a51f1 100644 --- a/ui/src/album/AlbumActions.js +++ b/ui/src/album/AlbumActions.js @@ -19,7 +19,7 @@ export const AlbumActions = ({ ...rest }) => { const dispatch = useDispatch() - const translation = useTranslate() + const translate = useTranslate() const shuffle = (data) => { const ids = Object.keys(data) @@ -39,7 +39,7 @@ export const AlbumActions = ({ onClick={() => { dispatch(playAlbum(ids[0], data)) }} - label={translation('resources.album.actions.playAll')} + label={translate('resources.album.actions.playAll')} > @@ -50,7 +50,7 @@ export const AlbumActions = ({ const firstId = Object.keys(shuffled)[0] dispatch(playAlbum(firstId, shuffled)) }} - label={translation('resources.album.actions.shuffle')} + label={translate('resources.album.actions.shuffle')} > diff --git a/ui/src/album/AlbumDetails.js b/ui/src/album/AlbumDetails.js index 7473f07a6..fd3a03195 100644 --- a/ui/src/album/AlbumDetails.js +++ b/ui/src/album/AlbumDetails.js @@ -1,8 +1,11 @@ import React from 'react' import { Card, CardContent, CardMedia, Typography } from '@material-ui/core' +import { useTranslate } from 'react-admin' import { subsonicUrl } from '../subsonic' +import { DurationField } from '../common' const AlbumDetails = ({ classes, record }) => { + const translate = useTranslate() const genreYear = (record) => { let genreDateLine = [] if (record.genre) { @@ -11,7 +14,7 @@ const AlbumDetails = ({ classes, record }) => { if (record.year) { genreDateLine.push(record.year) } - return genreDateLine.join(' - ') + return genreDateLine.join(' · ') } return ( @@ -32,6 +35,11 @@ const AlbumDetails = ({ classes, record }) => { {record.albumArtist || record.artist} {genreYear(record)} + + {record.songCount}{' '} + {translate('resources.song.name', { smart_count: record.songCount })}{' '} + · + ) diff --git a/ui/src/i18n/en.js b/ui/src/i18n/en.js index 4d85b9a35..f627a586a 100644 --- a/ui/src/i18n/en.js +++ b/ui/src/i18n/en.js @@ -4,6 +4,7 @@ import englishMessages from 'ra-language-english' export default deepmerge(englishMessages, { resources: { song: { + name: 'Song |||| Songs', fields: { albumArtist: 'Album Artist', duration: 'Time',