From e41dedb1124bba8428cc9ff92c617374cb8c6a5c Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Sat, 4 Jun 2011 17:59:35 +0200 Subject: [PATCH 1/4] Games: fix typo (die -> dice) --- plugins/Games/locale/fr.po | 2 +- plugins/Games/messages.pot | 2 +- plugins/Games/plugin.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/Games/locale/fr.po b/plugins/Games/locale/fr.po index bdeabee12..321c7b552 100644 --- a/plugins/Games/locale/fr.po +++ b/plugins/Games/locale/fr.po @@ -40,7 +40,7 @@ msgstr "pile" msgid "" "d\n" "\n" -" Rolls a die with number of sides times.\n" +" Rolls a dice with number of sides times.\n" " For example, 2d6 will roll 2 six-sided dice; 10d10 will roll 10\n" " ten-sided dice.\n" " " diff --git a/plugins/Games/messages.pot b/plugins/Games/messages.pot index 3f15674d2..1958f5ff6 100644 --- a/plugins/Games/messages.pot +++ b/plugins/Games/messages.pot @@ -37,7 +37,7 @@ msgstr "" msgid "" "d\n" "\n" -" Rolls a die with number of sides times.\n" +" Rolls a dice with number of sides times.\n" " For example, 2d6 will roll 2 six-sided dice; 10d10 will roll 10\n" " ten-sided dice.\n" " " diff --git a/plugins/Games/plugin.py b/plugins/Games/plugin.py index 931c79d2d..f6b720224 100644 --- a/plugins/Games/plugin.py +++ b/plugins/Games/plugin.py @@ -57,7 +57,7 @@ class Games(callbacks.Plugin): def dice(self, irc, msg, args, m): """d - Rolls a die with number of sides times. + Rolls a dice with number of sides times. For example, 2d6 will roll 2 six-sided dice; 10d10 will roll 10 ten-sided dice. """ From 73cf53f8e66442bfbd405e62ca94104b37e9ca35 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Sun, 5 Jun 2011 19:58:50 +0200 Subject: [PATCH 2/4] Revert "Games: fix typo (die -> dice)" This reverts commit e41dedb1124bba8428cc9ff92c617374cb8c6a5c. --- plugins/Games/locale/fr.po | 2 +- plugins/Games/messages.pot | 2 +- plugins/Games/plugin.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/Games/locale/fr.po b/plugins/Games/locale/fr.po index 321c7b552..bdeabee12 100644 --- a/plugins/Games/locale/fr.po +++ b/plugins/Games/locale/fr.po @@ -40,7 +40,7 @@ msgstr "pile" msgid "" "d\n" "\n" -" Rolls a dice with number of sides times.\n" +" Rolls a die with number of sides times.\n" " For example, 2d6 will roll 2 six-sided dice; 10d10 will roll 10\n" " ten-sided dice.\n" " " diff --git a/plugins/Games/messages.pot b/plugins/Games/messages.pot index 1958f5ff6..3f15674d2 100644 --- a/plugins/Games/messages.pot +++ b/plugins/Games/messages.pot @@ -37,7 +37,7 @@ msgstr "" msgid "" "d\n" "\n" -" Rolls a dice with number of sides times.\n" +" Rolls a die with number of sides times.\n" " For example, 2d6 will roll 2 six-sided dice; 10d10 will roll 10\n" " ten-sided dice.\n" " " diff --git a/plugins/Games/plugin.py b/plugins/Games/plugin.py index f6b720224..931c79d2d 100644 --- a/plugins/Games/plugin.py +++ b/plugins/Games/plugin.py @@ -57,7 +57,7 @@ class Games(callbacks.Plugin): def dice(self, irc, msg, args, m): """d - Rolls a dice with number of sides times. + Rolls a die with number of sides times. For example, 2d6 will roll 2 six-sided dice; 10d10 will roll 10 ten-sided dice. """ From 6c1699583b23f13b5a76f67a597505097df14cc3 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Sun, 5 Jun 2011 20:30:32 +0200 Subject: [PATCH 3/4] Misc: use Limnoria version string. --- plugins/Misc/plugin.py | 18 ++++++++++++++---- src/version.py | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/plugins/Misc/plugin.py b/plugins/Misc/plugin.py index 4f9510148..14ca111bc 100644 --- a/plugins/Misc/plugin.py +++ b/plugins/Misc/plugin.py @@ -28,6 +28,7 @@ # POSSIBILITY OF SUCH DAMAGE. ### +import re import os import sys import time @@ -212,13 +213,22 @@ class Misc(callbacks.Plugin): Returns the version of the current bot. """ try: - newest = utils.web.getUrl('http://supybot.sf.net/version.txt') - newest = _('The newest version available online is %s.') % \ - newest.strip() + newestUrl = 'https://github.com/ProgVal/Limnoria/raw/%s/' + \ + 'src/version.py' + versions = {} + for branch in ('master', 'testing'): + file = utils.web.getUrl(newestUrl % branch) + match = re.search(r"^version = '([^']+)'$", file, re.M) + if match is None: + continue + versions[branch] = match.group(1) + newest = _('The newest versions available online are %s.') % \ + ', '.join(['%s (in %s)' % (y,x) + for x,y in versions.items()]) except utils.web.Error, e: self.log.info('Couldn\'t get website version: %s', e) newest = _('I couldn\'t fetch the newest version ' - 'from the Supybot website.') + 'from the Limnoria repository.') s = _('The current (running) version of this Supybot is %s. %s') % \ (conf.version, newest) irc.reply(s) diff --git a/src/version.py b/src/version.py index c772ecd95..e70bdf65e 100644 --- a/src/version.py +++ b/src/version.py @@ -1,3 +1,3 @@ """stick the various versioning attributes in here, so we only have to change them once.""" -version = '0.83.4.1+limnoria (2011-05-27T18:16:23+0200)' +version = '0.83.4.1+limnoria (2011-06-05T20:30:31+0200)' From 28a3067eeeb5de297f36e9c7a98423d801220bd2 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Mon, 6 Jun 2011 19:06:52 +0200 Subject: [PATCH 4/4] Misc: update i18n and l10n-fr --- plugins/Misc/locale/fr.po | 60 ++++++++++++++++++------------- plugins/Misc/messages.pot | 76 ++++++++++++++++++++------------------- plugins/Misc/plugin.py | 2 +- 3 files changed, 77 insertions(+), 61 deletions(-) diff --git a/plugins/Misc/locale/fr.po b/plugins/Misc/locale/fr.po index 560125e56..304287d31 100644 --- a/plugins/Misc/locale/fr.po +++ b/plugins/Misc/locale/fr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Supybot-fr\n" -"POT-Creation-Date: 2010-10-17 15:35+CEST\n" +"POT-Creation-Date: 2011-06-06 19:05+CEST\n" "PO-Revision-Date: \n" "Last-Translator: Valentin Lorentz \n" "Language-Team: Supybot-fr \n" @@ -123,19 +123,23 @@ msgstr "" "\n" "Retourne la version actuelle du bot" -#: plugin.py:217 -msgid "The newest version available online is %s." -msgstr "La dernière version disponible en ligne est %s." +#: plugin.py:225 +msgid "The newest versions available online are %s." +msgstr "Les dernières versions disponibles en ligne sont %s." -#: plugin.py:221 -msgid "I couldn't fetch the newest version from the Supybot website." -msgstr "Je ne peux récupérer la dernière version sur le site de Supybot." +#: plugin.py:226 +msgid "%s (in %s)" +msgstr "%s (dans %s)" -#: plugin.py:223 +#: plugin.py:230 +msgid "I couldn't fetch the newest version from the Limnoria repository." +msgstr "Je ne peux récupérer la dernière version sur le dépôt de Limnoria." + +#: plugin.py:232 msgid "The current (running) version of this Supybot is %s. %s" msgstr "La version de ce Supybot est %s. %s" -#: plugin.py:230 +#: plugin.py:239 msgid "" "takes no arguments\n" "\n" @@ -146,11 +150,11 @@ msgstr "" "\n" "Retourne une URL disant où trouver Supybot." -#: plugin.py:234 +#: plugin.py:243 msgid "My source is at http://supybot.com/" msgstr "Ma source est disponible sur http://supybot.com/" -#: plugin.py:239 +#: plugin.py:248 msgid "" "[]\n" "\n" @@ -164,23 +168,31 @@ msgstr "" "\n" "Si la dernière commande était tronquée par les limitations de taille des messages sur IRC, retourne le morceau suivant résultant de la dernière commande. Si le est donné, continue la dernière commande du plutôt que de la personne envoyant ce message." -#: plugin.py:253 +#: plugin.py:262 msgid "%s has no public mores." msgstr "%s n'a pas de 'more' public." -#: plugin.py:256 +#: plugin.py:265 msgid "Sorry, I can't find any mores for %s" msgstr "Désolé, je ne peux trouver de 'more' pour %s" -#: plugin.py:265 +#: plugin.py:272 +msgid "more message" +msgstr "autre message" + +#: plugin.py:274 +msgid "more messages" +msgstr "autres messages" + +#: plugin.py:278 msgid "You haven't asked me a command; perhaps you want to see someone else's more. To do so, call this command with that person's nick." msgstr "Vous ne m'avez donné aucune commande. Peut-être que vous voulez voir celle de quelqu'un d'autre. Pour cela, appelez cette commande en ajoutant le nick de cette personne." -#: plugin.py:269 +#: plugin.py:282 msgid "That's all, there is no more." msgstr "C'est tout, il n'y a plus de 'more'" -#: plugin.py:279 +#: plugin.py:292 msgid "" "[--{from,in,on,with,without,regexp} ] [--nolimit]\n" "\n" @@ -197,11 +209,11 @@ msgstr "" "\n" "Retourne le dernier message correspondant aux critères donnés. --from requiert le nick de la personne qui a envoyé le message ; --in requiert le canal sur lequel a été envoyé le message ; --with requiert une chaîne qui doit être dans le message --regexp requiert une expression régulière à laquelle le message doit correspondre ; --nolimit retourne tous les messages qui peuvent être trouvés. Par défaut, recherche dans les logs du canal sur lequel est envoyée cette commande." -#: plugin.py:373 +#: plugin.py:386 msgid "I couldn't find a message matching that criteria in my history of %s messages." msgstr "Je ne peux trouver de message correspondant à ce critère dans mon historique de %s messages." -#: plugin.py:388 +#: plugin.py:401 msgid "" " \n" "\n" @@ -213,23 +225,23 @@ msgstr "" "\n" "Dit le au . Utile si vous utilisez des commandes imbriquées." -#: plugin.py:396 +#: plugin.py:409 msgid "Dude, just give the command. No need for the tell." msgstr "Mec, contentes-toi de me donner la commande. Pas besoin d'utiliser 'tell'." -#: plugin.py:401 +#: plugin.py:414 msgid "You just told me, why should I tell myself?" msgstr "Vous venez de me le dire, pourquoi devrais-je me le dire moi-même ?" -#: plugin.py:406 +#: plugin.py:419 msgid "I haven't seen %s, I'll let you do the telling." msgstr "Je n'ai pas vu %s, je vous laisse lui dire." -#: plugin.py:411 +#: plugin.py:424 msgid "%s wants me to tell you: %s" msgstr "%s veut que je vous dise : %s" -#: plugin.py:417 +#: plugin.py:430 msgid "" "takes no arguments\n" "\n" @@ -240,7 +252,7 @@ msgstr "" "\n" "Vérifie si le bot est encore en vie." -#: plugin.py:421 +#: plugin.py:434 msgid "pong" msgstr "pong" diff --git a/plugins/Misc/messages.pot b/plugins/Misc/messages.pot index 61ee56d81..0cffa4cff 100644 --- a/plugins/Misc/messages.pot +++ b/plugins/Misc/messages.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-02-26 09:49+CET\n" +"POT-Creation-Date: 2011-06-06 19:05+CEST\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,15 +45,15 @@ msgid "" " command" msgstr "" -#: plugin.py:80 +#: plugin.py:81 msgid "You've given me %s invalid commands within the last minute; I'm now ignoring you for %s." msgstr "" -#: plugin.py:92 +#: plugin.py:93 msgid "The %q plugin is loaded, but there is no command named %q in it. Try \"list %s\" to see the commands in the %q plugin." msgstr "" -#: plugin.py:118 +#: plugin.py:119 #, docstring msgid "" "[--private] []\n" @@ -64,19 +64,19 @@ msgid "" " " msgstr "" -#: plugin.py:143 +#: plugin.py:144 msgid "There are no private plugins." msgstr "" -#: plugin.py:145 +#: plugin.py:146 msgid "There are no public plugins." msgstr "" -#: plugin.py:152 +#: plugin.py:153 msgid "That plugin exists, but has no commands. This probably means that it has some configuration variables that can be changed in order to modify its behavior. Try \"config list supybot.plugins.%s\" to see what configuration variables it has." msgstr "" -#: plugin.py:163 +#: plugin.py:164 #, docstring msgid "" "\n" @@ -86,11 +86,11 @@ msgid "" " " msgstr "" -#: plugin.py:182 +#: plugin.py:183 msgid "No appropriate commands were found." msgstr "" -#: plugin.py:187 +#: plugin.py:188 #, docstring msgid "" "[] []\n" @@ -100,15 +100,15 @@ msgid "" " " msgstr "" -#: plugin.py:197 +#: plugin.py:198 msgid "That command exists in the %L plugins. Please specify exactly which plugin command you want help with." msgstr "" -#: plugin.py:204 +#: plugin.py:205 msgid "There is no command %q." msgstr "" -#: plugin.py:210 +#: plugin.py:211 #, docstring msgid "" "takes no arguments\n" @@ -117,19 +117,23 @@ msgid "" " " msgstr "" -#: plugin.py:216 -msgid "The newest version available online is %s." +#: plugin.py:225 +msgid "The newest versions available online are %s." msgstr "" -#: plugin.py:220 -msgid "I couldn't fetch the newest version from the Supybot website." +#: plugin.py:226 +msgid "%s (in %s)" msgstr "" -#: plugin.py:222 +#: plugin.py:230 +msgid "I couldn't fetch the newest version from the Limnoria repository." +msgstr "" + +#: plugin.py:232 msgid "The current (running) version of this Supybot is %s. %s" msgstr "" -#: plugin.py:229 +#: plugin.py:239 #, docstring msgid "" "takes no arguments\n" @@ -138,11 +142,11 @@ msgid "" " " msgstr "" -#: plugin.py:233 +#: plugin.py:243 msgid "My source is at http://supybot.com/" msgstr "" -#: plugin.py:238 +#: plugin.py:248 #, docstring msgid "" "[]\n" @@ -154,31 +158,31 @@ msgid "" " " msgstr "" -#: plugin.py:252 +#: plugin.py:262 msgid "%s has no public mores." msgstr "" -#: plugin.py:255 +#: plugin.py:265 msgid "Sorry, I can't find any mores for %s" msgstr "" -#: plugin.py:262 +#: plugin.py:272 msgid "more message" msgstr "" -#: plugin.py:264 +#: plugin.py:274 msgid "more messages" msgstr "" -#: plugin.py:268 +#: plugin.py:278 msgid "You haven't asked me a command; perhaps you want to see someone else's more. To do so, call this command with that person's nick." msgstr "" -#: plugin.py:272 +#: plugin.py:282 msgid "That's all, there is no more." msgstr "" -#: plugin.py:282 +#: plugin.py:292 #, docstring msgid "" "[--{from,in,on,with,without,regexp} ] [--nolimit]\n" @@ -193,11 +197,11 @@ msgid "" " " msgstr "" -#: plugin.py:376 +#: plugin.py:386 msgid "I couldn't find a message matching that criteria in my history of %s messages." msgstr "" -#: plugin.py:391 +#: plugin.py:401 #, docstring msgid "" " \n" @@ -207,23 +211,23 @@ msgid "" " " msgstr "" -#: plugin.py:399 +#: plugin.py:409 msgid "Dude, just give the command. No need for the tell." msgstr "" -#: plugin.py:404 +#: plugin.py:414 msgid "You just told me, why should I tell myself?" msgstr "" -#: plugin.py:409 +#: plugin.py:419 msgid "I haven't seen %s, I'll let you do the telling." msgstr "" -#: plugin.py:414 +#: plugin.py:424 msgid "%s wants me to tell you: %s" msgstr "" -#: plugin.py:420 +#: plugin.py:430 #, docstring msgid "" "takes no arguments\n" @@ -232,7 +236,7 @@ msgid "" " " msgstr "" -#: plugin.py:424 +#: plugin.py:434 msgid "pong" msgstr "" diff --git a/plugins/Misc/plugin.py b/plugins/Misc/plugin.py index 14ca111bc..483098007 100644 --- a/plugins/Misc/plugin.py +++ b/plugins/Misc/plugin.py @@ -223,7 +223,7 @@ class Misc(callbacks.Plugin): continue versions[branch] = match.group(1) newest = _('The newest versions available online are %s.') % \ - ', '.join(['%s (in %s)' % (y,x) + ', '.join([_('%s (in %s)') % (y,x) for x,y in versions.items()]) except utils.web.Error, e: self.log.info('Couldn\'t get website version: %s', e)