diff options
| author | cash <cash.costello@gmail.com> | 2013-02-23 11:29:13 -0500 |
|---|---|---|
| committer | cash <cash.costello@gmail.com> | 2013-02-23 11:29:13 -0500 |
| commit | 5ecd127960654865716742282e1c5db66ca398af (patch) | |
| tree | a8ccdfacdf498dc9a7f8dc97af62b955ffead018 | |
| parent | 58ebe3f9d266a8c641b7c7751578c4cfb22a352a (diff) | |
| download | elgg-5ecd127960654865716742282e1c5db66ca398af.tar.gz elgg-5ecd127960654865716742282e1c5db66ca398af.tar.bz2 | |
Fixes #4971 serving languages from ajax page handler rather than simplecache (which cannot handle languages)
| -rw-r--r-- | engine/lib/languages.php | 11 | ||||
| -rw-r--r-- | js/lib/languages.js | 9 |
2 files changed, 2 insertions, 18 deletions
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); |