Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x

airtime_mvc/application/controllers/LocaleController.php

@@ -4,10 +4,6 @@ class LocaleController extends Zend_Controller_Action
 {
     public function init()
     {
-        $ajaxContext = $this->_helper->getHelper("AjaxContext");
-        $ajaxContext->addActionContext("general-translation-table", "json")
-                    ->addActionContext("datatables-translation-table", "json")
-                    ->initContext();
     }
 
     public function datatablesTranslationTableAction()
@@ -26,7 +22,7 @@ class LocaleController extends Zend_Controller_Action
                 $locale.".txt")
             );
     }
-    
+
     public function generalTranslationTableAction()
     {
         $translations = array (

airtime_mvc/application/controllers/plugins/Acl_plugin.php

@@ -110,7 +110,7 @@ class Zend_Controller_Plugin_Acl extends Zend_Controller_Plugin_Abstract
     {
         $controller = strtolower($request->getControllerName());
 
-        if (in_array($controller, array("api", "auth"))) {
+        if (in_array($controller, array("api", "auth", "locale"))) {
 
             $this->setRoleName("G");
         } elseif (!Zend_Auth::getInstance()->hasIdentity()) {

airtime_mvc/public/js/airtime/login/login.js

@@ -1,6 +1,6 @@
 $(window).load(function(){
     $("#username").focus();
-    $("#locale").val($.cookie("airtime_locale")!== null?$.cookie("airtime_locale"):'en_CA');
+    $("#locale").val($.cookie("airtime_locale")!== null?$.cookie("airtime_locale"):$.cookie("default_airtime_locale"));
 });
 
 $(document).ready(function() {

airtime_mvc/public/js/airtime/preferences/preferences.js

@@ -111,6 +111,7 @@ $(document).ready(function() {
         $.post(url, {format: "json", data: data}, function(data){
             var json = $.parseJSON(data);
             $('#content').empty().append(json.html);
+            $.cookie("default_airtime_locale", $('#locale').val(), {path: '/'});
             setTimeout(removeSuccessMsg, 5000);
             showErrorSections();
         });