Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-23 19:19:32 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'i18n' into l10n-fr

Browse Source
This commit is contained in:
Valentin Lorentz 2010-10-31 13:41:44 +01:00
commit 0616e7f9a3
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/callbacks.py
View File

@ -852,8 +852,11 @@ class NestedCommandsIrcProxy(ReplyIrcProxy):
allowedLength = conf.get(conf.supybot.reply.mores.length, allowedLength = conf.get(conf.supybot.reply.mores.length,
target) target)
if not allowedLength: # 0 indicates this. if not allowedLength: # 0 indicates this.
allowedLength = 450 - len(self.irc.prefix) allowedLength = 470 - len(self.irc.prefix)
allowedLength -= len(msg.nick) allowedLength -= len(msg.nick)
# The '(XX more messages)' may have not the same
# length in the current locale
allowedLength -= len(_('(XX more messages)'))
maximumMores = conf.get(conf.supybot.reply.mores.maximum, maximumMores = conf.get(conf.supybot.reply.mores.maximum,
target) target)
maximumLength = allowedLength * maximumMores maximumLength = allowedLength * maximumMores
@ -866,7 +869,7 @@ class NestedCommandsIrcProxy(ReplyIrcProxy):
# In case we're truncating, we add 20 to allowedLength, # In case we're truncating, we add 20 to allowedLength,
# because our allowedLength is shortened for the # because our allowedLength is shortened for the
# "(XX more messages)" trailer. # "(XX more messages)" trailer.
s = s[:allowedLength+20] s = s[:allowedLength+len(_('(XX more messages)'))]
# There's no need for action=self.action here because # There's no need for action=self.action here because
# action implies noLengthCheck, which has already been # action implies noLengthCheck, which has already been
# handled. Let's stick an assert in here just in case. # handled. Let's stick an assert in here just in case.

4
src/conf.py
View File

@ -611,9 +611,9 @@ registerChannelValue(supybot.commands.nested, 'pipeSyntax',
example: 'bot: foo | bar'."""))) example: 'bot: foo | bar'.""")))
registerGroup(supybot.commands, 'defaultPlugins', registerGroup(supybot.commands, 'defaultPlugins',
orderAlphabetically=True, help="""Determines what commands have default orderAlphabetically=True, help=_("""Determines what commands have default
plugins set, and which plugins are set to be the default for each of those plugins set, and which plugins are set to be the default for each of those
commands.""") commands."""))
registerGlobalValue(supybot.commands.defaultPlugins, 'importantPlugins', registerGlobalValue(supybot.commands.defaultPlugins, 'importantPlugins',
registry.SpaceSeparatedSetOfStrings( registry.SpaceSeparatedSetOfStrings(
['Admin', 'Channel', 'Config', 'Misc', 'Owner', 'Plugin', 'User'], ['Admin', 'Channel', 'Config', 'Misc', 'Owner', 'Plugin', 'User'],