diff options
| author | Cash Costello <cash.costello@gmail.com> | 2011-12-22 08:12:07 -0500 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2011-12-22 08:12:07 -0500 |
| commit | e49df853b2cc3a6a9bc2dd527a64951050142eb9 (patch) | |
| tree | 6f485b560f89331c65fad3993e055a1834b07177 /js/lib/languages.js | |
| parent | 5e5b3705a5ca7b66dfe386490c5570af88b49009 (diff) | |
| parent | fea599f1653d7206e34ac33c0c0a668cb587bc20 (diff) | |
| download | elgg-e49df853b2cc3a6a9bc2dd527a64951050142eb9.tar.gz elgg-e49df853b2cc3a6a9bc2dd527a64951050142eb9.tar.bz2 | |
Merge branch '1.8' after 1.8.2 release
Conflicts:
version.php
Diffstat (limited to 'js/lib/languages.js')
| -rw-r--r-- | js/lib/languages.js | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/js/lib/languages.js b/js/lib/languages.js index ae7ba63e2..bfa858364 100644 --- a/js/lib/languages.js +++ b/js/lib/languages.js @@ -26,16 +26,22 @@ elgg.add_translation = function(lang, translations) { elgg.reload_all_translations = function(language) { var lang = language || elgg.get_language(); - elgg.getJSON('ajax/view/js/languages', { - data: { - language: lang - }, - success: function(json) { - elgg.add_translation(lang, json); - elgg.config.languageReady = true; - elgg.initWhenReady(); - } - }); + var url, options; + if (elgg.config.simplecache_enabled) { + url = 'cache/js/default/languages/' + lang + '.' + elgg.config.lastcache + '.js'; + options = {}; + } else { + url = 'ajax/view/js/languages'; + options = {data: {language: lang}}; + } + + options['success'] = function(json) { + elgg.add_translation(lang, json); + elgg.config.languageReady = true; + elgg.initWhenReady(); + }; + + elgg.getJSON(url, options); }; /** |