From ae1f5b3de064d27ed7ada7158fc398411cfd6cd4 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 12 Jun 2013 16:38:02 +1000 Subject: [PATCH] goodbye NaNy --- app/assets/javascripts/admin/models/github_commit.js | 2 +- lib/js_locale_helper.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/admin/models/github_commit.js b/app/assets/javascripts/admin/models/github_commit.js index 40d40e6304a..b807fd6ae59 100644 --- a/app/assets/javascripts/admin/models/github_commit.js +++ b/app/assets/javascripts/admin/models/github_commit.js @@ -20,7 +20,7 @@ Discourse.GithubCommit = Discourse.Model.extend({ }.property("sha"), timeAgo: function() { - return Discourse.Formatter.relativeAge(new Date(this.get('commit.committer.date'), {format: 'medium', leaveAgo: true})); + return moment(this.get('commit.committer.date')).relativeAge({format: 'medium', leaveAgo: true}) }.property("commit.committer.date") }); diff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rb index f08cae73a70..61847405cf1 100644 --- a/lib/js_locale_helper.rb +++ b/lib/js_locale_helper.rb @@ -31,6 +31,7 @@ module JsLocaleHelper result << moment_format_function('short_date_no_year') result << moment_format_function('short_date') result << moment_format_function('long_date') + result << "moment.fn.relativeAge = function(opts){ return Discourse.Formatter.relativeAge(this.toDate(), opts)};\n" end def self.moment_format_function(name)