aboutsummaryrefslogtreecommitdiff
path: root/js/lib/languages.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/lib/languages.js')
-rw-r--r--js/lib/languages.js26
1 files changed, 16 insertions, 10 deletions
diff --git a/js/lib/languages.js b/js/lib/languages.js
index 0e3cf4472..d218cbc4f 100644
--- a/js/lib/languages.js
+++ b/js/lib/languages.js
@@ -4,6 +4,7 @@
*/
elgg.provide('elgg.config.translations');
+// default language - required by unit tests
elgg.config.language = 'en';
/**
@@ -25,16 +26,21 @@ 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
- },
- success: function(json) {
- elgg.add_translation(lang, json);
- }
- });
+
+ var url, options;
+ url = 'ajax/view/js/languages';
+ options = {data: {language: lang}};
+ if (elgg.config.simplecache_enabled) {
+ options.data.lc = elgg.config.lastcache;
+ }
+
+ options['success'] = function(json) {
+ elgg.add_translation(lang, json);
+ elgg.config.languageReady = true;
+ elgg.initWhenReady();
+ };
+
+ elgg.getJSON(url, options);
};
/**