diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index 1fda36ff..1999e86a 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -79,6 +79,7 @@
INFO: 'Torrent info',
SIZE: 'Size',
SEEDS_LEECHERS_FINISHED: 'S/L/F',
+ SEEDS_LEECHERS: 'S/L',
PUBLISHER: 'Uploader',
ADMIN_TOOLS: 'Admin Tools',
LIFETIME: 'Life',
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index c0101312..e79c86b6 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -79,6 +79,7 @@
INFO: '种子信息',
SIZE: '大小',
SEEDS_LEECHERS_FINISHED: '上/下/完',
+ SEEDS_LEECHERS: '上/下',
PUBLISHER: '发布者',
ADMIN_TOOLS: '管理工具',
LIFETIME: '存活时间',
diff --git a/modules/core/client/controllers/home.client.controller.js b/modules/core/client/controllers/home.client.controller.js
index 007bc07b..ca0af91c 100644
--- a/modules/core/client/controllers/home.client.controller.js
+++ b/modules/core/client/controllers/home.client.controller.js
@@ -13,6 +13,7 @@
var vm = this;
vm.tmdbConfig = MeanTorrentConfig.meanTorrentConfig.tmdbConfig;
vm.appConfig = MeanTorrentConfig.meanTorrentConfig.app;
+ vm.announceConfig = MeanTorrentConfig.meanTorrentConfig.announce;
vm.movieTopOne = undefined;
vm.movieTopList = undefined;
diff --git a/modules/core/client/views/home.client.view.html b/modules/core/client/views/home.client.view.html
index 568202aa..cab2ea75 100644
--- a/modules/core/client/views/home.client.view.html
+++ b/modules/core/client/views/home.client.view.html
@@ -110,11 +110,11 @@
{{item.torrent_seeds}}
-
+ |
{{item.torrent_leechers}}
|
-
+ |
{{item.torrent_finished}}
|
@@ -165,11 +165,11 @@
{{nt.torrent_seeds}}
-
+ |
{{nt.torrent_leechers}}
|
-
+ |
{{nt.torrent_finished}}
|
@@ -318,11 +318,11 @@
{{item.torrent_seeds}}
-
+ |
{{item.torrent_leechers}}
|
-
+ |
{{item.torrent_finished}}
|
@@ -373,11 +373,11 @@
{{nt.torrent_seeds}}
-
+ |
{{nt.torrent_leechers}}
|
-
+ |
{{nt.torrent_finished}}
|
diff --git a/modules/forums/client/controllers/forums-topic.client.controller.js b/modules/forums/client/controllers/forums-topic.client.controller.js
index 2b15e531..70e2c603 100644
--- a/modules/forums/client/controllers/forums-topic.client.controller.js
+++ b/modules/forums/client/controllers/forums-topic.client.controller.js
@@ -12,6 +12,7 @@
marked, ModalConfirmService, $stateParams, TopicsService, localStorageService, $compile, RepliesService, $filter, Upload, DownloadService) {
var vm = this;
vm.forumsConfig = MeanTorrentConfig.meanTorrentConfig.forumsConfig;
+ vm.announce = MeanTorrentConfig.meanTorrentConfig.announce;
vm.scoreConfig = MeanTorrentConfig.meanTorrentConfig.score;
vm.itemsPerPageConfig = MeanTorrentConfig.meanTorrentConfig.itemsPerPage;
vm.appConfig = MeanTorrentConfig.meanTorrentConfig.app;
diff --git a/modules/forums/client/views/topic.client.view.html b/modules/forums/client/views/topic.client.view.html
index a7619058..9561d92e 100644
--- a/modules/forums/client/views/topic.client.view.html
+++ b/modules/forums/client/views/topic.client.view.html
@@ -72,7 +72,7 @@
-
+
({{vm.topic.user.uploaded | bytes}}
{{vm.topic.user.downloaded | bytes}}
)
@@ -154,7 +154,7 @@
-
+
({{rep.user.uploaded | bytes}}
{{rep.user.downloaded | bytes}}
)
diff --git a/modules/invitations/client/controllers/invitations.client.controller.js b/modules/invitations/client/controllers/invitations.client.controller.js
index 9691b985..9695b733 100644
--- a/modules/invitations/client/controllers/invitations.client.controller.js
+++ b/modules/invitations/client/controllers/invitations.client.controller.js
@@ -13,6 +13,7 @@
var vm = this;
vm.inviteConfig = MeanTorrentConfig.meanTorrentConfig.invite;
vm.user = Authentication.user;
+ vm.announce = MeanTorrentConfig.meanTorrentConfig.announce;
vm.invitePopover = {
title: 'INVITATION.TITLE_SEND',
diff --git a/modules/invitations/client/views/detail.client.view.html b/modules/invitations/client/views/detail.client.view.html
index f7533f90..e4c24c63 100644
--- a/modules/invitations/client/views/detail.client.view.html
+++ b/modules/invitations/client/views/detail.client.view.html
@@ -105,7 +105,8 @@
popover-trigger="'mouseenter'"
popover-placement="top-right"
ng-mouseenter="vm.selectedUser=r.to_user">
- {{r.to_user.username}}
+ {{r.to_user.username}}
|
@@ -136,17 +137,23 @@