Merge branch 'saas' of github.com:sourcefabric/Airtime into saas

airtime_mvc/application/Bootstrap.php

@@ -198,7 +198,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
     {
         $front = Zend_Controller_Front::getInstance();
         $router = $front->getRouter();
-
+        $front->setBaseUrl(Application_Common_OsPath::getBaseDir());
+        
         $router->addRoute(
             'password-change',
             new Zend_Controller_Router_Route('password-change/:user_id/:token', array(

airtime_mvc/application/common/OsPath.php

@@ -65,8 +65,10 @@ class Application_Common_OsPath{
     }
     
     public static function getBaseDir() {
-        $baseUrl = dirname($_SERVER['SCRIPT_NAME']);
-
+        
+        $CC_CONFIG = Config::getConfig();
+        $baseUrl = $CC_CONFIG['baseDir'];
+        
         if ($baseUrl[0] != "/") {
             $baseUrl = "/".$baseUrl;
         }
@@ -74,7 +76,8 @@ class Application_Common_OsPath{
         if ($baseUrl[strlen($baseUrl) -1] != "/") {
             $baseUrl = $baseUrl."/";
         }
-
+        
+        
         return $baseUrl;
     }
 }

airtime_mvc/application/controllers/LocaleController.php

@@ -12,12 +12,12 @@ class LocaleController extends Zend_Controller_Action
         $this->_helper->viewRenderer->setNoRender(true);
         header("Content-type: text/javascript");
 
-        $baseUrl = Application_Common_OsPath::getBaseDir();
         $locale = Application_Model_Preference::GetLocale();
         echo "var datatables_dict =" .
             file_get_contents(Application_Common_OsPath::join(
-                dirname(__file__),
-                "../../public/js/datatables/i18n/",
+                //$_SERVER["DOCUMENT_ROOT"],
+                dirname(__FILE__) . "/../../public/", // Fixing this... -- Albert
+                "js/datatables/i18n/",
                 $locale.".txt")
             );
     }

airtime_mvc/application/models/Locale.php

@@ -15,7 +15,7 @@ class Application_Model_Locale
             "hr_HR" => "Hrvatski",
             "hu_HU" => "Magyar",
             "it_IT" => "Italiano",
-            //"ja"    => "日本語",
+            "ja_JP"    => "日本語",
             "ko_KR" => "한국어",
             "pl_PL" => "Polski",
             "pt_BR" => "Português (Brasil)",

airtime_mvc/application/services/SchedulerService.php

@@ -183,6 +183,9 @@ class Application_Service_SchedulerService
                 ->limit(1)
                 ->findOne();
 
+            if (is_null($showInstanceWithMostRecentSchedule)) {
+                return null;
+            }
             $instanceId = $showInstanceWithMostRecentSchedule->getDbId();
         }
 

airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po

@@ -2216,6 +2216,8 @@ msgstr ""
 msgid ""
 "Warning: You cannot change this field while the show is currently playing"
 msgstr ""
+"Attention: Vous ne pouvez pas modifier ce champ alors que l'émission est en "
+"cours de lecture"
 
 #: airtime_mvc/application/controllers/LocaleController.php:181
 msgid "No result found"