Valentin Lorentz
ceabe070a0
Merge remote-tracking branch 'supybot/master' into testing
...
Conflicts:
plugins/Channel/plugin.py
2011-10-27 11:56:13 +02:00
Valentin Lorentz
2902532d4b
Merge pull request #248 from Mkaysi/mkaysi
...
PluginDownloader: add l10n-fi and messages.pot
2011-10-27 01:51:48 -07:00
Valentin Lorentz
a87c096d69
Allow plugins to take over a subdirectory of the HTTP server.
2011-10-27 10:47:59 +02:00
skizzhg
51e02849ad
Web: Fix l10n-it.
2011-10-27 10:47:25 +02:00
Florian Besser
bf1ed70827
Plugin: Update l10n-de
2011-10-27 00:44:40 +02:00
Florian Besser
a8f4cb103e
Config: Update l10n-de
2011-10-27 00:23:59 +02:00
Mika Suomalainen
e84dc3b5f9
Merge remote branch 'progval/testing' into mkaysi
2011-10-26 21:29:22 +03:00
Mika Suomalainen
dcccc4abcf
PluginDownloader: add l10n-fi.
2011-10-26 21:28:03 +03:00
Mika Suomalainen
a5de3e988a
PluginDownloader: add messages.pot
2011-10-26 21:27:42 +03:00
Florian Besser
9cefad2132
Config: Add l10n-de
2011-10-26 14:19:11 +02:00
Florian Besser
abec4a0b02
Plugin: Add l10n-de
2011-10-26 12:56:36 +02:00
Valentin Lorentz
2ab2e0e5bd
Merge pull request #247 from fbesser/fbesser
...
Web: internationalized 'Title:' in titleSnarfer
2011-10-26 03:13:26 -07:00
Florian Besser
ffb19f72a6
Web: Add l10n-de
2011-10-26 12:10:30 +02:00
Florian Besser
74cd35f772
Web: localized 'Title:' in titleSnarfer
2011-10-26 11:25:51 +02:00
Valentin Lorentz
5225700566
Merge pull request #246 from Mkaysi/mkaysi
...
Todo: add l10n-fi.
2011-10-26 01:05:13 -07:00
Mika Suomalainen
0c05c22ca2
Topic: start l10n-fi.
2011-10-26 11:03:47 +03:00
Mika Suomalainen
86afbe5f79
Todo: add l10n-fi.
2011-10-26 10:49:04 +03:00
Valentin Lorentz
6ee49eb0c9
Merge pull request #244 from fbesser/testing
...
Added German Translation
2011-10-25 13:14:27 -07:00
Florian Besser
27f5972757
Added l10n-de
2011-10-25 22:09:55 +02:00
Valentin Lorentz
5b95635c68
Merge pull request #243 from Mkaysi/mkaysi
...
Mkaysi
2011-10-25 06:37:37 -07:00
Mika Suomalainen
f76c7e33dc
Time: Add l10n-fi.
2011-10-25 16:28:18 +03:00
Valentin Lorentz
866fa1e2f6
Merge pull request #241 from nyuszika7h/testing
...
Add l10n-hu for domaine plugins.
2011-10-25 05:50:17 -07:00
nyuszika7h
27e4dd6a88
Alias: Add l10n-hu
2011-10-25 14:44:56 +02:00
Valentin Lorentz
1d47e07555
Merge pull request #240 from Mkaysi/mkaysi
...
Success: added l10n-fi.
2011-10-25 05:35:33 -07:00
Mika Suomalainen
12ee3bd200
Success: fixed author email.
2011-10-25 15:32:43 +03:00
Mika Suomalainen
9d33bc26cb
Success: added l10n-fi.
2011-10-25 15:26:17 +03:00
James McCoy
9b5019e79d
Merge branch 'nick-access' into maint/0.83.4
2011-10-23 20:33:48 -04:00
James McCoy
755fe11982
Merge branch 'nick-access'
2011-10-23 20:33:41 -04:00
James McCoy
0869a8e271
Channel.nicks: Raise error so we don't actually reply with the nicks.
...
Closes: Sf#3396388
Signed-off-by: James McCoy <vega.james@gmail.com>
2011-10-23 20:26:39 -04:00
James McCoy
3c69fad3de
Merge branch 'typos' into maint/0.83.4
2011-10-23 19:42:02 -04:00
James McCoy
9b855beec6
Merge branch 'typos'
2011-10-23 19:41:54 -04:00
Valentin Lorentz
a1a90f7673
NickCapture: Fix plugin help and l10n-fr. Closes GH-116.
...
Conflicts:
plugins/NickCapture/locale/fr.po
plugins/NickCapture/messages.pot
src/version.py
Signed-off-by: James McCoy <vega.james@gmail.com>
2011-10-23 19:38:54 -04:00
Valentin Lorentz
f1690e6867
Topic: fix typo in @unlock help.
...
Conflicts:
plugins/Topic/locale/fr.po
plugins/Topic/messages.pot
src/version.py
Signed-off-by: James McCoy <vega.james@gmail.com>
2011-10-23 19:36:46 -04:00
Valentin Lorentz
9561c9f417
Topic: Fix bad doctring
...
Conflicts:
plugins/Topic/messages.pot
Signed-off-by: James McCoy <vega.james@gmail.com>
2011-10-23 19:36:08 -04:00
Valentin Lorentz
8fb4cbcdc6
Factoids: Fix typo.
...
Conflicts:
plugins/Factoids/locale/fi.po
plugins/Factoids/locale/fr.po
plugins/Factoids/messages.pot
src/version.py
Signed-off-by: James McCoy <vega.james@gmail.com>
2011-10-23 19:30:07 -04:00
Valentin Lorentz
8056da06f6
Channel: fix NameError: 'replyirc' -> 'replyIrc'. Closes GH-73.
...
Conflicts:
src/version.py
Signed-off-by: James McCoy <vega.james@gmail.com>
2011-10-23 19:30:01 -04:00
Valentin Lorentz
fa8385596d
Karma: fix typo. Closes GH-38.
...
Conflicts:
plugins/Karma/locale/fi.po
plugins/Karma/locale/fr.po
plugins/Karma/messages.pot
Signed-off-by: James McCoy <vega.james@gmail.com>
2011-10-23 19:29:52 -04:00
Valentin Lorentz
70a6e6932d
Protector: Fix variable name.
...
Signed-off-by: James McCoy <vega.james@gmail.com>
2011-10-23 19:04:12 -04:00
James McCoy
fb8f0741e7
Merge branch 'relay-nick-hostmask' into maint/0.83.4
2011-10-22 16:10:43 -04:00
James McCoy
05529e22a5
Merge branch 'relay-nick-hostmask'
2011-10-22 16:10:38 -04:00
Valentin Lorentz
ce4d26514b
Relay: remove redundant nick on join/part when hostmasks enabled
...
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-10-22 16:10:23 -04:00
James McCoy
58eee3c995
Merge branch 'automode-conf' into maint/0.83.4
2011-10-22 16:06:57 -04:00
James McCoy
bab5bc671c
Merge branch 'automode-conf'
2011-10-22 16:06:51 -04:00
Valentin Lorentz
5dcbe57fa3
AutoMode: fix bans.
...
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-10-22 16:06:37 -04:00
James McCoy
d5593bbba2
Merge branch 'disable'
2011-10-22 15:52:44 -04:00
James McCoy
3db5727a9d
Merge branch 'disable' into maint/0.83.4
2011-10-22 15:52:34 -04:00
Valentin Lorentz
8fb97c56bc
Owner: Fix bug with @enable and @disable if a plugin is given. Closes GH-43. Closes GH-44.
...
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-10-22 15:52:19 -04:00
James McCoy
964c73f591
RSS._getConverter: Encode strings before handing them off to other functions
...
When the feed has a specified encoding, we'll be dealing with unicode objects
in the response from feedparser.parse(). To avoid possible UnicodeErrors, we
need to encode() before handing the string off to other functions, so the
other functions are always dealing with bytestrings instead of bytestrings and
unicode objects. Mixing unicode and bytestrings will cause implicit
conversions of the unicode objects, which will most likely use the wrong
encoding.
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-10-22 15:23:56 -04:00
James McCoy
01c8dc7f78
String.decode: Only encode('utf-8') when the decode string is unicode
...
Closes: Sf#3165718
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-10-22 14:57:20 -04:00
Daniel Folkinshteyn
8f7c4bdf7f
Fix banmask creation. Thanks Progval for the patch!
...
fixes https://sourceforge.net/tracker/?func=detail&aid=3088559&group_id=58965&atid=489447
incorporating patch https://sourceforge.net/tracker/?func=detail&aid=3163843&group_id=58965&atid=489449
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-10-22 14:25:26 -04:00