Merge remote-tracking branch 'nyuszika7h/remove-xrl' into testing

Conflicts:
	plugins/ShrinkUrl/plugin.py
This commit is contained in:
Valentin Lorentz 2015-02-07 08:39:17 +01:00
commit e26fdb9df8
7 changed files with 147 additions and 158 deletions

View File

@ -42,11 +42,11 @@ def configure(advanced):
conf.supybot.plugins.ShrinkUrl.shrinkSnarfer.setValue(True)
class ShrinkService(registry.OnlySomeStrings):
"""Valid values include 'ln', 'tiny', 'xrl', 'goo', 'ur1', and 'x0'."""
validStrings = ('ln', 'tiny', 'xrl', 'goo', 'ur1', 'x0')
"""Valid values include 'ln', 'tiny', 'goo', 'ur1', and 'x0'."""
validStrings = ('ln', 'tiny', 'goo', 'ur1', 'x0')
class ShrinkCycle(registry.SpaceSeparatedListOfStrings):
"""Valid values include 'ln', 'tiny', 'xrl', 'goo', 'ur1', and 'x0'."""
"""Valid values include 'ln', 'tiny', 'goo', 'ur1', and 'x0'."""
Value = ShrinkService
def __init__(self, *args, **kwargs):

View File

@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Limnoria\n"
"POT-Creation-Date: 2014-12-20 11:59+EET\n"
"PO-Revision-Date: 2014-12-20 12:21+0200\n"
"POT-Creation-Date: 2015-01-24 19:31+CET\n"
"PO-Revision-Date: 2015-01-24 19:31+0100\n"
"Last-Translator: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>\n"
"Language-Team: suomi <>\n"
"Language: fi\n"
@ -28,8 +28,8 @@ msgstr ""
" tämän kaappaajan olevan käytössä?"
#: config.py:45 config.py:49
msgid "Valid values include 'ln', 'tiny', 'xrl', 'goo', 'ur1', and 'x0'."
msgstr "Kelvolliset arvot ovat 'ln', 'tiny', 'xrl', 'goo', 'ur1' ja 'x0' ."
msgid "Valid values include 'ln', 'tiny', 'goo', 'ur1', and 'x0'."
msgstr "Kelvolliset arvot ovat 'ln', 'tiny', 'goo', 'ur1' ja 'x0' ."
#: config.py:70
msgid ""
@ -145,19 +145,7 @@ msgstr ""
"osoitteesta>.\n"
" "
#: plugin.py:248
msgid ""
"<url>\n"
"\n"
" Returns an xrl.us version of <url>.\n"
" "
msgstr ""
"<URL-osoite>\n"
"\n"
" Palauttaa xrl.us palvelun lyhentämän version <URL-osoitteesta>.\n"
" "
#: plugin.py:281
#: plugin.py:252
msgid ""
"<url>\n"
"\n"
@ -168,7 +156,7 @@ msgstr ""
"\n"
" Palauttaa goo.gl-palvelun lyhentämän version <URL-osoitteesta>."
#: plugin.py:311
#: plugin.py:282
msgid ""
"<url>\n"
"\n"
@ -179,7 +167,7 @@ msgstr ""
" Palauttaa ur1-version <url:stä>.\n"
" "
#: plugin.py:338
#: plugin.py:309
msgid ""
"<url>\n"
"\n"
@ -191,7 +179,7 @@ msgstr ""
" Palauttaa x0.no palvelun lyhentämän version <URL-osoitteesta>.\n"
" "
#: plugin.py:365
#: plugin.py:336
msgid ""
"<url>\n"
"\n"
@ -202,5 +190,16 @@ msgstr ""
" Palauttaa laajennetun version <url-osoitteesta>.\n"
" "
#~ msgid ""
#~ "<url>\n"
#~ "\n"
#~ " Returns an xrl.us version of <url>.\n"
#~ " "
#~ msgstr ""
#~ "<URL-osoite>\n"
#~ "\n"
#~ " Palauttaa xrl.us palvelun lyhentämän version <URL-osoitteesta>.\n"
#~ " "
#~ msgid "Valid values include 'ln', 'tiny', 'xrl', 'goo', and 'x0'."
#~ msgstr "Kelvolliset arvot ovat 'ln', 'tiny', 'xrl', 'goo' ja 'x0' ."

