Merge pull request #322 from tracim/fix/321/tinymce_caldavzap_t9n_lang_code

tracim/tracim/templates/calendar/config.mak

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

tracim/tracim/templates/pod.mak

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