From 4dd2ca9d54b64ebbf5eba3e3036f747cadb40825 Mon Sep 17 00:00:00 2001 From: Sem Date: Sat, 28 Jul 2012 03:34:59 +0200 Subject: Fixes #4740. Added language fallback in javascript. --- views/default/js/languages.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/views/default/js/languages.php b/views/default/js/languages.php index 009e8159c..c51d7bcb2 100644 --- a/views/default/js/languages.php +++ b/views/default/js/languages.php @@ -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 -- cgit v1.2.3