From 3ce345cbc1472a5bfa1b1d3bfcc5b22779cd5135 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 18 Dec 2017 18:01:09 +0800
Subject: [PATCH] fix(messages): fixed message search with translate string
 issue

---
 .../controllers/messages.client.controller.js      | 14 ++++++++------
 modules/messages/client/views/box.client.view.html | 13 ++-----------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/modules/messages/client/controllers/messages.client.controller.js b/modules/messages/client/controllers/messages.client.controller.js
index eb2fc068..208aaa3e 100644
--- a/modules/messages/client/controllers/messages.client.controller.js
+++ b/modules/messages/client/controllers/messages.client.controller.js
@@ -98,6 +98,13 @@
         mtDebug.info(data);
         vm.messages = data.rows;
 
+        if (vm.messageType === 'server') {
+          angular.forEach(vm.messages, function (m) {
+            m.title = $translate.instant('SERVER_MESSAGE.' + m.title);
+            m.content = $translate.instant('SERVER_MESSAGE.' + m.content.string, m.content.params);
+          });
+        }
+
         vm.buildPager();
       });
     };
@@ -126,7 +133,7 @@
       vm.pagedItems = vm.filteredItems.slice(begin, end);
 
       if (vm.pagedItems.length === 0) {
-        vm.resultMsg = 'MESSAGES_IS_EMPTY'
+        vm.resultMsg = 'MESSAGES_IS_EMPTY';
       } else {
         vm.resultMsg = undefined;
       }
@@ -434,11 +441,6 @@
         return marked(m.content, {sanitize: true});
       }
     };
-    vm.getServerNoticeContentMarked = function (m) {
-      if (m) {
-        return marked($translate.instant('SERVER_MESSAGE.' + vm.selectedMessage.content.string, vm.selectedMessage.content.params), {sanitize: true});
-      }
-    };
 
     /**
      * replyMessage
diff --git a/modules/messages/client/views/box.client.view.html b/modules/messages/client/views/box.client.view.html
index a3ec51fe..1a4779dc 100644
--- a/modules/messages/client/views/box.client.view.html
+++ b/modules/messages/client/views/box.client.view.html
@@ -75,10 +75,7 @@
                                 <span class="message-avatar glyphicon glyphicon-cog server-message-avatar" ng-if="m.type=='server'"></span>
                                 <i class="fa fa-envelope message-avatar server-message-avatar" ng-if="m.type!='user' && m.type!='server'"></i>
 
-                                <span class="message-title" ng-class="vm.isUnread(m)? 'unread' : 'read'" ng-if="m.type!='server'"
-                                      ng-bind="m.title"></span>
-                                <span class="message-title" ng-class="vm.isUnread(m)? 'unread' : 'read'" ng-if="m.type=='server'"
-                                      translate="SERVER_MESSAGE.{{m.title}}"></span>
+                                <span class="message-title" ng-class="vm.isUnread(m)? 'unread' : 'read'" ng-bind="m.title"></span>
 
                                 <p class="message-info" ng-if="m.type=='user'">
                                     <span user-info="m.from_user"
@@ -141,11 +138,7 @@
 
                 <div class="title-info">
                     <span class="message-title" ng-class="vm.isUnread(vm.selectedMessage)? 'unread' : 'read'"
-                          ng-if="vm.selectedMessage.type!='server'"
                           ng-bind="vm.selectedMessage.title"></span>
-                    <span class="message-title" ng-class="vm.isUnread(vm.selectedMessage)? 'unread' : 'read'"
-                          ng-if="vm.selectedMessage.type=='server'"
-                          translate="SERVER_MESSAGE.{{vm.selectedMessage.title}}"></span>
 
                     <p class="message-info" ng-if="vm.selectedMessage.type=='user'">
                         <span user-info="vm.selectedMessage.from_user"
@@ -166,9 +159,7 @@
             </div>
 
             <li class="status-divider"></li>
-            <div class="message-content" ng-bind-html="vm.getContentMarked(vm.selectedMessage);" ng-if="vm.selectedMessage.type!='server'"></div>
-            <div class="message-content" ng-bind-html="vm.getServerNoticeContentMarked(vm.selectedMessage);"
-                 ng-if="vm.selectedMessage.type=='server'"></div>
+            <div class="message-content" ng-bind-html="vm.getContentMarked(vm.selectedMessage);"></div>
 
             <div class="message-reply" ng-if="vm.selectedMessage._replies.length>0">
                 <li class="status-divider"></li>