Browse Source

Fixes front end translation language code variables

Adrien Panay 7 years ago
parent
commit
ea0c84759a
2 changed files with 2 additions and 2 deletions
  1. 1 1
      tracim/tracim/templates/calendar/config.mak
  2. 1 1
      tracim/tracim/templates/pod.mak

+ 1 - 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; // globalTracimLang is declared in tracim header (caldavzap in in an iframe)
46
+var globalInterfaceLanguage=window.parent.globalTracimLang === 'fr' ? 'fr_FR' : window.parent.globalTracimLang; // globalTracimLang is declared in tracim header (caldavzap in in an iframe)
47
 var globalInterfaceCustomLanguages=['en_US', 'fr_FR'];
47
 var globalInterfaceCustomLanguages=['en_US', 'fr_FR'];
48
 var globalSortAlphabet=' 0123456789'+
48
 var globalSortAlphabet=' 0123456789'+
49
     'AÀÁÂÄÆÃÅĀBCÇĆČDĎEÈÉÊËĒĖĘĚFGĞHIÌÍÎİÏĪĮJKLŁĹĽMNŃÑŇOÒÓÔÖŐŒØÕŌ'+
49
     'AÀÁÂÄÆÃÅĀBCÇĆČDĎEÈÉÊËĒĖĘĚFGĞHIÌÍÎİÏĪĮJKLŁĹĽMNŃÑŇOÒÓÔÖŐŒØÕŌ'+

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

56
             menubar:false,
56
             menubar:false,
57
             statusbar:true,
57
             statusbar:true,
58
             plugins: [ "table", "image", "charmap", "fullscreen", "autolink", "colorpicker" ],
58
             plugins: [ "table", "image", "charmap", "fullscreen", "autolink", "colorpicker" ],
59
-            language: globalTracimLang === 'en_US' ? 'en' : globalTracimLang, // tinymce does't accept en_US as language, it is its default value named 'en'
59
+            language: globalTracimLang === 'fr' ? 'fr_FR' : globalTracimLang, // tinymce does't accept en_US as language, it is its default value named 'en'
60
             skin : 'tracim',
60
             skin : 'tracim',
61
             selector:'${selector}',
61
             selector:'${selector}',
62
             toolbar: [
62
             toolbar: [