Respect site default language from javascript elgg_echo

The current implementation hardcoded 'en' as the site default language.
This patch uses the site's configure default language as the default
one.

diff --git a/js/lib/languages.js b/js/lib/languages.js
index bfa858364e7acc2148107e6b92644771e5b146e6..a8ba72c31c31b785230936e72d068823c7afe637 100644 (file)
--- a/js/lib/languages.js
+++ b/js/lib/languages.js
@@ -4,8 +4,6 @@
  */
 elgg.provide('elgg.config.translations');
 
-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 133e128a49d1f9c7b55c48de1a92a3f98ff936d3..6460e93d6ced39465e0d1681eba27357c2292a07 100644 (file)
--- 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