From 9c2dfaa34c93ee5bf24093c95cff7d4b77b4ecb5 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 4 May 2017 12:10:26 +0300
Subject: juick-www: pebble message formatter extension

---
 juick-www/src/main/webapp/WEB-INF/views/index.html    | 2 +-
 juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html | 2 +-
 juick-www/src/main/webapp/WEB-INF/views/pm_sent.html  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'juick-www/src/main/webapp/WEB-INF')

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 da2117a5..a9d6d058 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/index.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/index.html
@@ -31,7 +31,7 @@
         <img src="//i.juick.com/photos-512/{{ msg.getMid() }}.{{ msg.AttachmentType }}" alt=""/></a>
     </p>
     {% endif %}
-    <p>{{ msg.getText() | raw }}</p>
+    <p>{{ msg | formatMessage }}</p>
     {%if msg.AttachmentType is not empty %}
     <div class="irbr"></div>
     {% endif %}
diff --git a/juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html b/juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html
index fa339a25..d360a651 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html
@@ -15,7 +15,7 @@
             	 <div class="msg-ts">{{ msg.getDate() }}</div>
             </div>
            
-            <div class="msg-txt">{{ msg.getText() | raw }}</div>
+            <div class="msg-txt">{{ msg | formatMessage }}</div>
             {% if not readonly %}
             <form action="/pm/send" method="POST" enctype="multipart/form-data">
                 <input type="hidden" name="uname" value="{{ msg.getUser().getName() }}"/>
diff --git a/juick-www/src/main/webapp/WEB-INF/views/pm_sent.html b/juick-www/src/main/webapp/WEB-INF/views/pm_sent.html
index 872cd29f..5a3daa1d 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/pm_sent.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/pm_sent.html
@@ -23,7 +23,7 @@
             	</div>
             	<div class="msg-ts">{{ msg.getDate() }}</div>
             </div>
-            <div class="msg-txt">{{ msg.getText() | raw }}</div>
+            <div class="msg-txt">{{ msg | formatMessage }}</div>
         </div>
     </li>
     {% endfor %}
-- 
cgit v1.2.3