Mirrors/ICEcoder
2
0
Fork 0
mirror of https://github.com/icecoder/ICEcoder.git synced 2026-03-14 20:37:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Load English first, then merge lang ontop

Browse Source 
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.
This commit is contained in:
Matt Pass
2014-08-21 14:30:43 +01:00
parent 0d4ca6a483
commit f96651b9e8
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/settings.php
View File

@@ -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