diff --git a/config/env/torrents.js b/config/env/torrents.js
index 971adbd3..45869176 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -39,6 +39,7 @@ module.exports = {
*
* @supportGroupName: site support group name, user can send message to this group
* @supportGroupNameDesc: desc of support group name, value of translate string
+ * @supportMailAddress: support group mail address
* @mailTicketSupportService: settings mailTicketSupportService status, true is enable, false is disable
* @messageTicketSupportService: settings messageTicketSupportService status, true is enable, false is disable
*
@@ -49,6 +50,7 @@ module.exports = {
support: {
supportGroupName: 'Support',
supportGroupNameDesc: 'SUPPORT_GROUP_NAME_DESC',
+ supportMailAddress: 'support@mean.im',
mailTicketSupportService: false,
messageTicketSupportService: true
},
diff --git a/modules/about/client/controllers/about.client.controller.js b/modules/about/client/controllers/about.client.controller.js
index b117d6a8..c5f9e06f 100644
--- a/modules/about/client/controllers/about.client.controller.js
+++ b/modules/about/client/controllers/about.client.controller.js
@@ -87,6 +87,9 @@
user: vm.user
});
+
+ tmp = $filter('translate')(tmp);
+
return marked(tmp, {sanitize: false});
};
diff --git a/modules/about/client/templates/uploader-rules-en.md b/modules/about/client/templates/uploader-rules-en.md
index c4760502..4080bdd6 100644
--- a/modules/about/client/templates/uploader-rules-en.md
+++ b/modules/about/client/templates/uploader-rules-en.md
@@ -7,7 +7,7 @@
#### :white_small_square: Upload torrents
1. We advocate free sharing of resources, but do not upload archived files with passwords anytime, anywhere, and administrators will delete them directly and give them a penalty.
1. Do not upload any documents that violate the local laws and regulations at any time. The administrator will directly delete and give **stricken punishment**.
-1. Any file uploaded must pay attention to the specification of the file name, otherwise it will be deleted and punished directly by management. For specific specifications, please refer to the related topics of the forum or to [Support Service Center](mailto:%(appConfig.admin)s) ask questions.
+1. Any file uploaded must pay attention to the specification of the file name, otherwise it will be deleted and punished directly by management. For specific specifications, please refer to the related topics of the forum or contact our {{'%(supportConfig.supportGroupNameDesc)s' | translate}} by **[Message](/messages/send?to=%(supportConfig.supportGroupName)s)** or **[Email](mailto: %(supportConfig.supportMailAddress)s)** to ask questions.
1. It is forbidden to publish torrent resources in forums or other places where individual opinions can be expressed.
1. After the torrent is uploaded, it will not be immediately displayed in the list unless it is reviewed by the administrator or the administrator has given you upload permission to upload directly.
1. Any torrents you uploaded, administrators can set more additional attributes, such as recommended levels, sales levels, resource tags, and so on.
@@ -15,13 +15,13 @@
1. After the torrent is released successfully, the system will give a certain scores reward. Similarly, when the torrent is deleted, the reward scores will be deducted. [User score rules detail is here](/about/manual/scoreRules).
1. It is forbidden to upload images and texts that are not related to the content of the resources in the seed description area.
1. Unauthorized commercial promotion in any area is strictly prohibited.
-1. If you have 0-day resources or superb repression skills, please do not hesitate to [contact us immediately](mailto: %(appConfig.admin)s).
+1. If you have 0-day resources or superb repression skills, please do not hesitate to please contact our {{'%(supportConfig.supportGroupNameDesc)s' | translate}} by **[Message](/messages/send?to=%(supportConfig.supportGroupName)s)** or **[Email](mailto: %(supportConfig.supportMailAddress)s)**.
#### :white_small_square: Upload subtitles
1. Any user can upload subtitle files on the Seed Details page.
-1. Please comply with the naming conventions for subtitle files. Otherwise, they will be deleted and punished directly by management. For specific specifications, please refer to the relevant topics of the forum or ask the [Support Service Center](mailto:%(appConfig.admin)s).
+1. Please comply with the naming conventions for subtitle files. Otherwise, they will be deleted and punished directly by management. For specific specifications, please refer to the relevant topics of the forum or ask the {{'%(supportConfig.supportGroupNameDesc)s' | translate}} by **[Message](/messages/send?to=%(supportConfig.supportGroupName)s)** or **[Email](mailto: %(supportConfig.supportMailAddress)s)**.
1. Please do not upload subtitle files that have nothing to do with the current resource or do not match. Otherwise, they will be deleted and punished by management.
1. After the subtitle file is released successfully, the system will give a certain scores reward. Similarly, when the subtitle file is deleted, the reward scores will be deducted. [User score rules detail is here](/about/manual/scoreRules).
diff --git a/modules/about/client/templates/uploader-rules-zh.md b/modules/about/client/templates/uploader-rules-zh.md
index 63b62a1c..357bec5c 100644
--- a/modules/about/client/templates/uploader-rules-zh.md
+++ b/modules/about/client/templates/uploader-rules-zh.md
@@ -7,7 +7,7 @@
#### :white_small_square: 发布种子
1. 我们主张自由的分享资源，但任何时间任何地点都不要上传带有密码的压缩包文件，管理员发现后会直接删除并给予处罚。
1. 任何时候都不要上传有违反当地法律法规的任何文件，管理员发现后会直接删除并给予 **严厉处罚**。
-1. 上传的任何文件都要注意文件名的规范，否则会被管理直接删除并给予处罚，具体的规范请查阅论坛的相关主题或是向 [客户服务中心](mailto:%(appConfig.admin)s) 提问。
+1. 上传的任何文件都要注意文件名的规范，否则会被管理直接删除并给予处罚，具体的规范请查阅论坛的相关主题或是向{{'%(supportConfig.supportGroupNameDesc)s' | translate}}发送 **[消息](/messages/send?to=%(supportConfig.supportGroupName)s)** 或 **[邮件](mailto: %(supportConfig.supportMailAddress)s)** 提问。
1. 禁止在论坛或其它可以发表个人意见的地方发布种子资源。
1. 种子发布后，不会在列表中立即显示，除非经过管理员审核或者管理员赋予您上传直接通过的上传权限。
1. 您上传的任何种子，管理员都可以对其设置更多的附加属性，比如推荐级别、促销级别、资源标签等。
@@ -15,14 +15,14 @@
1. 种子发布成功后，系统会给予一定的积分奖励，同样，种子被删除时，奖励的积分会被扣除，具体的 [积分细则请看这里](/about/manual/scoreRules)。
1. 严禁在种子描述区域内上传与资源内容无关的图片和文字。
1. 严禁在任何区域进行未经许可的商业推广行为。
-1. 如果您有0-day资源途径或者高超的压制本领，请不要迟疑立即 [与我们联系](mailto: %(appConfig.admin)s)。
+1. 如果您有0-day资源途径或者高超的压制本领，请不要迟疑立即向{{'%(supportConfig.supportGroupNameDesc)s' | translate}}发送 **[消息](/messages/send?to=%(supportConfig.supportGroupName)s)** 或 **[邮件](mailto: %(supportConfig.supportMailAddress)s)** 与我们联系。
#### :white_small_square: 发布字幕
1. 任何用户都可以在种子详情页面上传字幕文件。
-1. 请遵守字幕文件的命名规范，否则会被管理直接删除并给予处罚，具体的规范请查阅论坛的相关主题或是向 [客户服务中心](mailto:%(appConfig.admin)s) 提问。
+1. 请遵守字幕文件的命名规范，否则会被管理直接删除并给予处罚，具体的规范请查阅论坛的相关主题或是向{{'%(supportConfig.supportGroupNameDesc)s' | translate}}发送 **[消息](/messages/send?to=%(supportConfig.supportGroupName)s)** 或 **[邮件](mailto: %(supportConfig.supportMailAddress)s)** 提问。
1. 请不要上传与当前资源无关或不匹配的字幕文件，否则会被管理直接删除并给予处罚。
1. 字幕发布成功后，系统会给予一定的积分奖励，同样，字幕被删除时，奖励的积分会被扣除，具体的 [积分细则请看这里](/about/manual/scoreRules)。
diff --git a/modules/about/client/templates/user-rules-en.md b/modules/about/client/templates/user-rules-en.md
index df67a347..0e22ae4b 100644
--- a/modules/about/client/templates/user-rules-en.md
+++ b/modules/about/client/templates/user-rules-en.md
@@ -2,7 +2,7 @@
---
First, we look forward to and welcome your joining!
-**%(appConfig.name)s** is a private resource sharing platform. You have to register to access. Before doing anything in %(appConfig.name)s s, the management group recommends that you read the rules of the site carefully, while the management group has the right to further explain or modify the rules, and the management group keeps the undefined part of the rules, but it is obviously harmful to the right to conduct the behavior of the site. If you have any suggestions or comments on rules, you are welcome to directly contact [management group](mailto:%(appConfig.admin)s) or put forward in the station forum.
+**%(appConfig.name)s** is a private resource sharing platform. You have to register to access. Before doing anything in %(appConfig.name)s s, the management group recommends that you read the rules of the site carefully, while the management group has the right to further explain or modify the rules, and the management group keeps the undefined part of the rules, but it is obviously harmful to the right to conduct the behavior of the site. If you have any suggestions or comments on rules, you are welcome to directly contact our {{'%(supportConfig.supportGroupNameDesc)s' | translate}} by **[Message](/messages/send?to=%(supportConfig.supportGroupName)s)** or **[Email](mailto: %(supportConfig.supportMailAddress)s)** or put forward in the station forum.
diff --git a/modules/about/client/templates/user-rules-zh.md b/modules/about/client/templates/user-rules-zh.md
index 6151ccb2..04f3cc93 100644
--- a/modules/about/client/templates/user-rules-zh.md
+++ b/modules/about/client/templates/user-rules-zh.md
@@ -2,7 +2,7 @@
---
首先，我们期待并欢迎您的加入！
-**%(appConfig.name)s** 是一个私有的资源分享平台，您必须注册才能访问。在 %(appConfig.name)s 做任何事情之前，管理组都建议您仔细阅读站点的各项规则，同时，管理组对规则拥有对规则进一步解释或修改的权利，管理组保留规则中未明确规定的部分，但显然有害于网站的行为进行处理的权利。如果您对规则有任何建议或意见，欢迎您直接 [联系管理组](mailto:%(appConfig.admin)s) 或在站内论坛提出。
+**%(appConfig.name)s** 是一个私有的资源分享平台，您必须注册才能访问。在 %(appConfig.name)s 做任何事情之前，管理组都建议您仔细阅读站点的各项规则，同时，管理组对规则拥有对规则进一步解释或修改的权利，管理组保留规则中未明确规定的部分，但显然有害于网站的行为进行处理的权利。如果您对规则有任何建议或意见，欢迎您向{{'%(supportConfig.supportGroupNameDesc)s' | translate}}发送 **[消息](/messages/send?to=%(supportConfig.supportGroupName)s)** 或 **[邮件](mailto: %(supportConfig.supportMailAddress)s)** 或在站内论坛提出。
diff --git a/modules/about/client/templates/vip-detail-rules-en.md b/modules/about/client/templates/vip-detail-rules-en.md
index db5d8a5f..29ccc9de 100644
--- a/modules/about/client/templates/vip-detail-rules-en.md
+++ b/modules/about/client/templates/vip-detail-rules-en.md
@@ -25,4 +25,4 @@
1. VIP users in the station only accept donations, if you want to join our VIP club, [click here to join](/vip/rules)。
1. After your VIP identity is confirmed successfully, you will receive notification message sent automatically by the system.
1. The VIP status is calculated on a monthly basis. Upon expiration, the VIP status automatically becomes an ordinary user and no longer enjoys all the rights of VIP users.
-1. For additional help, please [send us an email](mailto:%(appConfig.admin)s) and we will send someone to serve you.
\ No newline at end of file
+1. For additional help, please contact our {{'%(supportConfig.supportGroupNameDesc)s' | translate}} by **[Message](/messages/send?to=%(supportConfig.supportGroupName)s)** or **[Email](mailto: %(supportConfig.supportMailAddress)s)** and we will send someone to serve you.
\ No newline at end of file
diff --git a/modules/about/client/templates/vip-detail-rules-zh.md b/modules/about/client/templates/vip-detail-rules-zh.md
index ee385308..0bce76aa 100644
--- a/modules/about/client/templates/vip-detail-rules-zh.md
+++ b/modules/about/client/templates/vip-detail-rules-zh.md
@@ -25,4 +25,4 @@
1. 站内 VIP 用户只接受捐赠加入，如果您想加入我们的 VIP 俱乐部，[请点这里加入](/vip/rules)。
1. 当您的 VIP 身份确认成功后，会收到系统自动发送的站内确认消息通知。
1. VIP 身份按月计算，期满后，自动变成普通用户身份，不再享受 VIP 用户的所有权益。
-1. 如需其它帮助, 请 [给我们发邮件](mailto:%(appConfig.admin)s)，我们将派专人为您服务。
\ No newline at end of file
+1. 如需其它帮助, 请向{{'%(supportConfig.supportGroupNameDesc)s' | translate}}发送 **[消息](/messages/send?to=%(supportConfig.supportGroupName)s)** 或 **[邮件](mailto: %(supportConfig.supportMailAddress)s)**，我们将派专人为您服务。
\ No newline at end of file
diff --git a/modules/about/client/views/black.client.view.html b/modules/about/client/views/black.client.view.html
index ff6a0e50..69fb0020 100644
--- a/modules/about/client/views/black.client.view.html
+++ b/modules/about/client/views/black.client.view.html
@@ -9,7 +9,8 @@
diff --git a/modules/about/client/views/operlist.client.view.html b/modules/about/client/views/operlist.client.view.html
index 3015279f..8b9a1f86 100644
--- a/modules/about/client/views/operlist.client.view.html
+++ b/modules/about/client/views/operlist.client.view.html
@@ -9,7 +9,8 @@
diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index 8b4244b7..21cf4305 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -25,7 +25,7 @@
BTN_REMOVE: 'Remove',
//Support
- SUPPORT_GROUP_NAME_DESC: 'Service Group',
+ SUPPORT_GROUP_NAME_DESC: 'Management group',
CLIENT_BLOCK_REASON: {
NON_BT_CLIENT: 'Non BT client software'
},
@@ -372,7 +372,7 @@
},
MY_TORRENT_RULES: {
0: 'This torrent file is uploaded by yourself, you have actions bellow.',
- 1: 'For additional assistance, please contact our administrator.'
+ 1: 'For additional assistance, please contact our {{sNameDesc | translate}} by Message or Email.'
},
TORRENT_SEED_USERS: 'Seed Users',
TORRENT_LEECHER_USERS: 'Leecher Users',
@@ -632,14 +632,14 @@
MENU_ABOUT_MANUAL_FAQ: 'FAQ',
CLIENT_BLACK_LIST: 'Client Black List',
MAKER_GROUP: 'Torrents Maker Group',
- BLACK_TOOLTIP: 'Note:
All the clients in the list was forbidden by server and can not announce or get any torrent data, For more help, please contact our administrator.',
+ BLACK_TOOLTIP: 'Note:
All the clients in the list was forbidden by server and can not announce or get any torrent data, For more help, please contact our {{sNameDesc | translate}} by Message or Email.',
FORM_MAKER_NAME: 'Maker Group Name',
FORM_MAKER_DESC: 'Maker Group Description',
FORM_MAKER_FOR: 'Create maker group for - {{name}}',
MAKER_CREATE_SUCCESSFULLY: 'Create maker group successfully',
MAKER_CREATE_FAILED: 'Create maker group failed',
OPER_LIST: 'Admin and Oper List',
- OPER_LIST_TOOLTIP: 'Note:
All the users in the list was the Administrator or Operator of {{site}}, If you need any help, please mailto our administrator or send a message to them from below.',
+ OPER_LIST_TOOLTIP: 'Note:
All the users in the list was the Administrator or Operator of {{site}}, If you need any help, please contact our {{sNameDesc | translate}} by Message or Email or send a message to them from below.',
MAKER_LIST_TOOLTIP: 'All the torrent maker group in the list was the official group of {{site}}, Thanks to the contributions of these groups. If you want to join one of these groups, send the station message to the group founder.',
GROUP_FOUNDER: 'Founder: ',
BTN_EDIT_DESC: 'Edit Desc',
@@ -812,7 +812,7 @@
COMMENT_REMOVE_SUCCESS: 'Comment removed successfully!',
COMMENT_REMOVE_ERROR: 'Comment removed failed!',
DESC_LIST: '### NOTE: \n - The list contains only the last `{{days}}` days of the requests. \n - If your response is accepted, the requestor\'s reward score will be automatically transferred to your account. \n - Only the torrents reviewed by the administrator can be accepted by the requestor. \n - The requester can only accept one of the responses. \n - If your response is complains, your account may be punished, Please respond to the user\'s request carefully.',
- DESC_MY: '### NOTE: \n - If you accept a response, your reward score will be transferred to the respondent\'s account that you accept. \n - Only the torrents reviewed by the administrator can be accepted by you. \n - You can only accept one of the responses. \n - The request over `{{days}}` days has expired and cannot accept the response, you can only post the request again. \n - If your score is maliciously damaged, please mail to the [administrator](mailto:{{admin}})',
+ DESC_MY: '### NOTE: \n - If you accept a response, your reward score will be transferred to the respondent\'s account that you accept. \n - Only the torrents reviewed by the administrator can be accepted by you. \n - You can only accept one of the responses. \n - The request over `{{days}}` days has expired and cannot accept the response, you can only post the request again. \n - If your score is maliciously damaged, Please contact our {{sNameDesc | translate}} by **[Message](/messages/send?to={{sName}})** or **[Email](mailto:{{sMail}})** to complaints.',
DESC_ADD: '### NOTE: \n - Each request will be automatically deducted from `{{add_score}}` points, but your reward score will only be transferred to the responder\'s account that you eventually accept. \n - Only the torrents reviewed by the administrator can be accepted by you. \n - Each request is only valid for `{{days}}` days. After expiry, you can only post the request again. \n - Please give a clear resources description of your request when you post the request.',
DESC_RES: '### NOTE: \n - If requestor accept your response, the reward score will be transferred to your account. \n - Only the torrents reviewed by the administrator can be accepted by requestor. \n - Requestor can only accept one of the responses.',
DESC_VIEW: '### NOTE: \n - If you want to response a request, please upload the torrent file and seed, Please respond to the user\'s request carefully. \n - If you are a requestor, you can choose a responder and accept it, and only the torrents reviewed by the administrator can be accepted. \n - If you accept a response, your reward score will be transferred to the respondent\'s account that you accept. \n - The request over `{{days}}` days has expired and cannot accept or response(upload).'
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index d850d3fd..e7a5834a 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -25,7 +25,7 @@
BTN_REMOVE: '删除',
//Support
- SUPPORT_GROUP_NAME_DESC: '客户服务支持组',
+ SUPPORT_GROUP_NAME_DESC: '管理组',
CLIENT_BLOCK_REASON: {
NON_BT_CLIENT: '非BT客户端软件'
},
@@ -372,7 +372,7 @@
},
MY_TORRENT_RULES: {
0: '这个种子文件是由你自己上传的，你可以对其做如下操作.',
- 1: '如需其它帮助，请与我们的 系统管理员 联系.'
+ 1: '如需其它帮助，请给{{sNameDesc | translate}}发送 消息 或 邮件.'
},
TORRENT_SEED_USERS: '做种用户列表',
TORRENT_LEECHER_USERS: '下载用户列表',
@@ -632,14 +632,14 @@
MENU_ABOUT_MANUAL_FAQ: '问题解答',
CLIENT_BLACK_LIST: '禁止客户端列表',
MAKER_GROUP: '资源压制小组',
- BLACK_TOOLTIP: '提示:
下面列出的所有客户端都已被服务器禁止，使用它们将不能下载到任何数据, 如需其它帮助，请与我们的 系统管理员 联系.',
+ BLACK_TOOLTIP: '提示:
下面列出的所有客户端都已被服务器禁止，使用它们将不能下载到任何数据, 如需其它帮助，请给{{sNameDesc | translate}}发送 消息 或 邮件.',
FORM_MAKER_NAME: '资源压制小组名称',
FORM_MAKER_DESC: '资源压制小组简介',
FORM_MAKER_FOR: '创建资源压制小组 - {{name}}',
MAKER_CREATE_SUCCESSFULLY: '资源压制小组创建成功',
MAKER_CREATE_FAILED: '资源压制小组创建失败',
OPER_LIST: 'Admin & Oper 列表',
- OPER_LIST_TOOLTIP: '提示:
下面列出的所有用户都是 {{site}} 站点的 Administrator 或 Operator, 如果你需要帮助, 请向我们的 系统管理员 发送邮件或向下面列出的管理员发送站内消息.',
+ OPER_LIST_TOOLTIP: '提示:
下面列出的所有用户都是 {{site}} 站点的 Administrator 或 Operator, 如果你需要帮助, 请给{{sNameDesc | translate}}发送 消息 或 邮件 或者向下面列出的管理员直接发送站内消息.',
MAKER_LIST_TOOLTIP: '下面列出的所有资源压制小组都是入驻 {{site}} 的官方小组, 感谢这些压制小组对站点做出的贡献, 如果您想加入其中的小组, 请向小组创始人发送站内消息并欢迎您成为其中的一份子.',
GROUP_FOUNDER: '创始人: ',
BTN_EDIT_DESC: '编辑简介',
@@ -812,7 +812,7 @@
COMMENT_REMOVE_SUCCESS: '评论删除成功!',
COMMENT_REMOVE_ERROR: '评论删除失败!',
DESC_LIST: '### 提示: \n - 此列表只包含最近 `{{days}}` 天内发布的求种请求. \n - 如果你的回应被采纳, 请求者悬赏的积分将自动转入你的帐户. \n - 只有被管理员审核通过的种子才能被请求者接受. \n - 请求者只能接受多个响应中的一个. \n - 如果你的响应被请求者投诉，你的帐号就可能会受到惩罚, 请认真响应用户的请求.',
- DESC_MY: '### 提示: \n - 如果您接受一个响应, 你的悬赏积分就会转入你接受的响应者的帐户. \n - 只有被管理员审核通过的种子才能被您接受. \n - 您只能接受多个响应中的一个. \n - 超过 `{{days}}` 天的请求已经过期且不能接受响应, 如果需要你只能再次发起请求. \n - 如果您的积分受到恶意损害, 请向管理员[投诉](mailto:{{admin}}).',
+ DESC_MY: '### 提示: \n - 如果您接受一个响应, 你的悬赏积分就会转入你接受的响应者的帐户. \n - 只有被管理员审核通过的种子才能被您接受. \n - 您只能接受多个响应中的一个. \n - 超过 `{{days}}` 天的请求已经过期且不能接受响应, 如果需要你只能再次发起请求. \n - 如果您的积分受到恶意损害, 请给{{sNameDesc | translate}}发送 **[消息](/messages/send?to={{sName}})** 或 **[邮件](mailto:{{sMail}})** 进行投诉.',
DESC_ADD: '### 提示: \n - 每发布一个请求会被自动扣除 `{{add_score}}` 积分, 而你的悬赏积分会转入你最终接受的响应者的帐户. \n - 只有被管理员审核通过的种子才能被您接受. \n - 每一个发布的请求只有 `{{days}}` 天的有效期, 过期后你只能再次发起请求. \n - 请在发布请求时明确描述您对资源的要求.',
DESC_RES: '### NOTE: \n - 如果请求者接受了您的响应, 悬赏积分将自动转入您的帐户. \n - 只有被管理员审核通过的种子才能被请求者接受. \n - 请求者只会接受多个响应中的一个.',
DESC_VIEW: '### NOTE: \n - 如果你是一个响应者, 请上传您的种子文件并开始做种, 请认真响应用户的请求. \n - 如果你是一个请求者, 您可以选择一个响应并接受它, 只有被管理员审核通过的种子才能被您接受. \n - 如果您接受一个响应, 你的悬赏积分就会转入你接受的响应者的帐户. \n - 超过 `{{days}}` 天的请求已经过期且不能接受响应或上传种子.'
diff --git a/modules/requests/client/controllers/requests-my.client.controller.js b/modules/requests/client/controllers/requests-my.client.controller.js
index 5b6164c5..940fab6b 100644
--- a/modules/requests/client/controllers/requests-my.client.controller.js
+++ b/modules/requests/client/controllers/requests-my.client.controller.js
@@ -15,6 +15,7 @@
vm.itemsPerPageConfig = MeanTorrentConfig.meanTorrentConfig.itemsPerPage;
vm.requestsConfig = MeanTorrentConfig.meanTorrentConfig.requests;
vm.appConfig = MeanTorrentConfig.meanTorrentConfig.app;
+ vm.supportConfig = MeanTorrentConfig.meanTorrentConfig.support;
vm.show_desc_help = localStorageService.get('requests_my_show_help') || 'yes';
/**
@@ -24,7 +25,9 @@
vm.getRequestsDesc = function () {
var ts = $translate.instant('REQUESTS.DESC_MY', {
days: vm.requestsConfig.requestExpires / (60 * 60 * 1000 * 24),
- admin: vm.appConfig.admin
+ sMail: vm.supportConfig.supportMailAddress,
+ sNameDesc: vm.supportConfig.supportGroupNameDesc,
+ sName: vm.supportConfig.supportGroupName
});
return marked(ts, {sanitize: true});
diff --git a/modules/requests/client/controllers/requests-res.client.controller.js b/modules/requests/client/controllers/requests-res.client.controller.js
index a30cd6c2..6277f41c 100644
--- a/modules/requests/client/controllers/requests-res.client.controller.js
+++ b/modules/requests/client/controllers/requests-res.client.controller.js
@@ -15,6 +15,7 @@
vm.itemsPerPageConfig = MeanTorrentConfig.meanTorrentConfig.itemsPerPage;
vm.requestsConfig = MeanTorrentConfig.meanTorrentConfig.requests;
vm.appConfig = MeanTorrentConfig.meanTorrentConfig.app;
+ vm.supportConfig = MeanTorrentConfig.meanTorrentConfig.support;
vm.show_desc_help = localStorageService.get('requests_res_show_help') || 'yes';
/**
@@ -24,7 +25,9 @@
vm.getRequestsDesc = function () {
var ts = $translate.instant('REQUESTS.DESC_RES', {
days: vm.requestsConfig.requestExpires / (60 * 60 * 1000 * 24),
- admin: vm.appConfig.admin
+ sMail: vm.supportConfig.supportMailAddress,
+ sNameDesc: vm.supportConfig.supportGroupNameDesc,
+ sName: vm.supportConfig.supportGroupName
});
return marked(ts, {sanitize: true});
diff --git a/modules/systems/client/controllers/systems-config.client.controller.js b/modules/systems/client/controllers/systems-config.client.controller.js
index 9929e111..03c38510 100644
--- a/modules/systems/client/controllers/systems-config.client.controller.js
+++ b/modules/systems/client/controllers/systems-config.client.controller.js
@@ -15,6 +15,7 @@
vm.selectedFilename = 'null';
vm.shellCommandConfig = MeanTorrentConfig.meanTorrentConfig.shellCommand;
vm.appConfig = MeanTorrentConfig.meanTorrentConfig.app;
+ vm.supportConfig = MeanTorrentConfig.meanTorrentConfig.support;
vm.scoreConfig = MeanTorrentConfig.meanTorrentConfig.score;
vm.announce = MeanTorrentConfig.meanTorrentConfig.announce;
vm.rssConfig = MeanTorrentConfig.meanTorrentConfig.rss;
@@ -235,6 +236,7 @@
vm.getMarkedConfigContent = function () {
var tmp = $filter('fmt')(vm.systemConfigContentValue, {
appConfig: vm.appConfig,
+ supportConfig: vm.supportConfig,
announceConfig: vm.announce,
scoreConfig: vm.scoreConfig,
rssConfig: vm.rssConfig,
@@ -253,6 +255,8 @@
user: vm.user
});
+
+ tmp = $filter('translate')(tmp);
return marked(tmp, {sanitize: false});
};
diff --git a/modules/torrents/client/controllers/torrent-info.client.controller.js b/modules/torrents/client/controllers/torrent-info.client.controller.js
index fb114f06..a0e5534e 100644
--- a/modules/torrents/client/controllers/torrent-info.client.controller.js
+++ b/modules/torrents/client/controllers/torrent-info.client.controller.js
@@ -21,6 +21,7 @@
vm.RTS = ResourcesTagsServices;
vm.announce = MeanTorrentConfig.meanTorrentConfig.announce;
vm.appConfig = MeanTorrentConfig.meanTorrentConfig.app;
+ vm.supportConfig = MeanTorrentConfig.meanTorrentConfig.support;
vm.tmdbConfig = MeanTorrentConfig.meanTorrentConfig.tmdbConfig;
vm.imdbConfig = MeanTorrentConfig.meanTorrentConfig.imdbConfig;
vm.resourcesTags = MeanTorrentConfig.meanTorrentConfig.resourcesTags;
diff --git a/modules/torrents/client/controllers/uploads.client.controller.js b/modules/torrents/client/controllers/uploads.client.controller.js
index 0e56ffad..7b7cd753 100644
--- a/modules/torrents/client/controllers/uploads.client.controller.js
+++ b/modules/torrents/client/controllers/uploads.client.controller.js
@@ -83,6 +83,9 @@
user: vm.user
});
+
+ tmp = $filter('translate')(tmp);
+
return marked(tmp, {sanitize: false});
};
diff --git a/modules/torrents/client/templates/upload-rules-en.md b/modules/torrents/client/templates/upload-rules-en.md
index 380dad56..78f57851 100644
--- a/modules/torrents/client/templates/upload-rules-en.md
+++ b/modules/torrents/client/templates/upload-rules-en.md
@@ -3,4 +3,4 @@
1. If you selected resource type with `Movie` or `TVSerial`, the torrent TMDB_ID must be `TheMovieDB` resources ID, you can [find the ID from here](%(tmdbConfig.tmdbHome)s), then the resources detail info can be autoload, if everything looks good, hit submit.
1. Select one or more tags that match the resources, which will play a significant role in your search results.
1. After the submission of documents, may be approved by the management, the rules do not meet the seeds will be deleted directly.
-1. For additional assistance, please contact our administrator: [%(appConfig.admin)s](mailto:%(appConfig.admin)s).
\ No newline at end of file
+1. For additional assistance, please contact our {{'%(supportConfig.supportGroupNameDesc)s' | translate}} by **[Message](/messages/send?to=%(supportConfig.supportGroupName)s)** or **[Email](mailto: %(supportConfig.supportMailAddress)s)**.
\ No newline at end of file
diff --git a/modules/torrents/client/templates/upload-rules-zh.md b/modules/torrents/client/templates/upload-rules-zh.md
index 3816c5f1..8d7515c0 100644
--- a/modules/torrents/client/templates/upload-rules-zh.md
+++ b/modules/torrents/client/templates/upload-rules-zh.md
@@ -3,4 +3,4 @@
1. 如果您选择的资源类型为`电影`或`电视剧`, 种子文件的 TMDB_ID 必须是 `TheMovieDB` 相对应的资源ID号, 您可以[从这里找到ID号](%(tmdbConfig.tmdbHome)s). 系统会自动载入资源的详细信息, 如无误可直接提交.
1. 请为资源选择匹配的一个或多个标签, 它会在您的搜索结果中发挥重大作用.
1. 种子文件提交后, 可能会由后台管理人员进行审批, 不符合规则的种子会被直接删除.
-1. 如需其它帮助, 请与我们的管理员联系: [%(appConfig.admin)s](mailto:%(appConfig.admin)s).
\ No newline at end of file
+1. 如需其它帮助, 请向{{'%(supportConfig.supportGroupNameDesc)s' | translate}}发送 **[消息](/messages/send?to=%(supportConfig.supportGroupName)s)** 或 **[邮件](mailto: %(supportConfig.supportMailAddress)s)**.
\ No newline at end of file
diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html
index 78b448dc..a9503b03 100644
--- a/modules/torrents/client/views/view-torrent.client.view.html
+++ b/modules/torrents/client/views/view-torrent.client.view.html
@@ -1004,7 +1004,8 @@
diff --git a/modules/users/client/controllers/authentication.client.controller.js b/modules/users/client/controllers/authentication.client.controller.js
index 76e72006..f19f790f 100644
--- a/modules/users/client/controllers/authentication.client.controller.js
+++ b/modules/users/client/controllers/authentication.client.controller.js
@@ -95,6 +95,9 @@
user: vm.authentication.user
});
+
+ tmp = $filter('translate')(tmp);
+
return marked(tmp, {sanitize: false});
};
diff --git a/modules/users/client/controllers/score/score.client.controller.js b/modules/users/client/controllers/score/score.client.controller.js
index 66a7303f..9f3c5fa5 100644
--- a/modules/users/client/controllers/score/score.client.controller.js
+++ b/modules/users/client/controllers/score/score.client.controller.js
@@ -88,6 +88,9 @@
user: vm.user
});
+
+ tmp = $filter('translate')(tmp);
+
return marked(tmp, {sanitize: false});
};
diff --git a/modules/users/client/controllers/status/warning.client.controller.js b/modules/users/client/controllers/status/warning.client.controller.js
index 215f5a6b..d367eaa5 100644
--- a/modules/users/client/controllers/status/warning.client.controller.js
+++ b/modules/users/client/controllers/status/warning.client.controller.js
@@ -75,6 +75,9 @@
user: vm.user
});
+
+ tmp = $filter('translate')(tmp);
+
return marked(tmp, {sanitize: false});
};
diff --git a/modules/vip/client/controllers/vip.client.controller.js b/modules/vip/client/controllers/vip.client.controller.js
index fe18e583..ba3271c5 100644
--- a/modules/vip/client/controllers/vip.client.controller.js
+++ b/modules/vip/client/controllers/vip.client.controller.js
@@ -85,6 +85,9 @@
user: vm.user
});
+
+ tmp = $filter('translate')(tmp);
+
return marked(tmp, {sanitize: false});
};
diff --git a/modules/vip/client/templates/pay-en.md b/modules/vip/client/templates/pay-en.md
index 44b08bc5..fbfeac4a 100644
--- a/modules/vip/client/templates/pay-en.md
+++ b/modules/vip/client/templates/pay-en.md
@@ -3,4 +3,4 @@
and clear the rights and obligations of members, if you continure donations, said you agree to these terms.
1. Choose a payment method from below to finish payment, then [send mail to the administrator](mailto:%(appConfig.admin)s) and comment in your account user ID,
We will manually change your vip status.
-1. If you need any other help, please [mail to us](mailto:%(appConfig.admin)s).
+1. If you need any other help, please contact our {{'%(supportConfig.supportGroupNameDesc)s' | translate}} by **[Message](/messages/send?to=%(supportConfig.supportGroupName)s)** or **[Email](mailto: %(supportConfig.supportMailAddress)s)**.
diff --git a/modules/vip/client/templates/pay-zh.md b/modules/vip/client/templates/pay-zh.md
index 03983829..6d156e0d 100644
--- a/modules/vip/client/templates/pay-zh.md
+++ b/modules/vip/client/templates/pay-zh.md
@@ -1,4 +1,4 @@
#### 注意:
1. 在捐赠前, 请认真阅读 %(appConfig.name)s 的[会员用户许可协议](/vip/rules)以明确会员用户的权利与义务, 如继续进行捐赠操作, 则表示您已完全同意这些条款.
1. 请从下面选择一种支付方式进行支付，支付完成后请[给管理员发送邮件](mailto:%(appConfig.admin)s)并注明站内的登陆ID, 我们将手动设置您的vip状态数据.
-1. 如需其它帮助, 请[给我们发邮件](mailto:%(appConfig.admin)s).
+1. 如需其它帮助, 请向{{'%(supportConfig.supportGroupNameDesc)s' | translate}}发送 **[消息](/messages/send?to=%(supportConfig.supportGroupName)s)** 或 **[邮件](mailto: %(supportConfig.supportMailAddress)s)**.
diff --git a/modules/vip/client/templates/vip-en.md b/modules/vip/client/templates/vip-en.md
index db5d8a5f..29ccc9de 100644
--- a/modules/vip/client/templates/vip-en.md
+++ b/modules/vip/client/templates/vip-en.md
@@ -25,4 +25,4 @@
1. VIP users in the station only accept donations, if you want to join our VIP club, [click here to join](/vip/rules)。
1. After your VIP identity is confirmed successfully, you will receive notification message sent automatically by the system.
1. The VIP status is calculated on a monthly basis. Upon expiration, the VIP status automatically becomes an ordinary user and no longer enjoys all the rights of VIP users.
-1. For additional help, please [send us an email](mailto:%(appConfig.admin)s) and we will send someone to serve you.
\ No newline at end of file
+1. For additional help, please contact our {{'%(supportConfig.supportGroupNameDesc)s' | translate}} by **[Message](/messages/send?to=%(supportConfig.supportGroupName)s)** or **[Email](mailto: %(supportConfig.supportMailAddress)s)** and we will send someone to serve you.
\ No newline at end of file
diff --git a/modules/vip/client/templates/vip-zh.md b/modules/vip/client/templates/vip-zh.md
index ee385308..0bce76aa 100644
--- a/modules/vip/client/templates/vip-zh.md
+++ b/modules/vip/client/templates/vip-zh.md
@@ -25,4 +25,4 @@
1. 站内 VIP 用户只接受捐赠加入，如果您想加入我们的 VIP 俱乐部，[请点这里加入](/vip/rules)。
1. 当您的 VIP 身份确认成功后，会收到系统自动发送的站内确认消息通知。
1. VIP 身份按月计算，期满后，自动变成普通用户身份，不再享受 VIP 用户的所有权益。
-1. 如需其它帮助, 请 [给我们发邮件](mailto:%(appConfig.admin)s)，我们将派专人为您服务。
\ No newline at end of file
+1. 如需其它帮助, 请向{{'%(supportConfig.supportGroupNameDesc)s' | translate}}发送 **[消息](/messages/send?to=%(supportConfig.supportGroupName)s)** 或 **[邮件](mailto: %(supportConfig.supportMailAddress)s)**，我们将派专人为您服务。
\ No newline at end of file