Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-03-25 21:30:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(messages): fixed message search with translate string issue

Browse Source
This commit is contained in:
OldHawk
2017-12-18 18:01:09 +08:00
parent 3b2f3e5100
commit 3ce345cbc1
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/messages/client/controllers/messages.client.controller.js
View File

@@ -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

13
modules/messages/client/views/box.client.view.html
View File

@@ -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>