aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash.costello@gmail.com>2013-01-26 14:08:54 -0500
committercash <cash.costello@gmail.com>2013-01-26 14:08:54 -0500
commit36a020b7e5f8ec7e68d9ee15cf1f845e5a47e103 (patch)
tree444d61a1507f92ae366efe92dd15f0ced8f8ec38
parent0853342ae55328e2744a15aa1a8f37852ad76604 (diff)
downloadelgg-36a020b7e5f8ec7e68d9ee15cf1f845e5a47e103.tar.gz
elgg-36a020b7e5f8ec7e68d9ee15cf1f845e5a47e103.tar.bz2
Fixes #4956 language unit tests pass again
-rw-r--r--js/lib/languages.js3
-rw-r--r--views/default/js/elgg.php3
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;