core: Internationalize some strings & update l10n-fr & change translation for 'is not a valid %s'.

This commit is contained in:
Valentin Lorentz 2012-07-30 11:35:44 +02:00
parent e8fd44570a
commit 82fdc2dda3
3 changed files with 470 additions and 919 deletions

File diff suppressed because it is too large Load Diff

View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2012-06-09 19:15+CEST\n"
"POT-Creation-Date: 2012-07-30 11:34+CEST\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"
@ -140,6 +140,10 @@ msgstr ""
msgid "I need to be at least halfopped to %s."
msgstr ""
#: src/commands.py:351 src/commands.py:498
msgid "channel"
msgstr ""
#: src/commands.py:362
msgid "nick or hostmask"
msgstr ""
@ -148,10 +152,18 @@ msgstr ""
msgid "regular expression"
msgstr ""
#: src/commands.py:427 src/commands.py:431
msgid "nick"
msgstr ""
#: src/commands.py:428
msgid "That nick is too long for this server."
msgstr ""
#: src/commands.py:439
msgid "I haven't seen %s."
msgstr ""
#: src/commands.py:477 src/commands.py:496
msgid "I'm not in %s."
msgstr ""
@ -164,10 +176,6 @@ msgstr ""
msgid "You must be in %s."
msgstr ""
#: src/commands.py:498
msgid "channel"
msgstr ""
#: src/commands.py:505
msgid "%s is not in %s."
msgstr ""
@ -180,6 +188,14 @@ msgstr ""
msgid "This message must be sent in a channel."
msgstr ""
#: src/commands.py:588
msgid "url"
msgstr ""
#: src/commands.py:594
msgid "email"
msgstr ""
#: src/commands.py:602
msgid "http url"
msgstr ""

View File

@ -348,7 +348,7 @@ def validChannel(irc, msg, args, state):
if irc.isChannel(args[0]):
state.args.append(args.pop(0))
else:
state.errorInvalid('channel', args[0])
state.errorInvalid(_('channel'), args[0])
def getHostmask(irc, msg, args, state):
if ircutils.isUserHostmask(args[0]):
@ -424,11 +424,11 @@ def getNick(irc, msg, args, state):
if ircutils.isNick(args[0], conf.supybot.protocols.irc.strictRfc()):
if 'nicklen' in irc.state.supported:
if len(args[0]) > irc.state.supported['nicklen']:
state.errorInvalid('nick', args[0],
state.errorInvalid(_('nick'), args[0],
_('That nick is too long for this server.'))
state.args.append(args.pop(0))
else:
state.errorInvalid('nick', args[0])
state.errorInvalid(_('nick'), args[0])
def getSeenNick(irc, msg, args, state, errmsg=None):
try:
@ -436,7 +436,7 @@ def getSeenNick(irc, msg, args, state, errmsg=None):
state.args.append(args.pop(0))
except KeyError:
if errmsg is None:
errmsg = 'I haven\'t seen %s.' % args[0]
errmsg = _('I haven\'t seen %s.') % args[0]
state.error(errmsg, Raise=True)
def getChannel(irc, msg, args, state):
@ -585,13 +585,13 @@ def getUrl(irc, msg, args, state):
if utils.web.urlRe.match(args[0]):
state.args.append(args.pop(0))
else:
state.errorInvalid('url', args[0])
state.errorInvalid(_('url'), args[0])
def getEmail(irc, msg, args, state):
if utils.net.emailRe.match(args[0]):
state.args.append(args.pop(0))
else:
state.errorInvalid('email', args[0])
state.errorInvalid(_('email'), args[0])
def getHttpUrl(irc, msg, args, state):
if utils.web.httpUrlRe.match(args[0]):