Merge pull request #361 from tracim/fix/359/calendar_not_working

tracim/tracim/templates/calendar/config.mak

@@ -43,7 +43,19 @@ var globalBackgroundSync=true;
 var globalSyncResourcesInterval=120000;
 var globalEnableRefresh=false;
 var globalEnableKbNavigation=true;
-var globalInterfaceLanguage=window.parent.globalTracimLang === 'fr' ? 'fr_FR' : window.parent.globalTracimLang; // globalTracimLang is declared in tracim header (caldavzap in in an iframe)
+// var globalInterfaceLanguage=window.parent.globalTracimLang === 'fr' ? 'fr_FR' : window.parent.globalTracimLang; // Côme - 2017/09/14 - line outdated
+// globalTracimLang is declared in tracim header (caldavzap in in an iframe)
+var globalInterfaceLanguage = (function (lang) {
+    switch (lang) {
+        case 'fr':
+            return 'fr_FR';
+        case 'en':
+            return 'en_US';
+        default:
+            return 'en_US';
+    }
+})(window.parent.globalTracimLang)
+
 var globalInterfaceCustomLanguages=['en_US', 'fr_FR'];
 var globalSortAlphabet=' 0123456789'+
     'AÀÁÂÄÆÃÅĀBCÇĆČDĎEÈÉÊËĒĖĘĚFGĞHIÌÍÎİÏĪĮJKLŁĹĽMNŃÑŇOÒÓÔÖŐŒØÕŌ'+

tracim/tracim/templates/pod.mak

@@ -55,10 +55,10 @@
         // HACK: The tiny mce source code modal contain a textarea, but we
         // can't edit it (like it's readonly). The following solution
         // solve the bug: https://stackoverflow.com/questions/36952148/tinymce-code-editor-is-readonly-in-jtable-grid
-        $(document).on('focusin', function(e) {
-        if ($(event.target).closest(".mce-window").length) {
-            e.stopImmediatePropagation();
-        }});
+        // $(document).on('focusin', function(e) {
+        // if ($(e.target).closest(".mce-window").length) {
+        //     e.stopImmediatePropagation();
+        // }});
 
         tinymce.init({
             menubar:false,