View File

@ -1,10 +1,11 @@
msgid ""
msgstr ""
"Project-Id-Version: Limnoria\n"
"POT-Creation-Date: 2013-03-03 19:39+CET\n"
"PO-Revision-Date: \n"
"POT-Creation-Date: 2015-01-24 19:31+CET\n"
"PO-Revision-Date: 2015-01-24 19:32+0100\n"
"Last-Translator: Valentin Lorentz <progval@gmail.com>\n"
"Language-Team: Limnoria <progval@gmail.com>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -21,16 +22,12 @@ msgstr ""
"canal pour en envoyer une version plus courte. Voulez-vous activer ce "
"snarfer ?"
#: config.py:45
msgid "Valid values include 'ln', 'tiny', 'xrl', 'goo', and 'x0'."
msgstr "Les valeurs valides incluent 'ln', 'tiny', 'xrl', 'goo', et 'x0'."
#: config.py:49
msgid "Valid values include 'ln', 'tiny', 'xrl', 'goo', 'ur1', and 'x0'."
#: config.py:45 config.py:49
msgid "Valid values include 'ln', 'tiny', 'goo', 'ur1', and 'x0'."
msgstr ""
"Les valeurs valides incluent 'ln', 'tiny', 'xrl', 'goo', 'ur1', et 'x0'."
"Les valeurs valides incluent 'ln', 'tiny', 'goo', 'ur1', et 'x0'."
#: config.py:71
#: config.py:70
msgid ""
"Determines whether the\n"
" shrink snarfer is enabled. This snarfer will watch for URLs in the\n"
@ -45,7 +42,7 @@ msgstr ""
"URL raccourcie avec ln-s.net ou tinyurl.com, comme défini par supybot."
"plugins.ShrinkUrl.default."
#: config.py:78
#: config.py:77
msgid ""
"Determines whether the snarfer will show the\n"
" domain of the URL being snarfed along with the shrunken URL."
@ -53,13 +50,13 @@ msgstr ""
"Détermine si le snarfer affichera le domaine de l'URL snarfée avec l'URL "
"raccourcie."
#: config.py:81
#: config.py:80
msgid ""
"The minimum length a URL must be before\n"
" the bot will shrink it."
msgstr "La taille minimum d'une URL pour que le bot la raccourcice."
#: config.py:84
#: config.py:83
msgid ""
"Determines what URLs are to be snarfed; URLs\n"
" matching the regexp given will not be snarfed. Give the empty string "
@ -70,7 +67,7 @@ msgstr ""
"l'expression régulière ne seront par snarfées. Donnez une chaîne vide si il "
"n'y a pas d'URL que vous voulez exclure."
#: config.py:88
#: config.py:87
msgid ""
"Determines whether the bot will shrink the\n"
" URLs of outgoing messages if those URLs are longer than\n"
@ -79,20 +76,20 @@ msgstr ""
"Détermine si le bot raccourcira les URLs des messages sortant si ces URLs "
"sont plus longues que supybot.plugins.ShrinkUrl.minimumLength."
#: config.py:92
#: config.py:91
msgid ""
"Determines what website the bot will use when\n"
" shrinking a URL."
msgstr "Détermine quel site web le bot utilisera pour raccourcir une URL"
#: config.py:95
#: config.py:94
msgid ""
"Determines whether this plugin will bold\n"
" certain portions of its replies."
msgstr ""
"Détermine si ce plugin mettra en gras certaines portions de ses réponses."
#: config.py:98
#: config.py:97
msgid ""
"If set to a non-empty value, specifies the list of\n"
" services to rotate through for the shrinkSnarfer and outFilter."
@ -100,7 +97,13 @@ msgstr ""
"Si définit à une valeur non vide, définit la liste des services à faire "
"tourner pour shrinkSnarfer et outFilter."
#: plugin.py:189
#: plugin.py:90
msgid ""
"This plugin features commands to shorten URLs through different services,\n"
" like tinyurl."
msgstr ""
#: plugin.py:192
msgid ""
"<url>\n"
"\n"
@ -111,7 +114,7 @@ msgstr ""
"\n"
"Retourne une version de ln-s.net de l'<url>."
#: plugin.py:216
#: plugin.py:219
msgid ""
"<url>\n"
"\n"
@ -122,18 +125,7 @@ msgstr ""
"\n"
"Retourne une version de TinyURL.com de l'<url>."
#: plugin.py:245
msgid ""
"<url>\n"
"\n"
" Returns an xrl.us version of <url>.\n"
" "
msgstr ""
"<url>\n"
"\n"
"Retourne une version de xrl.us de l'<url>."
#: plugin.py:275
#: plugin.py:252
msgid ""
"<url>\n"
"\n"
@ -144,7 +136,7 @@ msgstr ""
"\n"
"Retourne une version de goo.gl de l'<url>."
#: plugin.py:305
#: plugin.py:282
msgid ""
"<url>\n"
"\n"
@ -155,7 +147,7 @@ msgstr ""
"\n"
"Retourne une version de ur1 de l'<url>."
#: plugin.py:332
#: plugin.py:309
msgid ""
"<url>\n"
"\n"
@ -166,7 +158,7 @@ msgstr ""
"\n"
"Retourne une version de x0.no de l'<url>."
#: plugin.py:359
#: plugin.py:336
msgid ""
"<url>\n"
"\n"
@ -176,3 +168,16 @@ msgstr ""
"<url>\n"
"\n"
"Retourne la version large de l'<url>."
#~ msgid ""
#~ "<url>\n"
#~ "\n"
#~ " Returns an xrl.us version of <url>.\n"
#~ " "
#~ msgstr ""
#~ "<url>\n"
#~ "\n"
#~ "Retourne une version de xrl.us de l'<url>."
#~ msgid "Valid values include 'ln', 'tiny', 'xrl', 'goo', and 'x0'."
#~ msgstr "Les valeurs valides incluent 'ln', 'tiny', 'xrl', 'goo', et 'x0'."

