fix: ja locale labels (#3367)
This commit is contained in:
@ -128,6 +128,7 @@ class Workflow extends Component {
|
||||
handlePublish={publishUnpublishedEntry}
|
||||
handleDelete={deleteUnpublishedEntry}
|
||||
isOpenAuthoring={isOpenAuthoring}
|
||||
collections={collections}
|
||||
/>
|
||||
</WorkflowContainer>
|
||||
);
|
||||
|
@ -118,7 +118,7 @@ const CardDate = translate()(({ t, date, author }) => {
|
||||
});
|
||||
|
||||
const WorkflowCard = ({
|
||||
collectionName,
|
||||
collectionLabel,
|
||||
title,
|
||||
authorLastChange,
|
||||
body,
|
||||
@ -132,7 +132,7 @@ const WorkflowCard = ({
|
||||
}) => (
|
||||
<WorkflowCardContainer>
|
||||
<WorkflowLink to={editLink}>
|
||||
<CardCollection>{collectionName}</CardCollection>
|
||||
<CardCollection>{collectionLabel}</CardCollection>
|
||||
<CardTitle>{title}</CardTitle>
|
||||
{(timestamp || authorLastChange) && <CardDate date={timestamp} author={authorLastChange} />}
|
||||
<CardBody>{body}</CardBody>
|
||||
@ -153,7 +153,7 @@ const WorkflowCard = ({
|
||||
);
|
||||
|
||||
WorkflowCard.propTypes = {
|
||||
collectionName: PropTypes.string.isRequired,
|
||||
collectionLabel: PropTypes.string.isRequired,
|
||||
title: PropTypes.string,
|
||||
authorLastChange: PropTypes.string,
|
||||
body: PropTypes.string,
|
||||
|
@ -134,6 +134,7 @@ class WorkflowList extends React.Component {
|
||||
handleDelete: PropTypes.func.isRequired,
|
||||
t: PropTypes.func.isRequired,
|
||||
isOpenAuthoring: PropTypes.bool,
|
||||
collections: ImmutablePropTypes.orderedMap,
|
||||
};
|
||||
|
||||
handleChangeStatus = (newStatus, dragProps) => {
|
||||
@ -161,7 +162,7 @@ class WorkflowList extends React.Component {
|
||||
|
||||
// eslint-disable-next-line react/display-name
|
||||
renderColumns = (entries, column) => {
|
||||
const { isOpenAuthoring } = this.props;
|
||||
const { isOpenAuthoring, collections, t } = this.props;
|
||||
if (!entries) return null;
|
||||
|
||||
if (!column) {
|
||||
@ -202,35 +203,40 @@ class WorkflowList extends React.Component {
|
||||
return (
|
||||
<div>
|
||||
{entries.map(entry => {
|
||||
const timestamp = moment(entry.getIn(['metaData', 'timeStamp'])).format('MMMM D');
|
||||
const timestamp = moment(entry.getIn(['metaData', 'timeStamp'])).format(
|
||||
t('workflow.workflow.dateFormat'),
|
||||
);
|
||||
const slug = entry.get('slug');
|
||||
const editLink = `collections/${entry.getIn(['metaData', 'collection'])}/entries/${slug}`;
|
||||
const ownStatus = entry.getIn(['metaData', 'status']);
|
||||
const collection = entry.getIn(['metaData', 'collection']);
|
||||
const collectionName = entry.getIn(['metaData', 'collection']);
|
||||
const collectionLabel = collections
|
||||
?.find(collection => collection.get('name') === collectionName)
|
||||
?.get('label');
|
||||
const isModification = entry.get('isModification');
|
||||
const canPublish = ownStatus === status.last() && !entry.get('isPersisting', false);
|
||||
return (
|
||||
<DragSource
|
||||
namespace={DNDNamespace}
|
||||
key={`${collection}-${slug}`}
|
||||
key={`${collectionName}-${slug}`}
|
||||
slug={slug}
|
||||
collection={collection}
|
||||
collection={collectionName}
|
||||
ownStatus={ownStatus}
|
||||
>
|
||||
{connect =>
|
||||
connect(
|
||||
<div>
|
||||
<WorkflowCard
|
||||
collectionName={collection}
|
||||
collectionLabel={collectionLabel || collectionName}
|
||||
title={entry.get('label') || entry.getIn(['data', 'title'])}
|
||||
authorLastChange={entry.getIn(['metaData', 'user'])}
|
||||
body={entry.getIn(['data', 'body'])}
|
||||
isModification={isModification}
|
||||
editLink={editLink}
|
||||
timestamp={timestamp}
|
||||
onDelete={this.requestDelete.bind(this, collection, slug, ownStatus)}
|
||||
onDelete={this.requestDelete.bind(this, collectionName, slug, ownStatus)}
|
||||
canPublish={canPublish}
|
||||
onPublish={this.requestPublish.bind(this, collection, slug, ownStatus)}
|
||||
onPublish={this.requestPublish.bind(this, collectionName, slug, ownStatus)}
|
||||
/>
|
||||
</div>,
|
||||
)
|
||||
|
Reference in New Issue
Block a user