pleroma-fe

commit: bf7190bfca5221d0f81b34f5b7238ca4e9d1380c
parent: d44d88da1c05a1b13a7a44c6531e03cc697eb2ed
Author: lambadalambda <gitgud@rogerbraun.net>
Date:   Wed, 31 May 2017 08:03:10 -0400

Merge branch 'feature/custom-timestamps' into 'develop'

Add a custom timeago.json for shorter timestamps, for example '15s' instead of '15 seconds ago'

See merge request !80
Diffstat:
M
src/main.js
2
+-
A
static/timeago.json
10
++++++++++

2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/main.js b/src/main.js
@@ -24,7 +24,7 @@ Vue.use(VueRouter)
 Vue.use(VueTimeago, {
   locale: 'en-US',
   locales: {
-    'en-US': require('vue-timeago/locales/en-US.json')
+    'en-US': require('../static/timeago.json')
   }
 })
 
diff --git a/static/timeago.json b/static/timeago.json
@@ -0,0 +1,10 @@
+[
+  "now",
+  ["%ss", "%ss"],
+  ["%smin", "%smin"],
+  ["%sh", "%sh"],
+  ["%sd", "%sd"],
+  ["%sw", "%sw"],
+  ["%sm", "%sm"],
+  ["%sy", "%sy"]
+]