aboutsummaryrefslogtreecommitdiff
path: root/js/lib
diff options
context:
space:
mode:
authorcash <cash.costello@gmail.com>2011-12-08 22:12:32 -0500
committercash <cash.costello@gmail.com>2011-12-08 22:12:32 -0500
commit1ebbff44be8bccb87ec8cacee171d9b951ec50f4 (patch)
treefe6e50b397121415f0dbf841a81984447428c30d /js/lib
parentbe930396dfd7c722d9c90d8987a49823710e6717 (diff)
downloadelgg-1ebbff44be8bccb87ec8cacee171d9b951ec50f4.tar.gz
elgg-1ebbff44be8bccb87ec8cacee171d9b951ec50f4.tar.bz2
Fixes #3181 caching language js on server side with proper headers
Diffstat (limited to 'js/lib')
-rw-r--r--js/lib/languages.js26
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);
};
/**