From dd7a6159c4224a6a3dda22a1f35f5fb13b06ec2e Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Sun, 28 Sep 2014 13:27:05 +0200
Subject: use config cascade for loading of localizations

---
 inc/init.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'inc/init.php')

diff --git a/inc/init.php b/inc/init.php
index c7f9a406d..be81ec844 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -266,18 +266,26 @@ function init_paths(){
  */
 function init_lang($langCode) {
     //prepare language array
-    global $lang;
+    global $lang, $config_cascade;
     $lang = array();
 
     //load the language files
     require(DOKU_INC.'inc/lang/en/lang.php');
+    foreach ($config_cascade['lang']['core'] as $config_file) {
+        if (@file_exists($config_file . 'en/lang.php')) {
+            include($config_file . 'en/lang.php');
+        }
+    }
+
     if ($langCode && $langCode != 'en') {
         if (file_exists(DOKU_INC."inc/lang/$langCode/lang.php")) {
             require(DOKU_INC."inc/lang/$langCode/lang.php");
         }
-    }
-    if (file_exists(DOKU_CONF."lang/$langCode/lang.php")) {
-        require(DOKU_CONF."lang/$langCode/lang.php");
+        foreach ($config_cascade['lang']['core'] as $config_file) {
+            if (@file_exists($config_file . "$langCode/lang.php")) {
+                include($config_file . "$langCode/lang.php");
+            }
+        }
     }
 }
 
-- 
cgit v1.2.3