diff options
| author | Sem <sembrestels@riseup.net> | 2012-07-20 07:09:38 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-07-20 07:09:38 +0200 |
| commit | 07b599a683760d2542014bb04a681463420a3565 (patch) | |
| tree | cfcd06671529eeec7790fb70a8d490094d7942c9 /views/default/js/elgg.php | |
| parent | ea0140d87534c3b10e489d13a1449ebb79da832d (diff) | |
| parent | 174763bcbcd20812dc09f27b64908f9d71b523b9 (diff) | |
| download | elgg-07b599a683760d2542014bb04a681463420a3565.tar.gz elgg-07b599a683760d2542014bb04a681463420a3565.tar.bz2 | |
Merge branch 'lorea-preprod'
Conflicts:
.gitmodules
Diffstat (limited to 'views/default/js/elgg.php')
| -rw-r--r-- | views/default/js/elgg.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/views/default/js/elgg.php b/views/default/js/elgg.php index 133e128a4..6460e93d6 100644 --- a/views/default/js/elgg.php +++ b/views/default/js/elgg.php @@ -57,6 +57,7 @@ elgg.release = '<?php echo get_version(true); ?>'; elgg.config.wwwroot = '<?php echo elgg_get_site_url(); ?>'; elgg.security.interval = 5 * 60 * 1000; <?php //@todo make this configurable ?> elgg.config.domReady = false; +elgg.config.language = '<?php echo isset($CONFIG->language) ? $CONFIG->language : 'en'; ?>'; elgg.config.languageReady = false; //After the DOM is ready |