Quellcode durchsuchen

Fixes front end language management

Adrien Panay vor 7 Jahren
Ursprung
Commit
3c70745400
2 geänderte Dateien mit 15 neuen und 5 gelöschten Zeilen
  1. 11 1
      tracim/tracim/templates/calendar/config.mak
  2. 4 4
      tracim/tracim/templates/pod.mak

+ 11 - 1
tracim/tracim/templates/calendar/config.mak Datei anzeigen

@@ -43,7 +43,17 @@ var globalBackgroundSync=true;
43 43
 var globalSyncResourcesInterval=120000;
44 44
 var globalEnableRefresh=false;
45 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
+    }
55
+})(window.parent.globalTracimLang)
56
+
47 57
 var globalInterfaceCustomLanguages=['en_US', 'fr_FR'];
48 58
 var globalSortAlphabet=' 0123456789'+
49 59
     'AÀÁÂÄÆÃÅĀBCÇĆČDĎEÈÉÊËĒĖĘĚFGĞHIÌÍÎİÏĪĮJKLŁĹĽMNŃÑŇOÒÓÔÖŐŒØÕŌ'+

+ 4 - 4
tracim/tracim/templates/pod.mak Datei anzeigen

@@ -55,10 +55,10 @@
55 55
         // HACK: The tiny mce source code modal contain a textarea, but we
56 56
         // can't edit it (like it's readonly). The following solution
57 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 63
         tinymce.init({
64 64
             menubar:false,