Homogenize folder and device state to 'Up to Date' (fixes #1042)

This commit is contained in:
Jakob Borg 2014-11-30 13:45:04 +01:00
parent 285b614927
commit a564510c49
2 changed files with 3 additions and 8 deletions

View File

@ -98,14 +98,11 @@
<span translate ng-switch-when="unshared">Unshared</span>
<span translate ng-switch-when="stopped">Stopped</span>
<span translate ng-switch-when="scanning">Scanning</span>
<span translate ng-switch-when="idle">Up to Date</span>
<span ng-switch-when="syncing">
<span translate>Syncing</span>
({{syncPercentage(folder.ID)}}%)
</span>
<span ng-switch-when="idle">
<span translate>Idle</span>
({{syncPercentage(folder.ID)}}%)
</span>
</span>
</h3>
</div>
@ -234,9 +231,7 @@
<h3 class="panel-title">
<identicon data-value="deviceCfg.DeviceID"></identicon>&emsp;{{deviceName(deviceCfg)}}
<span ng-switch="deviceStatus(deviceCfg)" class="pull-right hidden-xs text-{{deviceClass(deviceCfg)}}">
<span ng-switch-when="insync">
<span translate>Up to Date</span> (100%)
</span>
<span translate ng-switch-when="insync">Up to Date</span>
<span ng-switch-when="syncing">
<span translate>Syncing</span> ({{completion[deviceCfg.DeviceID]._total | number:0}}%)
</span>

File diff suppressed because one or more lines are too long