Fixes #4971 serving languages from ajax page handler rather than simplecache (which...

diff --git a/engine/lib/languages.php b/engine/lib/languages.php
index ed182dc46071ab5f3fc564fa498e31defa20890f..17db14d98926a161db3688995b0e0b4e2efa343f 100644 (file)
--- a/engine/lib/languages.php
+++ b/engine/lib/languages.php
@@ -349,14 +349,3 @@ 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("js/languages/$lang");
-}
-
-elgg_register_event_handler('init', 'system', 'elgg_languages_init');

diff --git a/js/lib/languages.js b/js/lib/languages.js
index 99a1ba0ee868bfd143f67caff373beb98b3f39a4..44ea56d2b081563b3e5482f049063c78bd2f4830 100644 (file)
--- a/js/lib/languages.js
+++ b/js/lib/languages.js
@@ -28,13 +28,8 @@ elgg.reload_all_translations = function(language) {
        var lang = language || elgg.get_language();
 
        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}};
-       }
+       url = 'ajax/view/js/languages';
+       options = {data: {language: lang}};
 
        options['success'] = function(json) {
                elgg.add_translation(lang, json);