Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'i18n' into l10n-fr

This commit is contained in:
Valentin Lorentz 2010-10-28 15:18:53 +02:00
parent 9b67f670c2 f3a579f3da
commit 827ab3532e
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/ChannelStats/locale/fr.po
View File

@ -45,7 +45,7 @@ msgstr "Je ne peux vous trouver dans ma base de données."
#: plugin.py:272 #: plugin.py:272
msgid "%s has sent %n; a total of %n, %n, %n, and %n; %s of those messages %s. %s has joined %n, parted %n, quit %n, kicked someone %n, been kicked %n, changed the topic %n, and changed the mode %n." msgid "%s has sent %n; a total of %n, %n, %n, and %n; %s of those messages %s. %s has joined %n, parted %n, quit %n, kicked someone %n, been kicked %n, changed the topic %n, and changed the mode %n."
msgstr "%s a envoyé %n ; un total de %n, %n, %n, et %n ; %s de ces messages %s. %s est arrivé %nfois, est parti %nfois, a quitté %nfois, a kické %nfois, a été kické %nfois, a changé le topic %nfois, et a changé les modes %nfois." msgstr "%s a envoyé %n ; un total de %n, %n, %n, et %n ; %s de ces messages %s. %s est arrivé %n fois, est parti %n fois, a quitté %n fois, a kické %n fois, a été kické %n fois, a changé le topic %n fois, et a changé les modes %n fois."
#: plugin.py:279 #: plugin.py:279
msgid "character" msgid "character"
@ -84,7 +84,7 @@ msgstr "étaient des ACTIONs"
#: plugin.py:292 #: plugin.py:292
#: plugin.py:293 #: plugin.py:293
msgid "time" msgid "time"
msgstr " fois" msgstr "<empty>"
#: plugin.py:296 #: plugin.py:296
msgid "I have no stats for that %s in %s." msgid "I have no stats for that %s in %s."

11
src/utils/str.py
View File

@ -294,17 +294,28 @@ def depluralize(s):
def nItems(n, item, between=None): def nItems(n, item, between=None):
"""Works like this: """Works like this:
>>> nItems(4, '<empty>')
'4'
>>> nItems(1, 'clock') >>> nItems(1, 'clock')
'1 clock' '1 clock'
>>> nItems(10, 'clock') >>> nItems(10, 'clock')
'10 clocks' '10 clocks'
>>> nItems(4, '<empty>', between='grandfather')
'4 grandfather'
>>> nItems(10, 'clock', between='grandfather') >>> nItems(10, 'clock', between='grandfather')
'10 grandfather clocks' '10 grandfather clocks'
""" """
assert isinstance(n, int) or isinstance(n, long), \ assert isinstance(n, int) or isinstance(n, long), \
'The order of the arguments to nItems changed again, sorry.' 'The order of the arguments to nItems changed again, sorry.'
if item == '<empty>':
if between is None:
return format('%s', n)
else:
return format('%s %s', n, item)
if between is None: if between is None:
if n != 1: if n != 1:
return format('%s %p', n, item) return format('%s %p', n, item)