routes.api: fix get_captcha endpoint (#1135)

[lemmy.git] / ui / src / components / moment-time.tsx

diff --git a/ui/src/components/moment-time.tsx b/ui/src/components/moment-time.tsx
index a256f7858cbe854c37798b2e99e535812370f4c9..e3fa0de31bf76ff6b8cad2cf6461e91f742ac5bd 100644 (file)
--- a/ui/src/components/moment-time.tsx
+++ b/ui/src/components/moment-time.tsx
@@ -1,6 +1,6 @@
 import { Component } from 'inferno';
 import moment from 'moment';
-import { getMomentLanguage, setupTippy } from '../utils';
+import { getMomentLanguage, capitalizeFirstLetter } from '../utils';
 import { i18n } from '../i18next';
 
 interface MomentTimeProps {
@@ -9,6 +9,7 @@ interface MomentTimeProps {
     when_?: string;
     updated?: string;
   };
+  showAgo?: boolean;
 }
 
 export class MomentTime extends Component<MomentTimeProps, any> {
@@ -20,18 +21,19 @@ export class MomentTime extends Component<MomentTimeProps, any> {
     moment.locale(lang);
   }
 
-  componentDidMount() {
-    setupTippy();
-  }
-
   render() {
     if (this.props.data.updated) {
       return (
         <span
-          data-tippy-content={this.format(this.props.data.updated)}
+          data-tippy-content={`${capitalizeFirstLetter(
+            i18n.t('modified')
+          )} ${this.format(this.props.data.updated)}`}
           className="font-italics pointer unselectable"
         >
-          {i18n.t('modified')} {moment.utc(this.props.data.updated).fromNow()}
+          <svg class="icon icon-inline mr-1">
+            <use xlinkHref="#icon-edit-2"></use>
+          </svg>
+          {moment.utc(this.props.data.updated).fromNow(!this.props.showAgo)}
         </span>
       );
     } else {
@@ -41,7 +43,7 @@ export class MomentTime extends Component<MomentTimeProps, any> {
           className="pointer unselectable"
           data-tippy-content={this.format(str)}
         >
-          {moment.utc(str).fromNow()}
+          {moment.utc(str).fromNow(!this.props.showAgo)}
         </span>
       );
     }