Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-07-21 03:59:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(message): add maker group create finished server notice message

Browse Source 
message is in translate strings, support markdown and emoji

#20
This commit is contained in:
OldHawk
2017-12-15 22:05:18 +08:00
parent e4aec9a72f
commit 8ea21e8266
6 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/about/server/controllers/makers.server.controller.js
View File

@@ -12,7 +12,9 @@ var path = require('path'),
traceLogCreate = require(path.resolve('./config/lib/tracelog')).create;
var traceConfig = config.meanTorrentConfig.trace;
var appConfig = config.meanTorrentConfig.app;
var mtDebug = require(path.resolve('./config/lib/debug'));
var serverMessage = require(path.resolve('./config/lib/server-message'));
/**
* Create an maker
@@ -45,6 +47,9 @@ exports.create = function (req, res) {
}
});
//add server message
serverMessage.addMessage(user._id, 'TITLE_MAKER_CREATE', 'CONTENT_MAKER_CREATE', {maker_group_name: maker.name, site_name: appConfig.name});
//create trace log
traceLogCreate(req, traceConfig.action.OperCreateMakerGroup, {
user: user._id,

5
modules/core/client/app/trans-string-en.js
View File

@@ -1288,7 +1288,10 @@
//server message string
SERVER_MESSAGE: {
TITLE_VIP_CHANGED: 'Vip status changed',
CONTENT_VIP_CHANGED_ADD: 'Your vip status changed, now end at: {{vip_end_at | date: "yyyy-MM-dd HH:mm:ss"}}'
CONTENT_VIP_CHANGED_ADD: '### Welcome! \n Your vip status changed, now end at: **{{vip_end_at | date: "yyyy-MM-dd HH:mm"}}** :four_leaf_clover:',
TITLE_MAKER_CREATE: 'Maker group has created',
CONTENT_MAKER_CREATE: 'Administrator already created a maker group **-={{maker_group_name}}=-** for you, you are the group founder now, Thank you for your contribution on **{{site_name}}** :100:'
}
};

5
modules/core/client/app/trans-string-zh.js
View File

@@ -1288,7 +1288,10 @@
//server message string
SERVER_MESSAGE: {
TITLE_VIP_CHANGED: 'Vip 状态已改变',
CONTENT_VIP_CHANGED_ADD: '您的 Vip 状态已改变, 您的 Vip 将结束于: {{vip_end_at}}'
CONTENT_VIP_CHANGED_ADD: '### 恭喜！ \n 您的 Vip 状态已改变, 您的 Vip 将结束于: **{{vip_end_at | date: "yyyy-MM-dd HH:mm"}}** :four_leaf_clover:',
TITLE_MAKER_CREATE: '资源制作小组已建立',
CONTENT_MAKER_CREATE: '管理员已为您创建资源制作小组 **-={{maker_group_name}}=-** , 您现在是该小组的创建人, 感谢您为 **{{site_name}}** 所做的贡献! :100:'
}
};

3
modules/core/client/controllers/header.client.controller.js
View File

@@ -49,6 +49,9 @@
$scope.$on('auth-user-changed', function (event, args) {
vm.user = Authentication.user;
vm.scoreLevelData = vm.user ? ScoreLevelService.getScoreLevelJson(vm.user.score) : undefined;
vm.getInvitationsCount();
vm.getWarning();
vm.getCountUnread();
});
/**

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

@@ -378,6 +378,11 @@
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

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

@@ -161,10 +161,7 @@
<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"
translate="SERVER_MESSAGE.{{vm.selectedMessage.content.string}}"
translate-values="{{vm.selectedMessage.content.params}}"
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-reply" ng-if="vm.selectedMessage._replies.length>0">
<li class="status-divider"></li>