simon/AriaNg
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix spelling mistake

Browse source
This commit is contained in:
MaysWind 2017-03-19 15:43:41 +08:00
parent c684f72e23
commit c68c94d59a
6 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/index.html
View file

@ -237,11 +237,11 @@
ng-container="body" ng-placement="top" ng-trigger="click hover" ng-popover-class="global-status-chart">
<span class="realtime-speed">
<i class="icon-download fa fa-arrow-down"></i>
<span ng-bind="(globalStat.downloadSpeed | readableVolumn) + '/s'"></span>
<span ng-bind="(globalStat.downloadSpeed | readableVolume) + '/s'"></span>
</span>
<span class="realtime-speed">
<i class="icon-upload fa fa-arrow-up"></i>
<span ng-bind="(globalStat.uploadSpeed | readableVolumn) + '/s'"></span>
<span ng-bind="(globalStat.uploadSpeed | readableVolume) + '/s'"></span>
</span>
</a>
</div>
@ -327,7 +327,7 @@
<script src="scripts/filters/percent.js"></script>
<script src="scripts/filters/taskOrderBy.js"></script>
<script src="scripts/filters/taskStatus.js"></script>
<script src="scripts/filters/volumn.js"></script>
<script src="scripts/filters/volume.js"></script>
<script src="scripts/services/ariaNgCommonService.js"></script>
<script src="scripts/services/ariaNgFileService.js"></script>
<script src="scripts/services/ariaNgLanguageLoader.js"></script>

2
src/scripts/filters/volumn.js → src/scripts/filters/volume.js
View file

