Merge branch '2.3.x' into 2.3.x-saas

2013-01-25 12:12:21 -05:00 · 2013-01-25 12:12:21 -05:00 · 7c327e4c75
commit 7c327e4c75
parent d5894279c4 c0e3e12e9d
6 changed files with 18 additions and 11 deletions
--- a/airtime_mvc/public/js/airtime/preferences/preferences.js
+++ b/airtime_mvc/public/js/airtime/preferences/preferences.js
@ -154,6 +154,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();
        });