Changeset 7984 for sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/javascript/tracker/source/tracker.jsx

Timestamp:

12/17/2018 07:35:16 AM (6 years ago)

Author:

vedjain

Message:

WCPT: Remove js based humanize_time_diff to favour PHP based function.

Earlier I added JS based version of the function, but turns out I can use PHP version using a little workaround. PHP's implementation is favored because it is a method in core, so it will be maintained and translations are already available.

File:

• sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/javascript/tracker/source/tracker.jsx (modified) (2 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/javascript/tracker/source/tracker.jsx

@@ -8 +8 @@
 
 /**
- * Courtesy: https://stackoverflow.com/a/3177838/1845153
- *
- * Converts unix seconds into human readable time.
- * Looks like exact javascript convert of WordPress's human_time_diff, except this always compares from current time, instead of getting two arguments.
- *
- * @param {int} seconds Seconds ago to convert to human readable time
- *
- * @returns {string} Human readable time ago
+ * Custom render function for lastUpdatedColumn. Will display X time ago instead of unix timestamp. Use `humanizedTime` field sent from server.
  */
-const timeSince = ( seconds ) => {
-
-    let interval = Math.floor ( seconds / 31536000 );
-
-    if ( interval >= 1)  {
-        return interval + " years";
-    }
-    interval = Math.floor ( seconds / 2592000);
-    if ( interval >= 1 ) {
-        return interval + " months";
-    }
-    interval = Math.floor ( seconds / 86400);
-    if ( interval >= 1 ) {
-        return interval + " days";
-    }
-    interval = Math.floor ( seconds / 3600);
-    if ( interval >= 1 ) {
-        return interval + " hours";
-    }
-    interval = Math.floor ( seconds / 60);
-    if ( interval >= 1 ) {
-        return interval + " minutes";
-    }
-    return Math.floor ( seconds ) + " seconds";
-};
-
-/**
- * Custom render function for lastUpdatedColumn. Will display X time ago instead of unix timestamp
- */
-const renderHumanizeTime = ( time ) => {
-    return timeSince( time ) + " ago";
+const renderHumanizedTime = ( row ) => {
+    return row['humanizedTime'];
 };
 
@@ -57 +21 @@
         customRender     = {
             {
-                lastUpdate: renderHumanizeTime
+                lastUpdate: renderHumanizedTime
             }
         }