View File

@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Limnoria\n"
"POT-Creation-Date: 2011-02-26 09:49+CET\n"
"PO-Revision-Date: 2012-06-09 09:03+0200\n"
"POT-Creation-Date: 2015-01-24 19:31+CET\n"
"PO-Revision-Date: 2015-01-24 11:45+0100\n"
"Last-Translator: skizzhg <skizzhg@gmx.com>\n"
"Language-Team: Italian <skizzhg@gmx.com>\n"
"Language: it\n"
@ -10,7 +10,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: config.py:39
msgid ""
"This plugin offers a snarfer that will go retrieve a shorter\n"
@ -20,17 +19,13 @@ msgstr ""
"Questo plugin offre un cattura URL che riporterà una versione accorciata\n"
" di quelli lunghi inviati al canale. Lo si vuole abilitare?\n"
#: config.py:45
#, docstring
msgid "Valid values include 'ln', 'tiny', 'xrl', 'goo', and 'x0'."
msgstr "I valori validi comprendono \"ln\", \"tiny\", \"xrl\", \"goo\" e \"x0\"."
#: config.py:45 config.py:49
#, fuzzy
msgid "Valid values include 'ln', 'tiny', 'goo', 'ur1', and 'x0'."
msgstr ""
"I valori validi comprendono \"ln\", \"tiny\", \"goo\" e \"x0\"."
#: config.py:49
#, docstring
msgid "Valid values include 'ln', 'tiny', 'xrl', 'goo', and 'x0'."
msgstr "I valori validi comprendono \"ln\", \"tiny\", \"xrl\" \"goo\" e \"x0\"."
#: config.py:71
#: config.py:70
msgid ""
"Determines whether the\n"
" shrink snarfer is enabled. This snarfer will watch for URLs in the\n"
@ -39,59 +34,67 @@ msgid ""
" smaller URL from either ln-s.net or tinyurl.com, as denoted in\n"
" supybot.plugins.ShrinkUrl.default."
msgstr ""
"Determina se l'accorcia URL è abilitato. Questo controllerà gli URL che passano\n"
"Determina se l'accorcia URL è abilitato. Questo controllerà gli URL che "
"passano\n"
" in canale e se sono sufficientemente lunghi (determinato da\n"
" supybot.plugins.ShrinkUrl.minimumLength) il bot ne invierà uno più corto\n"
" tramite ln-s.net o tinyurl.com, come definito in supybot.plugins.ShrinkUrl.default."
" supybot.plugins.ShrinkUrl.minimumLength) il bot ne invierà uno più "
"corto\n"
" tramite ln-s.net o tinyurl.com, come definito in supybot.plugins."
"ShrinkUrl.default."
#: config.py:78
#: config.py:77
msgid ""
"Determines whether the snarfer will show the\n"
" domain of the URL being snarfed along with the shrunken URL."
msgstr ""
"Determina se l'accorcia URL mostrerà il dominio dell'URL originale assieme a quello accorciato."
"Determina se l'accorcia URL mostrerà il dominio dell'URL originale assieme a "
"quello accorciato."
#: config.py:81
#: config.py:80
msgid ""
"The minimum length a URL must be before\n"
" the bot will shrink it."
msgstr ""
"La lunghezza minima che un URL deve avere affinché il bot decida di accorciarlo."
"La lunghezza minima che un URL deve avere affinché il bot decida di "
"accorciarlo."
#: config.py:84
#: config.py:83
msgid ""
"Determines what URLs are to be snarfed; URLs\n"
" matching the regexp given will not be snarfed. Give the empty string if\n"
" matching the regexp given will not be snarfed. Give the empty string "
"if\n"
" you have no URLs that you'd like to exclude from being snarfed."
msgstr ""
"Determina quali URL debbano essere intercettati; quelli che corrispondono alla\n"
" regexp fornita non verranno coinvolti. Se non si vuole escludere alcun URL,\n"
"Determina quali URL debbano essere intercettati; quelli che corrispondono "
"alla\n"
" regexp fornita non verranno coinvolti. Se non si vuole escludere alcun "
"URL,\n"
" aggiungere una stringa vuota."
#: config.py:88
#: config.py:87
msgid ""
"Determines whether the bot will shrink the\n"
" URLs of outgoing messages if those URLs are longer than\n"
" supybot.plugins.ShrinkUrl.minimumLength."
msgstr ""
"Determina se il bot accorcerà gli URL dei messaggi in uscita se questi sono più\n"
"Determina se il bot accorcerà gli URL dei messaggi in uscita se questi sono "
"più\n"
" lunghi del valore di supybot.plugins.ShrinkUrl.minimumLength."
#: config.py:92
#: config.py:91
msgid ""
"Determines what website the bot will use when\n"
" shrinking a URL."
msgstr ""
"Determina quale sito web il bot userà per accorciare un URL."
msgstr "Determina quale sito web il bot userà per accorciare un URL."
#: config.py:95
#: config.py:94
msgid ""
"Determines whether this plugin will bold\n"
" certain portions of its replies."
msgstr ""
"Determina se il plugin riporterà in grassetto alcune porzioni delle risposte."
#: config.py:98
#: config.py:97
msgid ""
"If set to a non-empty value, specifies the list of\n"
" services to rotate through for the shrinkSnarfer and outFilter."
@ -99,8 +102,13 @@ msgstr ""
"Se impostato ad un valore non vuoto, specifica l'elenco dei servizi a cui\n"
" rivolgersi per le variabili shrinkSnarfer e outFilter."
#: plugin.py:171
#, docstring
#: plugin.py:90
msgid ""
"This plugin features commands to shorten URLs through different services,\n"
" like tinyurl."
msgstr ""
#: plugin.py:192
msgid ""
"<url>\n"
"\n"
@ -112,8 +120,7 @@ msgstr ""
" Restituisce una versione di ln-s.net di <url>.\n"
" "
#: plugin.py:196
#, docstring
#: plugin.py:219
msgid ""
"<url>\n"
"\n"
@ -125,21 +132,7 @@ msgstr ""
" Restituisce una versione di TinyURL.com di <url>\n"
" "
#: plugin.py:224
#, docstring
msgid ""
"<url>\n"
"\n"
" Returns an xrl.us version of <url>.\n"
" "
msgstr ""
"<url>\n"
"\n"
" Restituisce una versione di xrl.us di <url>.\n"
" "
#: plugin.py:255
#, docstring
#: plugin.py:252
msgid ""
"<url>\n"
"\n"
@ -151,8 +144,20 @@ msgstr ""
" Restituisce una versione di goo.gl di <url>.\n"
" "
#: plugin.py:281
#, docstring
#: plugin.py:282
#, fuzzy
msgid ""
"<url>\n"
"\n"
" Returns an ur1 version of <url>.\n"
" "
msgstr ""
"<url>\n"
"\n"
" Restituisce una versione di xrl.us di <url>.\n"
" "
#: plugin.py:309
msgid ""
"<url>\n"
"\n"
@ -164,3 +169,26 @@ msgstr ""
" Restituisce una versione di x0.no di <url>.\n"
" "
#: plugin.py:336
#, fuzzy
msgid ""
"<url>\n"
"\n"
" Returns an expanded version of <url>.\n"
" "
msgstr ""
"<url>\n"
"\n"
" Restituisce una versione di x0.no di <url>.\n"
" "
#~ msgid ""
#~ "<url>\n"
#~ "\n"
#~ " Returns an xrl.us version of <url>.\n"
#~ " "
#~ msgstr ""
#~ "<url>\n"
#~ "\n"
#~ " Restituisce una versione di xrl.us di <url>.\n"
#~ " "

