Fixes #3181 caching language js on server side with proper headers

diff --git a/engine/lib/languages.php b/engine/lib/languages.php
index 7607ea3bffa6abeba162763b76058160dcbfecc3..0400843af351aad16e9bbdbc87c48803c7d481d7 100644 (file)
--- a/engine/lib/languages.php
+++ b/engine/lib/languages.php
@@ -301,4 +301,15 @@ function get_missing_language_keys($language) {
        return false;
 }
 
+/**
+ * Initialize the language library
+ * @access private
+ */
+function elgg_languages_init() {
+       $lang = get_current_language();
+       elgg_register_simplecache_view("cache/js/languages/$lang");
+}
+
+elgg_register_event_handler('init', 'system', 'elgg_languages_init');
+
 register_translations(dirname(dirname(dirname(__FILE__))) . "/languages/");

diff --git a/js/lib/languages.js b/js/lib/languages.js
index ae7ba63e20565b06e7a6537200f21443dcf60dad..bfa858364e7acc2148107e6b92644771e5b146e6 100644 (file)
--- 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);
 };
 
 /**