Fuzzy time

r2/example.ini

@@ -14,7 +14,7 @@ template_debug = false
 reload_templates = true
 # use uncompressed static files (out of /static/js and /static/css)
 # rather than compressed files out of /static (for development if true)
-uncompressedJS = true
+uncompressedJS = false
 # enable/disable verbose SQL printing 
 sqlprinting = false
 # enable/disable writing errors as they occur to a rabbit-mq queue

r2/r2/lib/js.py

@@ -237,6 +237,7 @@ def outputs(self):
     "lib/json2.js",
     "lib/jquery.cookie.js",
     "lib/jquery.url.js",
+    "lib/jquery.timeago.js",
     "jquery.reddit.js",
     "base.js",
     "ui.js",

r2/r2/lib/strings.py

@@ -40,6 +40,23 @@
 # dictionary is not used directly but rather is managed by the single
 # StringHandler instance strings
 string_dict = dict(
+
+
+    # time ago values (jquery.timeago.js)
+    ta_ago = "ago",
+    ta_suffixFromNow = "from now",
+    ta_seconds =  "less than a minute",
+    ta_minute =  "about a minute",
+    ta_minutes =  "%d minutes",
+    ta_hour =  "about an hour",
+    ta_hours =  "about %d hours",
+    ta_day = "a day",
+    ta_days =  "%d days",
+    ta_month =  "about a month",
+    ta_months =  "%d months",
+    ta_year =  "about a year",
+    ta_years =  "%d years",
+
 
     banned_by = "removed by %s",
     banned    = "removed",

r2/r2/public/static/js/lib/jquery.timeago.js

@@ -0,0 +1,150 @@
+/**
+ * Timeago is a jQuery plugin that makes it easy to support automatically
+ * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago").
+ *
+ * @name timeago
+ * @version 0.10.0
+ * @requires jQuery v1.2.3+
+ * @author Ryan McGeary
+ * @license MIT License - http://www.opensource.org/licenses/mit-license.php
+ *
+ * For usage and examples, visit:
+ * http://timeago.yarp.com/
+ *
+ * Copyright (c) 2008-2011, Ryan McGeary (ryanonjavascript -[at]- mcgeary [*dot*] org)
+ */
+(function($) {
+  $.timeago = function(timestamp) {
+    if (timestamp instanceof Date) {
+      return inWords(timestamp);
+    } else if (typeof timestamp === "string") {
+      return inWords($.timeago.parse(timestamp));
+    } else {
+      return inWords($.timeago.datetime(timestamp));
+    }
+  };
+  var $t = $.timeago;
+
+  $.extend($.timeago, {
+    //these will be overwritten in ../reddit.js (jquery document ready function)
+    //based on i18n settings
+    settings: {
+      refreshMillis: 60000,
+      allowFuture: false,
+      strings: {
+        prefixAgo: null,
+        prefixFromNow: null,
+        suffixAgo: "ago",
+        suffixFromNow: "from now",
+        seconds: "less than a minute",
+        minute: "about a minute",
+        minutes: "%d minutes",
+        hour: "about an hour",
+        hours: "about %d hours",
+        day: "a day",
+        days: "%d days",
+        month: "about a month",
+        months: "%d months",
+        year: "about a year",
+        years: "%d years",
+        numbers: []
+      }
+    },
+    inWords: function(distanceMillis) {
+      var $l = this.settings.strings;
+      var prefix = $l.prefixAgo;
+      var suffix = $l.suffixAgo;
+      if (this.settings.allowFuture) {
+        if (distanceMillis < 0) {
+          prefix = $l.prefixFromNow;
+          suffix = $l.suffixFromNow;
+        }
+      }
+
+      var seconds = Math.abs(distanceMillis) / 1000;
+      var minutes = seconds / 60;
+      var hours = minutes / 60;
+      var days = hours / 24;
+      var years = days / 365;
+
+      function substitute(stringOrFunction, number) {
+        var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction;
+        var value = ($l.numbers && $l.numbers[number]) || number;
+        return string.replace(/%d/i, value);
+      }
+
+      var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) ||
+        seconds < 90 && substitute($l.minute, 1) ||
+        minutes < 45 && substitute($l.minutes, Math.round(minutes)) ||
+        minutes < 90 && substitute($l.hour, 1) ||
+        hours < 24 && substitute($l.hours, Math.round(hours)) ||
+        hours < 48 && substitute($l.day, 1) ||
+        days < 30 && substitute($l.days, Math.floor(days)) ||
+        days < 60 && substitute($l.month, 1) ||
+        days < 365 && substitute($l.months, Math.floor(days / 30)) ||
+        years < 2 && substitute($l.year, 1) ||
+        substitute($l.years, Math.floor(years));
+
+      return $.trim([prefix, words, suffix].join(" "));
+    },
+    parse: function(iso8601) {
+      var s = $.trim(iso8601);
+      s = s.replace(/\.\d\d\d+/,""); // remove milliseconds
+      s = s.replace(/-/,"/").replace(/-/,"/");
+      s = s.replace(/T/," ").replace(/Z/," UTC");
+      s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400
+      return new Date(s);
+    },
+    datetime: function(elem) {
+      // jQuery's `is()` doesn't play well with HTML5 in IE
+      var isTime = $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time");
+      var iso8601 = isTime ? $(elem).attr("datetime") : $(elem).attr("title");
+      return $t.parse(iso8601);
+    }
+  });
+
+  $.fn.timeago = function() {
+    var self = this;
+    self.each(refresh);
+
+    var $s = $t.settings;
+    if ($s.refreshMillis > 0) {
+      setInterval(function() { self.each(refresh); }, $s.refreshMillis);
+    }
+    return self;
+  };
+
+  function refresh() {
+    var data = prepareData(this);
+    if (!isNaN(data.datetime)) {
+      $(this).text(inWords(data.datetime));
+    }
+    return this;
+  }
+
+  function prepareData(element) {
+    element = $(element);
+    if (!element.data("timeago")) {
+      element.data("timeago", { datetime: $t.datetime(element) });
+      /* Stops the title being overridden 
+      var text = $.trim(element.text());
+      if (text.length > 0) {
+        element.attr("title", text);
+      }
+      */
+    }
+    return element.data("timeago");
+  }
+
+  function inWords(date) {
+    return $t.inWords(distance(date));
+  }
+
+  function distance(date) {
+    return (new Date().getTime() - date.getTime());
+  }
+
+  // fix for IE6 suckage
+  document.createElement("abbr");
+  document.createElement("time");
+}(jQuery));

