From 08175fc920b44745eaeb6db851ad922c7b1988c4 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Wed, 29 Jun 2011 09:40:05 +0200 Subject: [PATCH 1/2] Conditional: Update l10n-fi --- plugins/Conditional/locale/fi.po | 89 ++++++++++++++++---------------- 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/plugins/Conditional/locale/fi.po b/plugins/Conditional/locale/fi.po index 53c39c765..8fc6a2eee 100644 --- a/plugins/Conditional/locale/fi.po +++ b/plugins/Conditional/locale/fi.po @@ -1,14 +1,15 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR ORGANIZATION -# FIRST AUTHOR , YEAR. +# Mika Suomalainen , 2011. # msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-11-02 11:39+CET\n" -"PO-Revision-Date: 2011-06-07 21:48+0200\n" +"POT-Creation-Date: 2011-06-28 19:37+CEST\n" +"PO-Revision-Date: 2011-06-28 22:52+0200\n" "Last-Translator: Mika Suomalainen \n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -29,27 +30,27 @@ msgstr "Suorita komento viestistä, kuin komento olisi lähetetty IRC:stä." #: plugin.py:80 msgid "" " \n" -" \n" +"\n" " Runs if evaluates to true, runs \n" " if it evaluates to false.\n" -" \n" +"\n" " Use other logical operators defined in this plugin and command nesting\n" " to your advantage here.\n" " " msgstr "" " \n" -" \n" -" Suorittaa jos arvioituu todeksi, suorittaa \n" -" jos se arvioituu vääräksi.\n" -" \n" -"Käytä toisia loogisia operaatioita, jotka on määritetty lisäosassa ja rinnastettuja komentoja\n" -"eduksesi tässä.\n" +"\n" +" Suorittaa if kehittyy todeksi, suorittaa \n" +" jos se kehittyy epätodeksi.\n" +"\n" +" Käytä loogisia toimintoja, jotka on määritetty tässä laajennuksessa ja komentojen putkittamista\n" +" eduksesi tässä.\n" " " #: plugin.py:97 msgid "" " [ ... ]\n" -" \n" +"\n" " Returns true if all conditions supplied evaluate to true.\n" " " msgstr "" @@ -61,19 +62,19 @@ msgstr "" #: plugin.py:109 msgid "" " [ ... ]\n" -" \n" +"\n" " Returns true if any one of conditions supplied evaluates to true.\n" " " msgstr "" " [ ... ]\n" " \n" -" Palauttaa toden, jos yksikään edellytys tukee arvioimista todeksi.\n" +" Palauttaa toden, jos yksikin edellytys tukee arvioimista todeksi.\n" " " #: plugin.py:121 msgid "" " [ ... ]\n" -" \n" +"\n" " Returns true if only one of conditions supplied evaluates to true.\n" " " msgstr "" @@ -85,8 +86,8 @@ msgstr "" #: plugin.py:133 msgid "" " \n" -" \n" -" Does a string comparison on and . \n" +"\n" +" Does a string comparison on and .\n" " Returns true if they are equal.\n" " " msgstr "" @@ -99,8 +100,8 @@ msgstr "" #: plugin.py:146 msgid "" " \n" -" \n" -" Does a string comparison on and . \n" +"\n" +" Does a string comparison on and .\n" " Returns true if they are not equal.\n" " " msgstr "" @@ -113,22 +114,22 @@ msgstr "" #: plugin.py:159 msgid "" " \n" -" \n" -" Does a string comparison on and . \n" +"\n" +" Does a string comparison on and .\n" " Returns true if is greater than .\n" " " msgstr "" " \n" " \n" -" tekee ketju vertailun ja . \n" +" Tekee ketju vertailun ja . \n" " Palauttaa toden jos on suurempi kuin .\n" " " #: plugin.py:172 msgid "" " \n" -" \n" -" Does a string comparison on and . \n" +"\n" +" Does a string comparison on and .\n" " Returns true if is greater than or equal to .\n" " " msgstr "" @@ -141,8 +142,8 @@ msgstr "" #: plugin.py:185 msgid "" " \n" -" \n" -" Does a string comparison on and . \n" +"\n" +" Does a string comparison on and .\n" " Returns true if is less than .\n" " " msgstr "" @@ -155,8 +156,8 @@ msgstr "" #: plugin.py:198 msgid "" " \n" -" \n" -" Does a string comparison on and . \n" +"\n" +" Does a string comparison on and .\n" " Returns true if is less than or equal to .\n" " " msgstr "" @@ -169,22 +170,22 @@ msgstr "" #: plugin.py:211 msgid "" " \n" -" \n" -" Determines if is a substring of . \n" +"\n" +" Determines if is a substring of .\n" " Returns true if is contained in .\n" " " msgstr "" -" \n" +" \n" " \n" -" Määrittää onko . \n" +" Määrittää onko . \n" " Palauttaa toden, jos .\n" " " #: plugin.py:224 msgid "" " \n" -" \n" -" Does a numeric comparison on and . \n" +"\n" +" Does a numeric comparison on and .\n" " Returns true if they are equal.\n" " " msgstr "" @@ -197,8 +198,8 @@ msgstr "" #: plugin.py:237 msgid "" " \n" -" \n" -" Does a numeric comparison on and . \n" +"\n" +" Does a numeric comparison on and .\n" " Returns true if they are not equal.\n" " " msgstr "" @@ -211,8 +212,8 @@ msgstr "" #: plugin.py:250 msgid "" " \n" -" \n" -" Does a numeric comparison on and . \n" +"\n" +" Does a numeric comparison on and .\n" " Returns true if they is greater than .\n" " " msgstr "" @@ -225,8 +226,8 @@ msgstr "" #: plugin.py:263 msgid "" " \n" -" \n" -" Does a numeric comparison on and . \n" +"\n" +" Does a numeric comparison on and .\n" " Returns true if is greater than or equal to .\n" " " msgstr "" @@ -239,8 +240,8 @@ msgstr "" #: plugin.py:276 msgid "" " \n" -" \n" -" Does a numeric comparison on and . \n" +"\n" +" Does a numeric comparison on and .\n" " Returns true if is less than .\n" " " msgstr "" @@ -253,8 +254,8 @@ msgstr "" #: plugin.py:289 msgid "" " \n" -" \n" -" Does a numeric comparison on and . \n" +"\n" +" Does a numeric comparison on and .\n" " Returns true if is less than or equal to .\n" " " msgstr "" From 5275d708e5e0fe8910e11d68dcc442dbb58e21d6 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Wed, 29 Jun 2011 13:56:22 +0200 Subject: [PATCH 2/2] Owner: Fix bug with @enable and @disable if a plugin is given. Closes GH-43. Closes GH-44. --- plugins/Owner/plugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Owner/plugin.py b/plugins/Owner/plugin.py index c7880b90a..64f8cd0bb 100644 --- a/plugins/Owner/plugin.py +++ b/plugins/Owner/plugin.py @@ -540,11 +540,11 @@ class Owner(callbacks.Plugin): if plugin.isCommand(command): pluginCommand = '%s.%s' % (plugin.name(), command) conf.supybot.commands.disabled().add(pluginCommand) + plugin._disabled.add(command) else: irc.error('%s is not a command in the %s plugin.' % (command, plugin.name())) return - self._disabled.add(pluginCommand, plugin.name()) else: conf.supybot.commands.disabled().add(command) self._disabled.add(command) @@ -560,8 +560,8 @@ class Owner(callbacks.Plugin): """ try: if plugin: + plugin._disabled.remove(command, plugin.name()) command = '%s.%s' % (plugin.name(), command) - self._disabled.remove(command, plugin.name()) else: self._disabled.remove(command) conf.supybot.commands.disabled().remove(command)