diff options
| -rw-r--r-- | js/lib/languages.js | 3 | ||||
| -rw-r--r-- | views/default/js/elgg.php | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/js/lib/languages.js b/js/lib/languages.js index a8ba72c31..99a1ba0ee 100644 --- a/js/lib/languages.js +++ b/js/lib/languages.js @@ -4,6 +4,9 @@ */ elgg.provide('elgg.config.translations'); +// default language - required by unit tests +elgg.config.language = 'en'; + /** * Analagous to the php version. Merges translations for a * given language into the current translations map. diff --git a/views/default/js/elgg.php b/views/default/js/elgg.php index b82d98ce4..6fe03484d 100644 --- a/views/default/js/elgg.php +++ b/views/default/js/elgg.php @@ -56,7 +56,8 @@ if (0) { ?><script><?php } elgg.version = '<?php echo get_version(); ?>'; 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 ?> +<?php //@todo make this configurable ?> +elgg.security.interval = 5 * 60 * 1000; elgg.config.domReady = false; elgg.config.language = '<?php echo isset($CONFIG->language) ? $CONFIG->language : 'en'; ?>'; elgg.config.languageReady = false; |