From 712f2333f18786febf7597bd483f955557faf074 Mon Sep 17 00:00:00 2001 From: Simon DELAGE Date: Sat, 13 Jun 2015 02:45:07 +0200 Subject: [PATCH] Changed default back to 'messages' Switching to online would have required a change of Tag's plugin helper code. --- action.php | 6 +++--- conf/default.php | 2 +- lang/en/lang.php | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/action.php b/action.php index 5c40d1c..a3e8995 100644 --- a/action.php +++ b/action.php @@ -24,8 +24,8 @@ class action_plugin_tagalerts extends DokuWiki_Action_Plugin{ global $ID; global $conf; - $tags = plugin_load('helper', 'tag'); - if(is_null($tags)) { + $tagplugin = plugin_load('helper', 'tag'); + if(is_null($tagplugin)) { msg($this->getLang('tag_required'), -1); return false; } @@ -78,7 +78,7 @@ class action_plugin_tagalerts extends DokuWiki_Action_Plugin{ // Register the plugin conf file in ConfManager Plugin public function addConfigFile(Doku_Event $event, $params) { if (class_exists('ConfigManagerTwoLine')) { - $config = new ConfigManagerTwoLine('Tag Alerts', 'Description of my plugin', DOKU_PLUGIN . 'tagalerts/conf/tagalerts.conf'); + $config = new ConfigManagerTwoLine('Tag Alerts', $this->getLang('description'), DOKU_PLUGIN . 'tagalerts/conf/tagalerts.conf'); $event->data[] = $config; } } diff --git a/conf/default.php b/conf/default.php index eae1944..e7ab17c 100644 --- a/conf/default.php +++ b/conf/default.php @@ -6,7 +6,7 @@ * @license: CC Attribution-Share Alike 3.0 Unported */ -$conf['inline'] = '1'; +$conf['inline'] = '0'; $conf['error'] = ''; //comma separated list of tags for wich a "tag error" should be thrown $conf['info'] = ''; //comma separated list of tags for wich a "tag info" should be thrown $conf['success'] = ''; //comma separated list of tags for wich a "tag success" should be thrown diff --git a/lang/en/lang.php b/lang/en/lang.php index a77e43e..98e9fb9 100644 --- a/lang/en/lang.php +++ b/lang/en/lang.php @@ -6,5 +6,6 @@ * @license: CC Attribution-Share Alike 3.0 Unported */ +$lang['description'] = 'This plugin is made to show alerts when some specified tags are detected. Use this file to define tags\' specific messages (one tag and one message per line).'; $lang['tagalerts'] = 'This page has been marked as '; $lang['tag_required'] = 'The Tag plugin is required for Tag Alerts to be of any use (https://www.dokuwiki.org/plugin:tag).';