diff options
| -rw-r--r-- | IkiWiki/UserInfo.pm | 14 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/pagespec.mdwn | 2 | ||||
| -rw-r--r-- | doc/todo/excluding_commit_mails.mdwn | 2 | ||||
| -rw-r--r-- | po/bg.po | 4 | ||||
| -rw-r--r-- | po/cs.po | 4 | ||||
| -rw-r--r-- | po/es.po | 4 | ||||
| -rw-r--r-- | po/fr.po | 4 | ||||
| -rw-r--r-- | po/gu.po | 4 | ||||
| -rw-r--r-- | po/ikiwiki.pot | 4 | ||||
| -rw-r--r-- | po/pl.po | 4 | ||||
| -rw-r--r-- | po/sv.po | 4 | ||||
| -rw-r--r-- | po/vi.po | 4 |
13 files changed, 37 insertions, 20 deletions
diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm index d32f5c1bf..8bd056248 100644 --- a/IkiWiki/UserInfo.pm +++ b/IkiWiki/UserInfo.pm @@ -92,8 +92,11 @@ sub set_banned_users (@) { #{{{ return userinfo_store($userinfo); } #}}} +# Global used to pass information into the PageSpec function. +our $committer; + sub commit_notify_list ($@) { #{{{ - my $committer=shift; + $committer=shift; my @pages = map pagename($_), @_; my @ret; @@ -177,4 +180,13 @@ sub send_commit_mails ($$$@) { #{{{ } } #}}} +package IkiWiki::PageSpec; + +sub match_user ($$$) { #{{{ + shift; + my $user=shift; + + return $user eq $committer; +} #}}} + 1 diff --git a/debian/changelog b/debian/changelog index b9dc7fae4..2ebb385b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,8 +21,9 @@ ikiwiki (1.51) UNRELEASED; urgency=low wiki rebuilds are recommended on upgrade to this version. * Avoid .svn directories when installing from svn checkout. * Fix sending of commit mails when new pages are added via the web. + * Add user(name) to the PageSpec for commit subscriptions. - -- Joey Hess <joeyh@debian.org> Thu, 26 Apr 2007 19:27:42 -0400 + -- Joey Hess <joeyh@debian.org> Thu, 26 Apr 2007 20:25:53 -0400 ikiwiki (1.50) unstable; urgency=low diff --git a/doc/pagespec.mdwn b/doc/pagespec.mdwn index 53519e7f0..b26a42e28 100644 --- a/doc/pagespec.mdwn +++ b/doc/pagespec.mdwn @@ -33,6 +33,8 @@ functions: was created * "`created_before(page)`" - match only pages created before the given page was created +* "`user(name)`" - only available in page subscription preferences, match + only changes made by this user For example, to match all pages in a blog that link to the page about music and were written in 2005: diff --git a/doc/todo/excluding_commit_mails.mdwn b/doc/todo/excluding_commit_mails.mdwn index 0a7c7425c..9ae838fe0 100644 --- a/doc/todo/excluding_commit_mails.mdwn +++ b/doc/todo/excluding_commit_mails.mdwn @@ -15,3 +15,5 @@ subscribe to: * and !SandBox and !user(joey) Insert standard argument about how wonderfly flexible this is. :-) + +[[done]] @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-04-23 14:43-0400\n" +"POT-Creation-Date: 2007-04-26 20:28-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" @@ -104,7 +104,7 @@ msgstr "шаблонът „%s” не е намерен" #: ../IkiWiki/Plugin/aggregate.pm:278 #, perl-format -msgid "invalid UTF-8 stripped from feed" +msgid "(invalid UTF-8 stripped from feed)" msgstr "" #: ../IkiWiki/Plugin/aggregate.pm:283 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-04-23 14:43-0400\n" +"POT-Creation-Date: 2007-04-26 20:28-0400\n" "PO-Revision-Date: 2007-02-17 12:07+0100\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" @@ -103,7 +103,7 @@ msgstr "šablona %s nebyla nalezena" #: ../IkiWiki/Plugin/aggregate.pm:278 #, perl-format -msgid "invalid UTF-8 stripped from feed" +msgid "(invalid UTF-8 stripped from feed)" msgstr "" #: ../IkiWiki/Plugin/aggregate.pm:283 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-04-23 14:43-0400\n" +"POT-Creation-Date: 2007-04-26 20:28-0400\n" "PO-Revision-Date: 2007-02-12 10:31+0100\n" "Last-Translator: Víctor Moral <victor@taquiones.net>\n" "Language-Team: spanish <es@li.org>\n" @@ -106,7 +106,7 @@ msgstr "no he encontrado la plantilla %s" #: ../IkiWiki/Plugin/aggregate.pm:278 #, perl-format -msgid "invalid UTF-8 stripped from feed" +msgid "(invalid UTF-8 stripped from feed)" msgstr "" #: ../IkiWiki/Plugin/aggregate.pm:283 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-04-23 14:43-0400\n" +"POT-Creation-Date: 2007-04-26 20:28-0400\n" "PO-Revision-Date: 2007-04-01 21:03+0200\n" "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon@wanadoo.fr>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -106,7 +106,7 @@ msgstr "%s introuvable " #: ../IkiWiki/Plugin/aggregate.pm:278 #, perl-format -msgid "invalid UTF-8 stripped from feed" +msgid "(invalid UTF-8 stripped from feed)" msgstr "" #: ../IkiWiki/Plugin/aggregate.pm:283 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-04-23 14:43-0400\n" +"POT-Creation-Date: 2007-04-26 20:28-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n" "Language-Team: Gujarati <team@utkarsh.org>\n" @@ -103,7 +103,7 @@ msgstr "ટેમ્પલેટ %s મળ્યું નહી" #: ../IkiWiki/Plugin/aggregate.pm:278 #, perl-format -msgid "invalid UTF-8 stripped from feed" +msgid "(invalid UTF-8 stripped from feed)" msgstr "" #: ../IkiWiki/Plugin/aggregate.pm:283 diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 2c95f8649..28d837cf3 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-04-23 14:43-0400\n" +"POT-Creation-Date: 2007-04-26 20:28-0400\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" @@ -103,7 +103,7 @@ msgstr "" #: ../IkiWiki/Plugin/aggregate.pm:278 #, perl-format -msgid "invalid UTF-8 stripped from feed" +msgid "(invalid UTF-8 stripped from feed)" msgstr "" #: ../IkiWiki/Plugin/aggregate.pm:283 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.37\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-04-23 14:43-0400\n" +"POT-Creation-Date: 2007-04-26 20:28-0400\n" "PO-Revision-Date: 2007-01-05 16:33+100\n" "Last-Translator: Paweł Tęcza <ptecza@net.icm.edu.pl>\n" "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n" @@ -104,7 +104,7 @@ msgstr "nieznaleziony szablon %s" #: ../IkiWiki/Plugin/aggregate.pm:278 #, perl-format -msgid "invalid UTF-8 stripped from feed" +msgid "(invalid UTF-8 stripped from feed)" msgstr "" #: ../IkiWiki/Plugin/aggregate.pm:283 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-04-23 14:43-0400\n" +"POT-Creation-Date: 2007-04-26 20:28-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" @@ -103,7 +103,7 @@ msgstr "mallen %s hittades inte" #: ../IkiWiki/Plugin/aggregate.pm:278 #, perl-format -msgid "invalid UTF-8 stripped from feed" +msgid "(invalid UTF-8 stripped from feed)" msgstr "" #: ../IkiWiki/Plugin/aggregate.pm:283 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-04-23 14:43-0400\n" +"POT-Creation-Date: 2007-04-26 20:28-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" @@ -104,7 +104,7 @@ msgstr "không tìm thấy mẫu %s" #: ../IkiWiki/Plugin/aggregate.pm:278 #, perl-format -msgid "invalid UTF-8 stripped from feed" +msgid "(invalid UTF-8 stripped from feed)" msgstr "" #: ../IkiWiki/Plugin/aggregate.pm:283 |