Merge branch 'i18n' into l10n-fr

This commit is contained in:
Valentin Lorentz 2010-12-12 15:03:22 +01:00
commit 59dad0501f
2 changed files with 11 additions and 3 deletions

View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2010-10-16 12:34+CEST\n"
"POT-Creation-Date: 2010-12-12 15:02+CET\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -15,6 +15,14 @@ msgstr ""
"Generated-By: pygettext.py 1.5\n"
#: plugin.py:103
msgid "configuration variable"
msgstr ""
#: plugin.py:109
msgid "settable configuration variable"
msgstr ""
#: plugin.py:136
#, docstring
msgid ""

View File

@ -100,13 +100,13 @@ def getConfigVar(irc, msg, args, state):
state.args.append(group)
del args[0]
except registry.InvalidRegistryName, e:
state.errorInvalid('configuration variable', str(e))
state.errorInvalid(_('configuration variable'), str(e))
addConverter('configVar', getConfigVar)
def getSettableConfigVar(irc, msg, args, state):
getConfigVar(irc, msg, args, state)
if not hasattr(state.args[-1], 'set'):
state.errorInvalid('settable configuration variable',
state.errorInvalid(_('settable configuration variable'),
state.args[-1]._name)
addConverter('settableConfigVar', getSettableConfigVar)