diff options
| author | Miguel Rodríguez Pérez <Miguel.Rodriguez@det.uvigo.es> | 2012-05-31 12:06:08 +0200 |
|---|---|---|
| committer | Miguel Rodríguez Pérez <Miguel.Rodriguez@det.uvigo.es> | 2012-05-31 12:07:59 +0200 |
| commit | 7e04c0e841f99633240b115ae0242a8b7d42cf25 (patch) | |
| tree | 4bbf983b3195a58f03cce7971b2fe8088363a4a7 | |
| parent | 14d2c70e1872f4045fc857be9b9022d085f1fbd1 (diff) | |
| download | elgg-7e04c0e841f99633240b115ae0242a8b7d42cf25.tar.gz elgg-7e04c0e841f99633240b115ae0242a8b7d42cf25.tar.bz2 | |
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.
| -rw-r--r-- | js/lib/languages.js | 2 | ||||
| -rw-r--r-- | views/default/js/elgg.php | 1 |
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 |