From 38fb1fc7a9bbb1e70f0f24352891601b2e0856d6 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 13 May 2014 21:57:50 +0200
Subject: extend lang file cascade, so users can override some lang strings

Fixes #692
---
 inc/init.php | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'inc/init.php')

diff --git a/inc/init.php b/inc/init.php
index 4ff239787..c7f9a406d 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -259,6 +259,11 @@ function init_paths(){
     $conf['media_changelog'] = $conf['metadir'].'/_media.changes';
 }
 
+/**
+ * Load the language strings
+ *
+ * @param string $langCode language code, as passed by event handler
+ */
 function init_lang($langCode) {
     //prepare language array
     global $lang;
@@ -271,6 +276,9 @@ function init_lang($langCode) {
             require(DOKU_INC."inc/lang/$langCode/lang.php");
         }
     }
+    if (file_exists(DOKU_CONF."lang/$langCode/lang.php")) {
+        require(DOKU_CONF."lang/$langCode/lang.php");
+    }
 }
 
 /**
-- 
cgit v1.2.3