aboutsummaryrefslogtreecommitdiff
path: root/juick-www/src/main
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2017-05-04 13:15:56 +0300
committerGravatar Vitaly Takmazov2017-05-05 12:07:33 +0300
commit1263d0268707b5505c1eb55796c0664f283818eb (patch)
tree49ae0e0bbecdf6863e65b382c0d17a1498c65ecf /juick-www/src/main
parent9c2dfaa34c93ee5bf24093c95cff7d4b77b4ecb5 (diff)
juick-www: pebble pretty time filter
Diffstat (limited to 'juick-www/src/main')
-rw-r--r--juick-www/src/main/java/com/mitchellbosecke/pebble/extension/FormatterExtension.java2
-rw-r--r--juick-www/src/main/java/com/mitchellbosecke/pebble/extension/filters/PrettyTimeFilter.java33
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/index.html2
3 files changed, 36 insertions, 1 deletions
diff --git a/juick-www/src/main/java/com/mitchellbosecke/pebble/extension/FormatterExtension.java b/juick-www/src/main/java/com/mitchellbosecke/pebble/extension/FormatterExtension.java
index e26b5c20..220e0460 100644
--- a/juick-www/src/main/java/com/mitchellbosecke/pebble/extension/FormatterExtension.java
+++ b/juick-www/src/main/java/com/mitchellbosecke/pebble/extension/FormatterExtension.java
@@ -1,6 +1,7 @@
package com.mitchellbosecke.pebble.extension;
import com.mitchellbosecke.pebble.extension.filters.FormatMessageFilter;
+import com.mitchellbosecke.pebble.extension.filters.PrettyTimeFilter;
import java.util.HashMap;
import java.util.Map;
@@ -13,6 +14,7 @@ public class FormatterExtension extends AbstractExtension {
public Map<String, Filter> getFilters() {
Map<String, Filter> filters = new HashMap<>();
filters.put("formatMessage", new FormatMessageFilter());
+ filters.put("prettyTime", new PrettyTimeFilter());
return filters;
}
}
diff --git a/juick-www/src/main/java/com/mitchellbosecke/pebble/extension/filters/PrettyTimeFilter.java b/juick-www/src/main/java/com/mitchellbosecke/pebble/extension/filters/PrettyTimeFilter.java
new file mode 100644
index 00000000..bbe31bb7
--- /dev/null
+++ b/juick-www/src/main/java/com/mitchellbosecke/pebble/extension/filters/PrettyTimeFilter.java
@@ -0,0 +1,33 @@
+package com.mitchellbosecke.pebble.extension.filters;
+
+import com.juick.util.PrettyTimeFormatter;
+import com.mitchellbosecke.pebble.extension.Filter;
+import com.mitchellbosecke.pebble.template.EvaluationContext;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * Created by vitalyster on 04.05.2017.
+ */
+public class PrettyTimeFilter implements Filter {
+
+ PrettyTimeFormatter formatter = new PrettyTimeFormatter();
+
+ @Override
+ public Object apply(Object input, Map<String, Object> args) {
+ if (input instanceof Date) {
+ EvaluationContext context = (EvaluationContext) args.get("_context");
+ Locale locale = context.getLocale();
+ return formatter.format(locale, (Date)input);
+ }
+ throw new IllegalArgumentException("invalid input");
+ }
+
+ @Override
+ public List<String> getArgumentNames() {
+ return null;
+ }
+}
diff --git a/juick-www/src/main/webapp/WEB-INF/views/index.html b/juick-www/src/main/webapp/WEB-INF/views/index.html
index a9d6d058..e2a38939 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/index.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/index.html
@@ -16,7 +16,7 @@
<div class="msg-ts">
<a href="/{{ msg.getUser().getName() }}/{{ msg.getMid() }}">
<time>
- {{ msg.getDate() }}
+ {{ msg.getDate() | prettyTime }}
</time>
</a>
</div>