4 files changed, 15 insertions, 4 deletions
diff --git a/js/app/controllers/itemcontroller.coffee b/js/app/controllers/itemcontroller.coffee
index 71bbb13be..52f1c271a 100644
--- a/js/app/controllers/itemcontroller.coffee
+++ b/js/app/controllers/itemcontroller.coffee
@@ -29,7 +29,6 @@ angular.module('News').controller 'ItemController',
 
 		constructor: (@_$scope, @_itemBl, @_feedModel, @_feedLoading,
 		              @_feedBl, @_language) ->
-
 			@_$scope.itemBl = @_itemBl
 			@_$scope.feedBl = @_feedBl
 
@@ -43,7 +42,14 @@ angular.module('News').controller 'ItemController',
 				else
 					return ''
 
+			@_$scope.getRelativeDate = (date) =>
+				if date
+					return @_language.getMomentFromTimestamp(date).fromNow()
+				else
+					return ''
+
+
 
 	return new ItemController($scope, ItemBl, FeedModel, FeedLoading, FeedBl,
-	                           Language)
+	                          Language)
 ]
 \ No newline at end of file
diff --git a/js/app/services/language.coffee b/js/app/services/language.coffee
index 85a405fc7..ac46b0bc4 100644
--- a/js/app/services/language.coffee
+++ b/js/app/services/language.coffee
@@ -27,11 +27,17 @@ angular.module('News').factory 'Language', ->
 		constructor: ->
 			@_language = 'en'
 
+
 		handle: (data) ->
-			@_language = data.language
+			@_language = data.split('_')[0]
+
 
 		getLanguage: ->
 			return @_language
 
 
+		getMomentFromTimestamp: (timestamp) ->
+			return moment.unix(timestamp).lang(@_language)
+
+
 	return new Language()
diff --git a/js/app/services/moment.coffee b/js/app/services/moment.coffee
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/js/app/services/moment.coffee
diff --git a/js/app/services/services.coffee b/js/app/services/services.coffee
index 19e4b990d..d67e1d2c5 100644
--- a/js/app/services/services.coffee
+++ b/js/app/services/services.coffee
@@ -99,4 +99,3 @@ FolderModel, FeedModel, Language) ->
 	return publisher
 ]
 
-