Просмотр исходного кода

Fixes front end translation language code variables

Adrien Panay 7 лет назад
Родитель
Сommit
ea0c84759a
2 измененных файлов: 2 добавлений и 2 удалений
  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 Просмотреть файл

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

+ 1 - 1
tracim/tracim/templates/pod.mak Просмотреть файл

@@ -56,7 +56,7 @@
56 56
             menubar:false,
57 57
             statusbar:true,
58 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 60
             skin : 'tracim',
61 61
             selector:'${selector}',
62 62
             toolbar: [