From 64d489db2842cfab445492e8fa262e74b090e773 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Sat, 27 Sep 2014 23:35:44 +0200 Subject: add lang files to cascading --- inc/config_cascade.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'inc/config_cascade.php') diff --git a/inc/config_cascade.php b/inc/config_cascade.php index 2c4f1612b..d93431c8c 100644 --- a/inc/config_cascade.php +++ b/inc/config_cascade.php @@ -72,6 +72,11 @@ $config_cascade = array_merge( DOKU_CONF.'plugins.protected.php', ), ), + 'lang' => array( + 'core' => array(DOKU_CONF . 'lang/'), + 'template' => array(DOKU_CONF . 'plugin_lang/'), + 'plugin' => array(DOKU_CONF . 'template_lang/') + ) ), $config_cascade ); -- cgit v1.2.3 From 89417bb7bf90154b2a5c17e0717028f7a7d9797f Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Sat, 27 Sep 2014 23:41:56 +0200 Subject: reformatting config cascade --- inc/config_cascade.php | 113 ++++++++++++++++++++++++------------------------- 1 file changed, 56 insertions(+), 57 deletions(-) (limited to 'inc/config_cascade.php') diff --git a/inc/config_cascade.php b/inc/config_cascade.php index d93431c8c..72b4493cf 100644 --- a/inc/config_cascade.php +++ b/inc/config_cascade.php @@ -8,76 +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', ), + ), 'lang' => array( 'core' => array(DOKU_CONF . 'lang/'), 'template' => array(DOKU_CONF . 'plugin_lang/'), 'plugin' => array(DOKU_CONF . 'template_lang/') - ) - ), - $config_cascade + ) + ), + $config_cascade ); -- cgit v1.2.3 From dd7a6159c4224a6a3dda22a1f35f5fb13b06ec2e Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Sun, 28 Sep 2014 13:27:05 +0200 Subject: use config cascade for loading of localizations --- inc/config_cascade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'inc/config_cascade.php') diff --git a/inc/config_cascade.php b/inc/config_cascade.php index 72b4493cf..1d9f67edb 100644 --- a/inc/config_cascade.php +++ b/inc/config_cascade.php @@ -73,8 +73,8 @@ $config_cascade = array_merge( ), 'lang' => array( 'core' => array(DOKU_CONF . 'lang/'), - 'template' => array(DOKU_CONF . 'plugin_lang/'), - 'plugin' => array(DOKU_CONF . 'template_lang/') + 'plugin' => array(DOKU_CONF . 'plugin_lang/'), + 'template' => array(DOKU_CONF . 'template_lang/') ) ), $config_cascade -- cgit v1.2.3 From 7b909d5e68cfee08dd85a3f28a2bdc9d6f41aaff Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Wed, 10 Dec 2014 21:24:29 +0100 Subject: Extendable config cascade for userstyles and userscript Added user*.less files to config --- inc/config_cascade.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'inc/config_cascade.php') diff --git a/inc/config_cascade.php b/inc/config_cascade.php index 1d9f67edb..a6dfadc80 100644 --- a/inc/config_cascade.php +++ b/inc/config_cascade.php @@ -49,13 +49,13 @@ $config_cascade = array_merge( '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' => array(DOKU_CONF . 'userstyle.css', DOKU_CONF . 'userstyle.less'), + 'print' => array(DOKU_CONF . 'userprint.css', DOKU_CONF . 'userprint.less'), + 'feed' => array(DOKU_CONF . 'userfeed.css', DOKU_CONF . 'userfeed.less'), + 'all' => array(DOKU_CONF . 'userall.css', DOKU_CONF . 'userall.less') ), 'userscript' => array( - 'default' => DOKU_CONF . 'userscript.js' + 'default' => array(DOKU_CONF . 'userscript.js') ), 'acl' => array( 'default' => DOKU_CONF . 'acl.auth.php', -- cgit v1.2.3