Merge pull request #708 from splitbrain/overridablelangstrings

extend lang file cascade, so users can override some lang strings

1 files changed, 59 insertions, 55 deletions

diff --git a/inc/config_cascade.php b/inc/config_cascade.php
index 2c4f1612b..1d9f67edb 100644
--- a/inc/config_cascade.php
+++ b/inc/config_cascade.php
@@ -8,71 +8,75 @@
 $config_cascade = array_merge(
     array(
         'main' => array(
-            'default'   => array(DOKU_CONF.'dokuwiki.php'),
-            'local'     => array(DOKU_CONF.'local.php'),
-            'protected' => array(DOKU_CONF.'local.protected.php'),
-            ),
-        'acronyms'  => array(
-            'default'   => array(DOKU_CONF.'acronyms.conf'),
-            'local'     => array(DOKU_CONF.'acronyms.local.conf'),
-            ),
-        'entities'  => array(
-            'default'   => array(DOKU_CONF.'entities.conf'),
-            'local'     => array(DOKU_CONF.'entities.local.conf'),
-            ),
+            'default'   => array(DOKU_CONF . 'dokuwiki.php'),
+            'local'     => array(DOKU_CONF . 'local.php'),
+            'protected' => array(DOKU_CONF . 'local.protected.php'),
+        ),
+        'acronyms' => array(
+            'default'   => array(DOKU_CONF . 'acronyms.conf'),
+            'local'     => array(DOKU_CONF . 'acronyms.local.conf'),
+        ),
+        'entities' => array(
+            'default'   => array(DOKU_CONF . 'entities.conf'),
+            'local'     => array(DOKU_CONF . 'entities.local.conf'),
+        ),
         'interwiki' => array(
-            'default'   => array(DOKU_CONF.'interwiki.conf'),
-            'local'     => array(DOKU_CONF.'interwiki.local.conf'),
-            ),
+            'default'   => array(DOKU_CONF . 'interwiki.conf'),
+            'local'     => array(DOKU_CONF . 'interwiki.local.conf'),
+        ),
         'license' => array(
-            'default'   => array(DOKU_CONF.'license.php'),
-            'local'     => array(DOKU_CONF.'license.local.php'),
-            ),
+            'default'   => array(DOKU_CONF . 'license.php'),
+            'local'     => array(DOKU_CONF . 'license.local.php'),
+        ),
         'mediameta' => array(
-            'default'   => array(DOKU_CONF.'mediameta.php'),
-            'local'     => array(DOKU_CONF.'mediameta.local.php'),
-            ),
-        'mime'      => array(
-            'default'   => array(DOKU_CONF.'mime.conf'),
-            'local'     => array(DOKU_CONF.'mime.local.conf'),
-            ),
-        'scheme'    => array(
-            'default'   => array(DOKU_CONF.'scheme.conf'),
-            'local'     => array(DOKU_CONF.'scheme.local.conf'),
-            ),
-        'smileys'   => array(
-            'default'   => array(DOKU_CONF.'smileys.conf'),
-            'local'     => array(DOKU_CONF.'smileys.local.conf'),
-            ),
+            'default'   => array(DOKU_CONF . 'mediameta.php'),
+            'local'     => array(DOKU_CONF . 'mediameta.local.php'),
+        ),
+        'mime' => array(
+            'default'   => array(DOKU_CONF . 'mime.conf'),
+            'local'     => array(DOKU_CONF . 'mime.local.conf'),
+        ),
+        'scheme' => array(
+            'default'   => array(DOKU_CONF . 'scheme.conf'),
+            'local'     => array(DOKU_CONF . 'scheme.local.conf'),
+        ),
+        'smileys' => array(
+            'default'   => array(DOKU_CONF . 'smileys.conf'),
+            'local'     => array(DOKU_CONF . 'smileys.local.conf'),
+        ),
         'wordblock' => array(
-            'default'   => array(DOKU_CONF.'wordblock.conf'),
-            'local'     => array(DOKU_CONF.'wordblock.local.conf'),
-            ),
+            'default'   => array(DOKU_CONF . 'wordblock.conf'),
+            'local'     => array(DOKU_CONF . 'wordblock.local.conf'),
+        ),
         'userstyle' => array(
-            'screen'  => DOKU_CONF.'userstyle.css',
-            'print'   => DOKU_CONF.'userprint.css',
-            'feed'    => DOKU_CONF.'userfeed.css',
-            'all'     => DOKU_CONF.'userall.css',
-            ),
+            'screen'    => DOKU_CONF . 'userstyle.css',
+            'print'     => DOKU_CONF . 'userprint.css',
+            'feed'      => DOKU_CONF . 'userfeed.css',
+            'all'       => DOKU_CONF . 'userall.css',
+        ),
         'userscript' => array(
-            'default' => DOKU_CONF.'userscript.js'
-            ),
-        'acl'       => array(
-            'default'   => DOKU_CONF.'acl.auth.php',
-            ),
+            'default'   => DOKU_CONF . 'userscript.js'
+        ),
+        'acl' => array(
+            'default'   => DOKU_CONF . 'acl.auth.php',
+        ),
         'plainauth.users' => array(
-            'default' => DOKU_CONF.'users.auth.php',
-            ),
-
+            'default'   => DOKU_CONF . 'users.auth.php',
+        ),
         'plugins' => array(
-            'default'   => array(DOKU_CONF.'plugins.php'),
-            'local'     => array(DOKU_CONF.'plugins.local.php'),
+            'default'   => array(DOKU_CONF . 'plugins.php'),
+            'local'     => array(DOKU_CONF . 'plugins.local.php'),
             'protected' => array(
-                DOKU_CONF.'plugins.required.php',
-                DOKU_CONF.'plugins.protected.php',
-                ),
+                DOKU_CONF . 'plugins.required.php',
+                DOKU_CONF . 'plugins.protected.php',
             ),
         ),
-        $config_cascade
+        'lang' => array(
+            'core'      => array(DOKU_CONF . 'lang/'),
+            'plugin'    => array(DOKU_CONF . 'plugin_lang/'),
+            'template'  => array(DOKU_CONF . 'template_lang/')
+        )
+    ),
+    $config_cascade
 );