diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 5d14b3e5..5ac79c95 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -458,7 +458,7 @@ SEEDED: 'Torrents seeded', LEECHED: 'Torrents leeched', FINISHED: 'Torrents finished', - HNY_WARNING: 'H&R Warning', + HNR_WARNING: 'H&R Warning', FORUM_TOPICS: 'Forum topics', FORUM_REPLIES: 'Forum replies', DETAIL: 'Detail', @@ -490,6 +490,7 @@ REMOVE_WARNING_NO_ENOUGH_SCORE: 'ERROR: no enough score!', WARNING_TOOLTIP: 'You have {{wnumber}} H&R warnings, please deal with it immediately, ', WARNING_DETAIL_LINK: 'detail is here', + HNR_HAVE_NO_WARNING: 'Very good, you have no any H&R warnings.', //user score SCORE: { diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index 5bd66f12..f9a0bbe5 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -458,7 +458,7 @@ SEEDED: '正在做种', LEECHED: '正在下载', FINISHED: '下载完成', - HNY_WARNING: 'H&R 警告', + HNR_WARNING: 'H&R 警告', FORUM_TOPICS: '论坛主题数', FORUM_REPLIES: '论坛回复数', DETAIL: '详情', @@ -490,6 +490,7 @@ REMOVE_WARNING_NO_ENOUGH_SCORE: '错误: 积分不足!', WARNING_TOOLTIP: '您有 {{wnumber}} 个 H&R 警告, 请立即处理, ', WARNING_DETAIL_LINK: '查看详情', + HNR_HAVE_NO_WARNING: '很好, 您目前还没有 H&R 警告.', //user score SCORE: { diff --git a/modules/core/client/filter/filename.client.filter.js b/modules/core/client/filter/filename.client.filter.js index b29533aa..4a443866 100644 --- a/modules/core/client/filter/filename.client.filter.js +++ b/modules/core/client/filter/filename.client.filter.js @@ -1,15 +1,16 @@ (function () { 'use strict'; - // Focus the element on page load - // Unless the user is on a small device, because this could obscure the page with a keyboard - angular.module('core') .filter('filename', filename); function filename() { return function (fname) { - return fname.substr(0, fname.lastIndexOf('.')) || fname; + if (fname) { + return fname.substr(0, fname.lastIndexOf('.')) || fname; + } else { + return '-'; + } }; } }()); diff --git a/modules/invitations/client/views/admin/official.client.view.html b/modules/invitations/client/views/admin/official.client.view.html index b8bed6ee..32dcab15 100644 --- a/modules/invitations/client/views/admin/official.client.view.html +++ b/modules/invitations/client/views/admin/official.client.view.html @@ -75,8 +75,10 @@ popover-trigger="'mouseenter'" popover-placement="top-right" ng-mouseenter="vm.selectedUser=r.to_user"> - + + + +