diff options
| author | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-04-10 03:11:52 +0000 |
|---|---|---|
| committer | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-04-10 03:11:52 +0000 |
| commit | ace72189a7f56fbba898ee1ccb52fd7eba80ae2e (patch) | |
| tree | 91f27fc2b6aa412590adbc7b6b3201b08aaf391b /js/lib | |
| parent | 05dafefe7accb7225e071c303e7ac5e778151f51 (diff) | |
| download | elgg-ace72189a7f56fbba898ee1ccb52fd7eba80ae2e.tar.gz elgg-ace72189a7f56fbba898ee1ccb52fd7eba80ae2e.tar.bz2 | |
Refs #3182: Feeding language loading through /ajax/view to keep thing simpler for now. Reorganized boot process so that we can ajax load the languages asap
git-svn-id: http://code.elgg.org/elgg/trunk@8976 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'js/lib')
| -rw-r--r-- | js/lib/elgglib.js | 2 | ||||
| -rw-r--r-- | js/lib/languages.js | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/js/lib/elgglib.js b/js/lib/elgglib.js index 5ba80fc06..f2545fb6c 100644 --- a/js/lib/elgglib.js +++ b/js/lib/elgglib.js @@ -379,4 +379,4 @@ elgg.getSelectorFromUrlFragment = function(url) { } } return ''; -}
\ No newline at end of file +};
\ No newline at end of file diff --git a/js/lib/languages.js b/js/lib/languages.js index 0e3cf4472..28b82e2e9 100644 --- a/js/lib/languages.js +++ b/js/lib/languages.js @@ -25,12 +25,8 @@ elgg.add_translation = function(lang, translations) { */ elgg.reload_all_translations = function(language) { var lang = language || elgg.get_language(); - // This...................vvvvv is a double encoded question mark (? -> %2f -> %252f) - elgg.getJSON('js/languages%252f' + lang + '.js', { - data: { - 'viewtype': 'default', - 'lastcache': elgg.config.lastcache - }, + + elgg.getJSON('ajax/view/js/languages/' + lang, { success: function(json) { elgg.add_translation(lang, json); } |