Merge branch 'master' into saravea

Conflicts:
	.gitmodules
	mod/admins
	mod/assemblies
	mod/audio_html5
	mod/beechat
	mod/crud
	mod/elgg-activitystreams
	mod/elggman
	mod/elggpg
	mod/favorites
	mod/federated-objects
	mod/friendly_time
	mod/group_alias
	mod/group_operators
	mod/languages
	mod/lightpics
	mod/openid_client
	mod/spotlight
	mod/suicide
	mod/tasks
	mod/videolist

1 files changed, 50 insertions, 0 deletions

diff --git a/mod/identica/views/default/js/friendly_time.php b/mod/identica/views/default/js/friendly_time.php
new file mode 100644
index 000000000..0b0275206
--- /dev/null
+++ b/mod/identica/views/default/js/friendly_time.php
@@ -0,0 +1,50 @@
+elgg.get_friendly_time = function(time) {
+
+	if (!time) {
+		time = new Date();
+	} else {
+		time = new Date(time);
+	}
+	diff = (new Date().getTime() - time.getTime()) / 1000;
+	
+	minute = 60;
+	hour = minute * 60;
+	day = hour * 24;
+
+	if (diff < minute) {
+		return elgg.echo("friendlytime:justnow");
+	} else if (diff < hour) {
+		diff = Math.round(diff / minute);
+		if (diff == 0) {
+			diff = 1;
+		}
+
+		if (diff > 1) {
+			return elgg.echo("friendlytime:minutes", [diff]);
+		} else {
+			return elgg.echo("friendlytime:minutes:singular", [diff]);
+		}
+	} else if (diff < day) {
+		diff = Math.round(diff / hour);
+		if (diff == 0) {
+			diff = 1;
+		}
+
+		if (diff > 1) {
+			return elgg.echo("friendlytime:hours", [diff]);
+		} else {
+			return elgg.echo("friendlytime:hours:singular", [diff]);
+		}
+	} else {
+		diff = Math.round(diff / day);
+		if (diff == 0) {
+			diff = 1;
+		}
+
+		if (diff > 1) {
+			return elgg.echo("friendlytime:days", [diff]);
+		} else {
+			return elgg.echo("friendlytime:days:singular", [diff]);
+		}
+	}
+};