From: Sem <sembrestels@riseup.net>
Date: Sat, 28 Jul 2012 01:34:59 +0000 (+0200)
Subject: Fixes #4740. Added language fallback in javascript.
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=4dd2ca9d54b64ebbf5eba3e3036f747cadb40825;p=lorea%2Felgg.git

Fixes #4740. Added language fallback in javascript.
---

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