From f96651b9e8a8837109b94e38e9ef1f15eb5e58d1 Mon Sep 17 00:00:00 2001 From: Matt Pass Date: Thu, 21 Aug 2014 14:30:43 +0100 Subject: [PATCH] Load English first, then merge lang ontop It's English ontop of English for now, but 2nd include can be changed in the code here and soon to be set via the UI. --- lib/settings.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/settings.php b/lib/settings.php index de03dbb..3d7e808 100644 --- a/lib/settings.php +++ b/lib/settings.php @@ -40,7 +40,12 @@ If ($ICEcoderUserSettings["versionNo"] != $ICEcoderSettings["versionNo"]) { $ICEcoder = $ICEcoderSettings + $ICEcoderUserSettings; // Include language file +// Load English first as foundation include(dirname(__FILE__)."/../lang/english.php"); +$englishText = $text; +// Load chosen language ontop to replace English +include(dirname(__FILE__)."/../lang/english.php"); +$text = array_merge($englishText, $text); $_SESSION['text'] = $text; // Login not required or we're in demo mode and have password set in our settings, log us straight in