View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-12-20 11:59+EET\n"
"POT-Creation-Date: 2015-01-24 19:31+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"
@ -24,7 +24,7 @@ msgstr ""
#: config.py:45 config.py:49
#, docstring
msgid "Valid values include 'ln', 'tiny', 'xrl', 'goo', 'ur1', and 'x0'."
msgid "Valid values include 'ln', 'tiny', 'goo', 'ur1', and 'x0'."
msgstr ""
#: config.py:70
@ -106,16 +106,7 @@ msgid ""
" "
msgstr ""
#: plugin.py:248
#, docstring
msgid ""
"<url>\n"
"\n"
" Returns an xrl.us version of <url>.\n"
" "
msgstr ""
#: plugin.py:281
#: plugin.py:252
#, docstring
msgid ""
"<url>\n"
@ -124,7 +115,7 @@ msgid ""
" "
msgstr ""
#: plugin.py:311
#: plugin.py:282
#, docstring
msgid ""
"<url>\n"
@ -133,7 +124,7 @@ msgid ""
" "
msgstr ""
#: plugin.py:338
#: plugin.py:309
#, docstring
msgid ""
"<url>\n"
@ -142,7 +133,7 @@ msgid ""
" "
msgstr ""
#: plugin.py:365
#: plugin.py:336
#, docstring
msgid ""
"<url>\n"

