]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Fixes #4740. Added language fallback in javascript.
authorSem <sembrestels@riseup.net>
Sat, 28 Jul 2012 01:34:59 +0000 (03:34 +0200)
committerSem <sembrestels@riseup.net>
Sat, 28 Jul 2012 01:34:59 +0000 (03:34 +0200)
views/default/js/languages.php

index 009e8159ce6f88baa31ff4cc8e808d2cc1a00a6d..c51d7bcb29e2db53446cd754941ff1d0b0de7e2a 100644 (file)
@@ -6,4 +6,10 @@ global $CONFIG;
 
 $language = $vars['language'];
 
-echo json_encode($CONFIG->translations[$language]);
\ No newline at end of file
+$translations = $CONFIG->translations['en'];
+
+if ($language != 'en') {
+       $translations = array_merge($translations, $CONFIG->translations[$language]);
+}
+
+echo json_encode($translations);
\ No newline at end of file