From e52db064cae9a02aaa37b25a0b4de0c646af20bd Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Sun, 22 Jan 2017 12:50:00 +0100 Subject: [PATCH] Less ambiguous name for the content of @owner announce. --- plugins/Owner/config.py | 4 ++-- plugins/Owner/plugin.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/Owner/config.py b/plugins/Owner/config.py index 61183c0f9..0a5d5b28c 100644 --- a/plugins/Owner/config.py +++ b/plugins/Owner/config.py @@ -46,10 +46,10 @@ conf.registerGlobalValue(Owner, 'public', registry.Boolean(True, """Determines whether this plugin is publicly visible.""")) conf.registerGlobalValue(Owner, 'announceFormat', - registry.String('Announcement from my owner ($owner): $message', + registry.String('Announcement from my owner ($owner): $text', """Determines the format of messages sent by the @announce command. $owner may be used for the username of the owner calling this command, - and $message for the announcement being made.""")) + and $text for the announcement being made.""")) conf.registerGlobalValue(Owner, 'quitMsg', registry.String('$version', """Determines what quit message will be used by default. If the quit command is called without a quit message, this will be used. If diff --git a/plugins/Owner/plugin.py b/plugins/Owner/plugin.py index a83941823..fa576315d 100644 --- a/plugins/Owner/plugin.py +++ b/plugins/Owner/plugin.py @@ -287,7 +287,7 @@ class Owner(callbacks.Plugin): template = self.registryValue('announceFormat') text = ircutils.standardSubstitute( - irc, msg, template, env={'owner': u.name, 'message': text}) + irc, msg, template, env={'owner': u.name, 'text': text}) for channel in irc.state.channels: c = ircdb.channels.getChannel(channel)