View File

@ -229,35 +229,6 @@ class ShrinkUrl(callbacks.PluginRegexp):
irc.errorPossibleBug(str(e))
tiny = thread(wrap(tiny, ['httpUrl']))
_xrlApi = 'http://metamark.net/api/rest/simple'
@retry
def _getXrlUrl(self, url):
quotedurl = utils.web.urlquote(url)
try:
return self.db.get('xrl', quotedurl)
except KeyError:
data = utils.web.urlencode({'long_url': url})
text = utils.web.getUrl(self._xrlApi, data=data).decode()
if text.startswith('ERROR:'):
raise ShrinkError(text[6:])
self.db.set('xrl', quotedurl, text)
return text
@internationalizeDocstring
def xrl(self, irc, msg, args, url):
"""<url>
Returns an xrl.us version of <url>.
"""
try:
xrlurl = self._getXrlUrl(url)
m = irc.reply(xrlurl)
if m is not None:
m.tag('shrunken')
except ShrinkError as e:
irc.error(str(e))
xrl = thread(wrap(xrl, ['httpUrl']))
_gooApi = 'https://www.googleapis.com/urlshortener/v1/url'
@retry
def _getGooUrl(self, url):

View File

@ -41,8 +41,6 @@ class ShrinkUrlTestCase(ChannelPluginTestCase):
(udUrl, r'http://tinyurl.com/u479')],
'ln': [(sfUrl, r'http://ln-s.net/\+PE-'),
(udUrl, r'http://ln-s.net/2\$K')],
'xrl': [(sfUrl, r'http://xrl.us/bfq8ik'),
(udUrl, r'http://xrl.us/bfnyji')],
'goo': [(sfUrl, r'http://goo.gl/3c59N'),
(udUrl, r'http://goo.gl/ocTga')],
'ur1': [(sfUrl, r'http://ur1.ca/9xl25'),
@ -98,9 +96,6 @@ class ShrinkUrlTestCase(ChannelPluginTestCase):
def testLnsnarf(self):
self._snarf('ln')
def testXrlsnarf(self):
self._snarf('xrl')
def testGoosnarf(self):
self._snarf('goo')