Use proper unit conventions for Kilo

This commit is contained in:
Martin Konecny 2013-05-31 15:59:20 -04:00 committed by denise
parent eeb73b7206
commit 9f3e1d61d1
3 changed files with 4 additions and 4 deletions

View File

@ -194,7 +194,7 @@ class PreferenceController extends Zend_Controller_Action
$stream_bitrates = array(); $stream_bitrates = array();
foreach ($temp_bitrate as $type) { foreach ($temp_bitrate as $type) {
if (intval($type) <= $max_bitrate) { if (intval($type) <= $max_bitrate) {
$stream_bitrates[trim($type)] = strtoupper(trim($type))." Kbit/s"; $stream_bitrates[trim($type)] = strtoupper(trim($type))." kbit/s";
} }
} }

View File

@ -74,7 +74,7 @@ $(document).ready(function(){
if ($type == "ogg") if ($type == "ogg")
$type = "oga"; $type = "oga";
$label = "(".$streamData["${id}_host"].") ".$streamData["${id}_description"]." - ".$streamData["${id}_bitrate"]." Kbit/s"; $label = "(".$streamData["${id}_host"].") ".$streamData["${id}_description"]." - ".$streamData["${id}_bitrate"]." kbit/s";
echo sprintf("<option class='stream' value='%s' data-url='%s' data-type='%s' server-type='%s'>%s</option>", $id, $url, $type, $serverType, $label); echo sprintf("<option class='stream' value='%s' data-url='%s' data-type='%s' server-type='%s'>%s</option>", $id, $url, $type, $serverType, $label);
} }
?> ?>

View File

@ -61,8 +61,8 @@ class SilanAnalyzer(Thread):
str('{0:f}'.format(info['sound'][-1][1])) str('{0:f}'.format(info['sound'][-1][1]))
except: pass except: pass
except Exception, e: except Exception, e:
self.logger.error(str(command)) self.logger.warn(str(command))
self.logger.error(e) self.logger.warn(e)
processed_data.append((f['id'], data)) processed_data.append((f['id'], data))
total += 1 total += 1
if total % 5 == 0: if total % 5 == 0: