refactor code
This commit is contained in:
parent
2dff6fd9c7
commit
244aac0f3a
|
@ -50,7 +50,6 @@
|
|||
"Remain Time": "剩余时间",
|
||||
"Download Speed": "下载速度",
|
||||
"Upload Speed": "上传速度",
|
||||
"Files": "个文件",
|
||||
"Overview": "总览",
|
||||
"Blocks": "区块信息",
|
||||
"File List": "文件列表",
|
||||
|
@ -83,7 +82,6 @@
|
|||
"Loading": "正在加载...",
|
||||
"More Than One Day": "超过1天",
|
||||
"Unknown": "未知",
|
||||
"Total Count": "共计",
|
||||
"Bytes": "字节",
|
||||
"Hours": "小时",
|
||||
"Minutes": "分",
|
||||
|
@ -114,7 +112,10 @@
|
|||
"time.minute": "{{value}} 分钟",
|
||||
"time.minutes": "{{value}} 分钟",
|
||||
"time.hour": "{{value}} 小时",
|
||||
"time.hours": "{{value}} 小时"
|
||||
"time.hours": "{{value}} 小时",
|
||||
"task.error-occurred": "发生错误 ({{errorcode}})",
|
||||
"settings.file-count": "({{count}} 个文件)",
|
||||
"settings.total-count": "(共计: {{count}}个)"
|
||||
},
|
||||
"options": {
|
||||
"dir.name": "下载路径",
|
||||
|
|
|
@ -54,7 +54,6 @@
|
|||
'Remain Time': 'Remain',
|
||||
'Download Speed': 'Download Speed',
|
||||
'Upload Speed': 'Upload Speed',
|
||||
'Files': 'Files',
|
||||
'Overview': 'Overview',
|
||||
'Blocks': 'Blocks',
|
||||
'File List': 'File List',
|
||||
|
@ -87,7 +86,6 @@
|
|||
'Loading': 'Loading...',
|
||||
'More Than One Day': 'More than 1 day',
|
||||
'Unknown': 'Unknown',
|
||||
'Total Count': 'Total Count',
|
||||
'Bytes': 'Bytes',
|
||||
'Hours': 'Hours',
|
||||
'Minutes': 'Minutes',
|
||||
|
@ -119,6 +117,9 @@
|
|||
'time.minutes': '{{value}} Minutes',
|
||||
'time.hour': '{{value}} Hour',
|
||||
'time.hours': '{{value}} Hours',
|
||||
'task.error-occurred': 'Error Occurred ({{errorcode}})',
|
||||
'settings.file-count': '({{count}} Files)',
|
||||
'settings.total-count': '(Total Count: {{count}})'
|
||||
},
|
||||
'options': {
|
||||
'dir.name': 'Download Path',
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
(function () {
|
||||
'use strict';
|
||||
|
||||
angular.module("ariaNg").filter('taskStatus', ['$translate', function ($translate) {
|
||||
angular.module("ariaNg").filter('taskStatus', function () {
|
||||
return function (task) {
|
||||
if (!task) {
|
||||
return '';
|
||||
|
@ -9,23 +9,23 @@
|
|||
|
||||
if (task.status == 'active') {
|
||||
if (task.seeder === true || task.seeder === 'true') {
|
||||
return $translate.instant('Seeding');
|
||||
return 'Seeding';
|
||||
} else {
|
||||
return $translate.instant('Downloading');
|
||||
return 'Downloading';
|
||||
}
|
||||
} else if (task.status == 'waiting') {
|
||||
return $translate.instant('Waiting');
|
||||
return 'Waiting';
|
||||
} else if (task.status == 'paused') {
|
||||
return $translate.instant('Paused');
|
||||
return 'Paused';
|
||||
} else if (task.status == 'complete') {
|
||||
return $translate.instant('Completed');
|
||||
return 'Completed';
|
||||
} else if (task.status == 'error') {
|
||||
return $translate.instant('Error Occurred') + (task.errorCode ? ' (' + task.errorCode + ')' : '');
|
||||
return (task.errorCode ? 'format.task.error-occurred' : 'Error Occurred');
|
||||
} else if (task.status == 'removed') {
|
||||
return $translate.instant('Removed');
|
||||
return 'Removed';
|
||||
} else {
|
||||
return '';
|
||||
}
|
||||
}
|
||||
}]);
|
||||
});
|
||||
})();
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
<div class="task-files">
|
||||
<span ng-bind="task.totalLength | readableVolumn"></span>
|
||||
<a ng-href="#/task/detail/{{task.gid}}">
|
||||
<span ng-bind="'(' + task.files.length + ' ' + ('Files' | translate) + ')'"></span>
|
||||
<span ng-if="task.files" ng-bind="('format.settings.file-count' | translate: {count: task.files.length})"></span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<i class="icon-primary fa fa-question-circle" data-toggle="tooltip" data-placement="right"
|
||||
title="{{option.descriptionKey | translate}}" ng-if="(option.descriptionKey | translate) != ''"></i>
|
||||
<span class="description" ng-if="option.showCount && option.split && optionValue"
|
||||
ng-bind="'(' + ('Total Count' | translate) + ': ' + getTotalCount() + ')'"></span>
|
||||
ng-bind="'format.settings.total-count' | translate: {count: getTotalCount()}"></span>
|
||||
</div>
|
||||
<div class="setting-value col-sm-8">
|
||||
<div ng-class="{'input-group': option.suffix}">
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
</div>
|
||||
<div class="setting-value col-sm-8">
|
||||
<span ng-bind="task.totalLength | readableVolumn"></span>
|
||||
<span ng-bind="'(' + task.files.length + ' ' + ('Files' | translate) + ')'"></span>
|
||||
<span ng-if="task.files" ng-bind="('format.settings.file-count' | translate: {count: task.files.length})"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row" ng-if="task">
|
||||
|
@ -45,7 +45,7 @@
|
|||
<span translate>Task Status</span>
|
||||
</div>
|
||||
<div class="setting-value col-sm-8">
|
||||
<span ng-bind="task | taskStatus"></span>
|
||||
<span ng-bind="task | taskStatus | translate: {errorcode: task.errorCode}"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row" ng-if="task && task.status == 'error' && task.errorMessage">
|
||||
|
|
Reference in a new issue