r2/r2/public/static/js/reddit.js

@@ -1235,6 +1235,28 @@ $(function() {
         $("#shortlink-text").click(function() {
             $(this).select();
         });
+
+        /* Load fuzzy time i18n strings */
+        $.timeago.settings.strings = {
+            prefixAgo: null,
+            prefixFromNow: null,
+            suffixAgo: r.strings.ta_ago,
+            suffixFromNow: r.strings.ta_suffixFromNow,
+            seconds: r.strings.ta_seconds,
+            minute: r.strings.ta_minute,
+            minutes: r.strings.ta_minutes,
+            hour: r.strings.ta_hour,
+            hours: r.strings.ta_hours,
+            day: r.strings.ta_day,
+            days: r.strings.ta_days,
+            month: r.strings.ta_month,
+            months: r.strings.ta_months,
+            year: r.strings.ta_year,
+            years: r.strings.ta_years
+        };
+
+        /* Init fuzzy time on time elements */
+        $("time.fuzzy-time").timeago();
     });
 
 function show_friend(account_fullname) {

r2/r2/templates/comment.html

@@ -104,7 +104,7 @@
     %if show:
        ${unsafe(self.score(thing, likes = thing.likes))} 
     %endif
-    ${thing_timestamp(thing, thing.timesince)} ${_("ago")}
+    ${thing_timestamp(thing, thing.timesince)} 
     %if thing.editted:
       <em>*</em>&nbsp;
     %endif

r2/r2/templates/link.html

@@ -202,15 +202,15 @@
 <%def name="tagline()">
   <%
     if thing.score_fmt == Score.points:
-      taglinetext = "<span>" + _("%(score)s submitted %(when)s ago") + "</span>"
+      taglinetext = "<span>" + _("%(score)s submitted %(when)s") + "</span>"
       if thing.different_sr:
          taglinetext += " <span>" + _("by %(author)s to %(reddit)s") + "</span>"
       else:
          taglinetext += " <span>" + _("by %(author)s") + "</span>"
     elif thing.different_sr:
-      taglinetext = _("submitted %(when)s ago by %(author)s to %(reddit)s")
+      taglinetext = _("submitted %(when)s by %(author)s to %(reddit)s")
     else:
-      taglinetext = _("submitted %(when)s ago by %(author)s")
+      taglinetext = _("submitted %(when)s by %(author)s")
     taglinetext = taglinetext.replace(" ", "&#32;")
   %>
 

r2/r2/templates/utils.html

@@ -516,7 +516,7 @@
 <%def name="timestamp(date, since=None)">
   ## todo: use pubdate attribute once things are <article> tags.
   ## note: comment and link templates will pass a CachedVariable stub as since.
-  <time title="${long_datetime(date)}" datetime="${date.isoformat()}">
+  <time class="fuzzy-time" title="${long_datetime(date)}" datetime="${date.isoformat()}">
     ${unsafe(since or timesince(date))}
   </time>
 </%def>