Merge remote branch 'progval/testing' into mkaysi

This commit is contained in:
Mika Suomalainen 2011-10-26 21:29:22 +03:00
commit e84dc3b5f9
2 changed files with 6 additions and 2 deletions

View File

@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2011-02-26 09:49+CET\n" "POT-Creation-Date: 2011-10-26 11:23+CEST\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -40,6 +40,10 @@ msgstr ""
msgid "Add the help for \"@help Web\" here." msgid "Add the help for \"@help Web\" here."
msgstr "" msgstr ""
#: plugin.py:107
msgid "Title: %s (at %s)"
msgstr ""
#: plugin.py:114 #: plugin.py:114
#, docstring #, docstring
msgid "" msgid ""

View File

@ -104,7 +104,7 @@ class Web(callbacks.PluginRegexp):
if parser.title: if parser.title:
domain = utils.web.getDomain(url) domain = utils.web.getDomain(url)
title = utils.web.htmlToText(parser.title.strip()) title = utils.web.htmlToText(parser.title.strip())
s = format('Title: %s (at %s)', title, domain) s = format(_('Title: %s (at %s)'), title, domain)
irc.reply(s, prefixNick=False) irc.reply(s, prefixNick=False)
titleSnarfer = urlSnarfer(titleSnarfer) titleSnarfer = urlSnarfer(titleSnarfer)
titleSnarfer.__doc__ = utils.web._httpUrlRe titleSnarfer.__doc__ = utils.web._httpUrlRe