Browse Source

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

algooapy 7 years ago
parent
commit
dec0113470
2 changed files with 17 additions and 5 deletions
  1. 13 1
      tracim/tracim/templates/calendar/config.mak
  2. 4 4
      tracim/tracim/templates/pod.mak

+ 13 - 1
tracim/tracim/templates/calendar/config.mak View File

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

+ 4 - 4
tracim/tracim/templates/pod.mak View File

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