LemmyNet/lemmy-ui
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-12-23 19:31:26 +00:00
Code Issues Projects Releases Wiki Activity

Show original created time tooltip (#462)

Browse source 
* Updating translations.

* Show created and modified times on tippy. Fixes #438
This commit is contained in:
Dessalines 2021-10-17 21:46:15 -04:00 committed by GitHub
parent cf69754cab
commit de4b407f71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lemmy-translations

@ -1 +1 @@
Subproject commit 2849552043b167dd7e803da9dcbbf02f450f550a Subproject commit 0d6ef6791f9175fb98ec99598c724d83e8e0d4ef

26
src/shared/components/common/moment-time.tsx
View file

@ -23,13 +23,27 @@ export class MomentTime extends Component<MomentTimeProps, any> {
moment.locale(lang); moment.locale(lang);
} }
createdAndModifiedTimes() {
let created = this.props.data.published || this.props.data.when_;
return `
<div>
<div>
${capitalizeFirstLetter(i18n.t("created"))}: ${this.format(created)}
</div>
<div>
${capitalizeFirstLetter(i18n.t("modified"))} ${this.format(
this.props.data.updated
)}
</div>
</div>`;
}
render() { render() {
if (!this.props.ignoreUpdated && this.props.data.updated) { if (!this.props.ignoreUpdated && this.props.data.updated) {
return ( return (
<span <span
data-tippy-content={`${capitalizeFirstLetter( data-tippy-content={this.createdAndModifiedTimes()}
i18n.t("modified") data-tippy-allowHtml={true}
)} ${this.format(this.props.data.updated)}`}
className="font-italics pointer unselectable" className="font-italics pointer unselectable"
> >
<Icon icon="edit-2" classes="icon-inline mr-1" /> <Icon icon="edit-2" classes="icon-inline mr-1" />
@ -37,13 +51,13 @@ export class MomentTime extends Component<MomentTimeProps, any> {
</span> </span>
); );
} else { } else {
let str = this.props.data.published || this.props.data.when_; let created = this.props.data.published || this.props.data.when_;
return ( return (
<span <span
className="pointer unselectable" className="pointer unselectable"
data-tippy-content={this.format(str)} data-tippy-content={this.format(created)}
> >
{moment.utc(str).fromNow(!this.props.showAgo)} {moment.utc(created).fromNow(!this.props.showAgo)}
</span> </span>
); );
} }