From: cash <cash.costello@gmail.com>
Date: Sat, 23 Feb 2013 16:29:13 +0000 (-0500)
Subject: Fixes #4971 serving languages from ajax page handler rather than simplecache (which... 
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=5ecd127960654865716742282e1c5db66ca398af;p=lorea%2Felgg.git

Fixes #4971 serving languages from ajax page handler rather than simplecache (which cannot handle languages)
---

diff --git a/engine/lib/languages.php b/engine/lib/languages.php
index ed182dc46..17db14d98 100644
--- 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 99a1ba0ee..44ea56d2b 100644
--- 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);