@ -1,7 +1,7 @@
(function () {
'use strict';
angular.module('ariaNg').filter('readableVolumn', ['$filter', function ($filter) {
angular.module('ariaNg').filter('readableVolume', ['$filter', function ($filter) {
var units = [ 'B', 'KB', 'MB', 'GB' ];
var defaultFractionSize = 2;

6
src/scripts/services/ariaNgMonitorService.js
View file

@ -33,8 +33,8 @@
}
var time = moment(params[0].name, 'X').format('HH:mm:ss');
var uploadSpeed = $filter('readableVolumn')(params[0].value) + '/s';
var downloadSpeed = $filter('readableVolumn')(params[1].value) + '/s';
var uploadSpeed = $filter('readableVolume')(params[0].value) + '/s';
var downloadSpeed = $filter('readableVolume')(params[1].value) + '/s';
return '<div>' + time + '</div>'
+ '<div><i class="icon-download fa fa-arrow-down"></i> ' + downloadSpeed +'</div>'
@ -53,7 +53,7 @@
type: 'value',
axisLabel: {
formatter: function (value) {
return $filter('readableVolumn')(value, 0);
return $filter('readableVolume')(value, 0);
}
}
},

8
src/scripts/services/ariaNgTitleService.js
View file

@ -30,8 +30,8 @@
var replacePlaceholder = function (title, context) {
var value = context.value;
if (context.type === 'volumn') {
value = $filter('readableVolumn')(value, context.scale);
if (context.type === 'volume') {
value = $filter('readableVolume')(value, context.scale);
}
if (context.prefix && !context.noprefix) {
@ -86,7 +86,7 @@
return replacePlaceholders(title, 'downspeed', {
prefix: $translate.instant('Download') + ': ',
value: value,
type: 'volumn',
type: 'volume',
suffix: '/s'
});
};
@ -95,7 +95,7 @@
return replacePlaceholders(title, 'upspeed', {
prefix: $translate.instant('Upload') + ': ',
value: value,
type: 'volumn',
type: 'volume',
suffix: '/s'
});
};

6
src/views/list.html
View file

@ -42,7 +42,7 @@
</label>
</div>
<div class="task-files">
<span ng-bind="task.totalLength | readableVolumn"></span>
<span ng-bind="task.totalLength | readableVolume"></span>
<a ng-href="#/task/detail/{{task.gid}}" title="{{'Click to view task detail' | translate}}">
<span ng-if="task.files" ng-bind="('format.settings.file-count' | translate: {count: task.selectedFileCount})"></span>
</a><i class="icon-error fa fa-times" ng-if="task && task.status == 'error' && task.errorDescription" title="{{task.errorDescription | translate}}"></i><i class="icon-seeder fa fa-arrow-up" ng-if="task && task.status == 'active' && task.seeder" title="{{'Seeding' | translate}}"></i>
@ -63,12 +63,12 @@
<span class="task-last-time"
ng-bind="task.status === 'waiting' ? '--:--:--' : (task.status === 'paused' ? '' : (task.status === 'active' ? ((0 <= task.remainTime && task.remainTime < 86400) ? (task.remainTime | dateDuration: 'second': 'HH:mm:ss') : ('More Than One Day' | translate)) : ''))"></span>
<span class="task-download-speed visible-xs-inline pull-right"
ng-bind="task.status === 'waiting' ? ('Waiting' | translate) : (task.status === 'paused' ? ('Paused' | translate) : (task.status === 'active' ? (!task.seeder || task.downloadSpeed > 0 ? (task.downloadSpeed | readableVolumn) + '/s' : '-') : ''))"></span>
ng-bind="task.status === 'waiting' ? ('Waiting' | translate) : (task.status === 'paused' ? ('Paused' | translate) : (task.status === 'active' ? (!task.seeder || task.downloadSpeed > 0 ? (task.downloadSpeed | readableVolume) + '/s' : '-') : ''))"></span>
<span class="task-seeders pull-right" ng-bind="task.status === 'active' ? ((task.numSeeders ? (task.numSeeders + '/') : '') + task.connections) : ''"></span>
</div>
</div>
<div class="col-md-2 col-sm-2 hidden-xs">
<span class="task-download-speed" ng-bind="task.status === 'waiting' ? ('Waiting' | translate) : (task.status === 'paused' ? ('Paused' | translate) : (task.status === 'active' ? (!task.seeder || task.downloadSpeed > 0 ? (task.downloadSpeed | readableVolumn) + '/s' : '-') : ''))"></span>
<span class="task-download-speed" ng-bind="task.status === 'waiting' ? ('Waiting' | translate) : (task.status === 'paused' ? ('Paused' | translate) : (task.status === 'active' ? (!task.seeder || task.downloadSpeed > 0 ? (task.downloadSpeed | readableVolume) + '/s' : '-') : ''))"></span>
</div>
</div>
</div>

12
src/views/task-detail.html
View file

@ -36,7 +36,7 @@
<span translate>Task Size</span>
</div>
<div class="setting-value col-sm-8">
<span ng-bind="task.totalLength | readableVolumn"></span>
<span ng-bind="task.totalLength | readableVolume"></span>
<a class="pointer-cursor" ng-if="task.files" ng-click="changeTab('filelist')">
<span ng-bind="('format.settings.file-count' | translate: {count: task.selectedFileCount})"></span>
</a>
@ -73,7 +73,7 @@
<span translate>Download</span>
</div>
<div class="setting-value col-sm-8">
<span ng-bind="(task.completedLength | readableVolumn) + (task.status == 'active' ? ' @ ' + (task.downloadSpeed | readableVolumn) + '/s' : '')"></span>
<span ng-bind="(task.completedLength | readableVolume) + (task.status == 'active' ? ' @ ' + (task.downloadSpeed | readableVolume) + '/s' : '')"></span>
</div>
</div>
<div class="row" ng-if="task && task.bittorrent">
@ -81,7 +81,7 @@
<span translate>Upload</span>
</div>
<div class="setting-value col-sm-8">
<span ng-bind="(task.uploadLength | readableVolumn) + (task.status == 'active' ? ' @ ' + (task.uploadSpeed | readableVolumn) + '/s' : '')"></span>
<span ng-bind="(task.uploadLength | readableVolume) + (task.status == 'active' ? ' @ ' + (task.uploadSpeed | readableVolume) + '/s' : '')"></span>
</div>
</div>
<div class="row" ng-if="task && task.bittorrent">
@ -240,7 +240,7 @@
</div>
</div>
<div class="col-sm-2">
<span class="task-size" ng-bind="file.length | readableVolumn"></span>
<span class="task-size" ng-bind="file.length | readableVolume"></span>
</div>
</div>
</div>
@ -305,9 +305,9 @@
<div class="col-md-3 col-sm-4 col-xs-8">
<div class="task-peer-download-speed">
<i class="icon-download fa fa-arrow-down"></i>
<span ng-bind="(peer.downloadSpeed | readableVolumn) + '/s'"></span>&nbsp;
<span ng-bind="(peer.downloadSpeed | readableVolume) + '/s'"></span>&nbsp;
<i class="icon-upload fa fa-arrow-up"></i>
<span ng-bind="(peer.uploadSpeed | readableVolumn) + '/s'"></span>
<span ng-bind="(peer.uploadSpeed | readableVolume) + '/s'"></span>
</div>
</div>
</div>