From 9f3e1d61d1533ca663f3f3b3e95cd91ee78b460e Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Fri, 31 May 2013 15:59:20 -0400
Subject: [PATCH] Use proper unit conventions for Kilo

---
 airtime_mvc/application/controllers/PreferenceController.php  | 2 +-
 .../application/views/scripts/dashboard/stream-player.phtml   | 2 +-
 python_apps/pypo/media/update/silananalyzer.py                | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index d7da8e3de..183cada01 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -194,7 +194,7 @@ class PreferenceController extends Zend_Controller_Action
         $stream_bitrates = array();
         foreach ($temp_bitrate as $type) {
             if (intval($type) <= $max_bitrate) {
-                $stream_bitrates[trim($type)] = strtoupper(trim($type))." Kbit/s";
+                $stream_bitrates[trim($type)] = strtoupper(trim($type))." kbit/s";
             }
         }
 
diff --git a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
index ac958fd0d..9a18d059d 100644
--- a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
+++ b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
@@ -74,7 +74,7 @@ $(document).ready(function(){
                             if ($type == "ogg")
                                 $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);
                         }
                     ?>
diff --git a/python_apps/pypo/media/update/silananalyzer.py b/python_apps/pypo/media/update/silananalyzer.py
index 4e7ccaa11..bc915dd93 100644
--- a/python_apps/pypo/media/update/silananalyzer.py
+++ b/python_apps/pypo/media/update/silananalyzer.py
@@ -61,8 +61,8 @@ class SilanAnalyzer(Thread):
                                     str('{0:f}'.format(info['sound'][-1][1]))
                             except: pass
                     except Exception, e:
-                        self.logger.error(str(command))
-                        self.logger.error(e)
+                        self.logger.warn(str(command))
+                        self.logger.warn(e)
                     processed_data.append((f['id'], data))
                     total += 1
                     if total % 5 == 0: