Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

airtime_mvc/application/controllers/LocaleController.php

@@ -210,6 +210,7 @@ class LocaleController extends Zend_Controller_Action
             //"Error code: " => _("Error code: "),
             //"Error msg: " => _("Error msg: "),
             "This show has no scheduled content." => _("This show has no scheduled content."),
+            "This show is not completely filled with content." => _("This show is not completely filled with content."),
             //already in schedule/add-show.js
             //"The show instance doesn"t exist anymore!" => _("The show instance doesn"t exist anymore!"),
             //schedule/schedule.js

airtime_mvc/application/forms/AddShowStyle.php

@@ -19,9 +19,9 @@ class Application_Form_AddShowStyle extends Zend_Form_SubForm
             'class'      => 'big'
         ))));
 
+        $stringLengthValidator = Application_Form_Helper_ValidationTypes::overrideStringLengthValidator(6, 6);
         $bg->setValidators(array(
-            'Hex',
-            array('stringLength', false, array(6, 6))
+            'Hex', $stringLengthValidator
         ));
 
     // Add show color input
@@ -39,8 +39,7 @@ class Application_Form_AddShowStyle extends Zend_Form_SubForm
         ))));
 
         $c->setValidators(array(
-                'Hex',
-                array('stringLength', false, array(6, 6))
+                'Hex', $stringLengthValidator
         ));
     }
 

airtime_mvc/application/views/scripts/preference/stream-setting.phtml

@@ -85,7 +85,7 @@
                 <span id="rg_modifier_value" style="border: 0; color: #f6931f; font-weight: bold;">
                     <?php echo $this->form->getElement('replayGainModifier')->getValue() ?>
                 </span>
-                dB
+                <?php echo _("dB")?>
             </dt>
             <dd id="replayGainModifier-element" class="block-display">
                 <?php echo $this->form->getElement('replayGainModifier') ?>

airtime_mvc/public/js/airtime/showbuilder/builder.js

@@ -41,10 +41,12 @@ var AIRTIME = (function(AIRTIME){
 
     mod.updateCalendarStatusIcon = function(json) {
 
-        if (window.location.pathname.toLowerCase() != "/schedule") {
+
+        if (window.location.pathname.toLowerCase() != baseUrl+"/schedule") {
             return;
         }
 
+
         var instance_id = json.schedule[0].instance;
 
         var lastElem = json.schedule[json.schedule.length-1];