diff options
| author | Sem <sembrestels@riseup.net> | 2012-07-11 21:19:14 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-07-11 21:19:14 +0200 |
| commit | b83574ae1b8ada2bb9c2247492806473df920259 (patch) | |
| tree | 30f9010da3cab12bda4921f079cfe86fcef2e7a4 /views/default/js | |
| parent | 46bd104bd523c08ff2f6bc0342be9ae1251259e8 (diff) | |
| parent | 4d42fd0263948eee4a7c7a26ceca0647c01cce32 (diff) | |
| download | elgg-b83574ae1b8ada2bb9c2247492806473df920259.tar.gz elgg-b83574ae1b8ada2bb9c2247492806473df920259.tar.bz2 | |
Merge tag '1.8.8' of git://github.com/Elgg/Elgg into lorea-preprod
Elgg 1.8.8 release
Conflicts:
js/lib/languages.js
Diffstat (limited to 'views/default/js')
| -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 |