Fixes #4956 language unit tests pass again

diff --git a/js/lib/languages.js b/js/lib/languages.js
index a8ba72c31c31b785230936e72d068823c7afe637..99a1ba0ee868bfd143f67caff373beb98b3f39a4 100644 (file)
--- 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 b82d98ce42e6d1914e4235f26b9d2cf6afbb1569..6fe03484d41148b66bcba8aca577942944e9a20c 100644 (file)
--- 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;