From 2c3e79e842f3174ec36dc92ba1454ac33ac716b7 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Mon, 14 Jan 2013 13:53:27 -0500
Subject: [PATCH 1/4] CC-4832: I18N: Tool tip for show is partially filled in
 Calendar page is not translated

-fixed
---
 airtime_mvc/application/controllers/LocaleController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/airtime_mvc/application/controllers/LocaleController.php b/airtime_mvc/application/controllers/LocaleController.php
index 1af6efb4a..3248174b6 100644
--- a/airtime_mvc/application/controllers/LocaleController.php
+++ b/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

From 3a70a371be0482fcfd6435bd8007d2c30329bb48 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Mon, 14 Jan 2013 14:07:32 -0500
Subject: [PATCH 2/4] CC-4751: Calendar: Add/Remove contents won't trig status
 update of shows

-fix problem when baseurl changed
---
 airtime_mvc/public/js/airtime/showbuilder/builder.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index 9526cd9f3..1f0c3e243 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/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];

From 7b4693e5f931546f247cebc972c8c49eb2071ff8 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Mon, 14 Jan 2013 14:13:32 -0500
Subject: [PATCH 3/4] CC-4831: I18N: Error message of background settings when
 creating a show is not translated

-fixed
---
 airtime_mvc/application/forms/AddShowStyle.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/application/forms/AddShowStyle.php b/airtime_mvc/application/forms/AddShowStyle.php
index 5f897f6ea..e8feeae89 100644
--- a/airtime_mvc/application/forms/AddShowStyle.php
+++ b/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
         ));
     }
 

From 9603e7c2fde9fa9b2c7287148ff7ecc65ca10e5e Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Mon, 14 Jan 2013 14:30:59 -0500
Subject: [PATCH 4/4] CC-4830: I18N: System -> Streams: "dB" for Replay Gain
 Modifier is not translated

-fixed
---
 .../application/views/scripts/preference/stream-setting.phtml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
index 07665c6ec..5cb89d8a8 100644
--- a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
+++ b/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') ?>