aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2012-06-29 20:34:47 -0700
committerCash Costello <cash.costello@gmail.com>2012-06-29 20:34:47 -0700
commit0431c667de5736b0bd7733b7763d9bf2ba9caf05 (patch)
treeb2022ff6d111003aa80c3ffc1f5698a31239cec8
parent70ae31f40ae081cd807f72ad8c8a9c9b4d87a098 (diff)
parent7e04c0e841f99633240b115ae0242a8b7d42cf25 (diff)
downloadelgg-0431c667de5736b0bd7733b7763d9bf2ba9caf05.tar.gz
elgg-0431c667de5736b0bd7733b7763d9bf2ba9caf05.tar.bz2
Merge pull request #256 from migrax/fix_js_default_lang1.8
Fixes #4648 sets correct default javascript language
-rw-r--r--js/lib/languages.js2
-rw-r--r--views/default/js/elgg.php1
2 files changed, 1 insertions, 2 deletions
diff --git a/js/lib/languages.js b/js/lib/languages.js
index bfa858364..a8ba72c31 100644
--- 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 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