Make main.js file generation language-aware - refs #2584

pull/2588/merge
Yannick Warnier 7 years ago
parent 08b02307a7
commit ba8bb15e13
  1. 9
      main/admin/archive_cleanup.php
  2. 3
      main/inc/global.inc.php
  3. 3
      main/inc/lib/template.lib.php
  4. 4
      main/template/default/layout/head.tpl

@ -38,7 +38,14 @@ if ($form->validate()) {
$file = api_get_path(SYS_PUBLIC_PATH).'build/main.js';
if (file_exists($file)) {
rmdirr($file);
unlink($file);
}
$dir = api_get_path(SYS_PUBLIC_PATH).'build';
$files = scandir($dir);
foreach ($files as $file) {
if (preg_match('/main\..*\.js/', $file)) {
unlink($dir.'/'.$file);
}
}
$archive_path = api_get_path(SYS_ARCHIVE_PATH);

@ -644,6 +644,9 @@ if (!is_dir(api_get_path(SYS_PUBLIC_PATH).'build')) {
// Load template layout/header.js.tpl and save it into web/build/main.js
$file = api_get_path(SYS_PUBLIC_PATH).'build/main.js';
if (!empty($language_interface)) {
$file = api_get_path(SYS_PUBLIC_PATH).'build/main.'.$language_interface.'.js';
}
// if portal is in test mode always generate the file
if (!file_exists($file) || api_get_setting('server_type') === 'test') {
$template = new Template();

@ -564,6 +564,8 @@ class Template
*/
public function set_system_parameters()
{
// Get the interface language from global.inc.php
global $language_interface;
$this->theme = api_get_visual_theme();
if (!empty($this->preview_theme)) {
$this->theme = $this->preview_theme;
@ -583,6 +585,7 @@ class Template
'date' => api_format_date('now', DATE_FORMAT_LONG),
'timezone' => api_get_timezone(),
'gamification_mode' => api_get_setting('gamification_mode'),
'language_interface' => $language_interface,
];
$this->assign('_s', $_s);
}

@ -20,7 +20,11 @@
{{ js_file_to_string }}
{{ extra_headers }}
{% if _s.language_interface %}
<script type="text/javascript" src="{{ _p.web }}web/build/main.{{ _s.language_interface }}.js"></script>
{% else %}{# language_interface *should* always be defined, so we should never come here #}
<script type="text/javascript" src="{{ _p.web }}web/build/main.js"></script>
{% endif %}
{{ css_custom_file_to_string }}
{{ css_style_print }}

Loading…
Cancel
Save