From 77559e234d0abe73ddb88fb66bb0f9f06430fcf9 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Mon, 8 Sep 2014 16:14:38 +0400 Subject: [PATCH] Fixed pluralisation for realtime time Closes #439 --- app/js/filters.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/js/filters.js b/app/js/filters.js index 11183eca..9212d704 100644 --- a/app/js/filters.js +++ b/app/js/filters.js @@ -169,6 +169,14 @@ angular.module('myApp.filters', []) }]) .filter('relativeTime', ['$filter', function($filter) { + var langMinutes = { + one: 'minute ago', + many: 'minutes ago' + }, + langHours = { + one: 'hour ago', + many: 'hours ago' + }; return function (timestamp) { var ticks = timestamp * 1000, diff = Math.abs(tsNow() - ticks); @@ -177,10 +185,12 @@ angular.module('myApp.filters', []) return 'just now'; } if (diff < 3000000) { - return Math.ceil(diff / 60000) + ' minutes ago'; + var minutes = Math.ceil(diff / 60000); + return minutes + ' ' + langMinutes[minutes > 1 ? 'many' : 'one']; } if (diff < 10000000) { - return Math.ceil(diff / 3600000) + ' hours ago'; + var hours = Math.ceil(diff / 3600000); + return hours + ' ' + langHours[hours > 1 ? 'many' : 'one']; } return $filter('dateOrTime')(timestamp); }