From 1eb59c47606c733be40cbf8923fb00b3210cc667 Mon Sep 17 00:00:00 2001 From: joey Date: Thu, 8 Feb 2007 19:48:00 +0000 Subject: [PATCH] * Add "reverse" option to inline to invert sort orders. --- IkiWiki/Plugin/inline.pm | 4 +++ debian/changelog | 3 +- .../inline_-_sort_by_old_first.mdwn | 29 ------------------- doc/plugins/inline.mdwn | 1 + po/bg.po | 8 ++--- po/cs.po | 8 ++--- po/es.po | 8 ++--- po/fr.po | 8 ++--- po/gu.po | 8 ++--- po/ikiwiki.pot | 8 ++--- po/pl.po | 8 ++--- po/sv.po | 8 ++--- po/vi.po | 8 ++--- 13 files changed, 43 insertions(+), 66 deletions(-) delete mode 100644 doc/patchqueue/inline_-_sort_by_old_first.mdwn diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 13876b56f..57b4057d7 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -96,6 +96,10 @@ sub preprocess_inline (@) { #{{{ return sprintf(gettext("unknown sort type %s"), $params{sort}); } + if (yesno($params{reverse})) { + @list=reverse(@list); + } + if (exists $params{skip}) { @list=@list[$params{skip} .. scalar @list - 1]; } diff --git a/debian/changelog b/debian/changelog index 829017c61..d6c725300 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,8 +20,9 @@ ikiwiki (1.42) UNRELEASED; urgency=low * Change based on a patch from Ethan to support relative matching in PageSpecs, by using "./". * pagespec_match() has grown a new third parameter to support this. + * Add "reverse" option to inline to invert sort orders. - -- Joey Hess Tue, 6 Feb 2007 15:49:06 -0500 + -- Joey Hess Thu, 8 Feb 2007 14:46:17 -0500 ikiwiki (1.41) unstable; urgency=low diff --git a/doc/patchqueue/inline_-_sort_by_old_first.mdwn b/doc/patchqueue/inline_-_sort_by_old_first.mdwn deleted file mode 100644 index 9054beadc..000000000 --- a/doc/patchqueue/inline_-_sort_by_old_first.mdwn +++ /dev/null @@ -1,29 +0,0 @@ -Quick hack to be able to list old entries first : - - - --- inline.pm 2007-01-18 18:21:27.000000000 +0100 - +++ /usr/share/perl5/IkiWiki/Plugin/inline.pm 2007-01-18 18:23:01.000000000 +0100 - @@ -92,6 +92,9 @@ - elsif (! exists $params{sort} || $params{sort} eq 'age') { - @list=sort { $pagectime{$b} <=> $pagectime{$a} } @list; - } - + elsif (! exists $params{sort} || $params{sort} eq 'old') { - + @list=sort { $pagectime{$a} <=> $pagectime{$b} } @list; - + } - else { - return sprintf(gettext("unknown sort type %s"), $params{sort}); - } - - -this patch adds a new type of sort "old". - -> Hmm, take another look at your patch above. Comapre the added lines with -> the "age" lines just above them. It's identical; age already does what -> you want. --[[Joey]] - ->> Well, $b and $a are switched in 'old' comparing to 'age'... According to the documentation, *The default, "age" is to sort newest pages first*. I just want the reverse, and that's why I just switched the $a and $b args of the sort func.... --HB - -However, I wonder if it would be better to add another option for inline like "sortorder" with "desc" or "asc" keywords ? - -> That might be cleaner, since it would allow sorting pages in reverse by -> title. If someone ever had a reason to do that. --[[Joey]] diff --git a/doc/plugins/inline.mdwn b/doc/plugins/inline.mdwn index cd76fd286..8b8241ca2 100644 --- a/doc/plugins/inline.mdwn +++ b/doc/plugins/inline.mdwn @@ -46,3 +46,4 @@ directive: itself). * `sort` - Controls how inlined pages are sorted. The default, "age" is to sort newest pages first. Setting it to "title" will sort pages by title. +* `reverse` - If set to "yes", causes the sort order to be reversed. diff --git a/po/bg.po b/po/bg.po index 1ec018b61..b61ec6ca4 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-06 15:06-0500\n" +"POT-Creation-Date: 2007-02-08 14:47-0500\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -25,7 +25,7 @@ msgid "Preferences saved." msgstr "Предпочитанията са запазени." #: ../IkiWiki/CGI.pm:412 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:160 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/Plugin/inline.pm:164 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97 #: ../IkiWiki/Render.pm:165 msgid "discussion" @@ -123,11 +123,11 @@ msgstr "" msgid "unknown sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki/Plugin/inline.pm:165 ../IkiWiki/Render.pm:101 +#: ../IkiWiki/Plugin/inline.pm:169 ../IkiWiki/Render.pm:101 msgid "Discussion" msgstr "Дискусия" -#: ../IkiWiki/Plugin/inline.pm:378 +#: ../IkiWiki/Plugin/inline.pm:382 msgid "RPC::XML::Client not found, not pinging" msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен" diff --git a/po/cs.po b/po/cs.po index 523c3b4a7..e19209872 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-06 15:06-0500\n" +"POT-Creation-Date: 2007-02-08 14:47-0500\n" "PO-Revision-Date: 2007-01-07 11:59+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -24,7 +24,7 @@ msgid "Preferences saved." msgstr "Nastavení uloženo." #: ../IkiWiki/CGI.pm:412 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:160 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/Plugin/inline.pm:164 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97 #: ../IkiWiki/Render.pm:165 msgid "discussion" @@ -120,11 +120,11 @@ msgstr "Při používání --rss nebo --atom musíte pomocí --url zadat url k w msgid "unknown sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki/Plugin/inline.pm:165 ../IkiWiki/Render.pm:101 +#: ../IkiWiki/Plugin/inline.pm:169 ../IkiWiki/Render.pm:101 msgid "Discussion" msgstr "Diskuse" -#: ../IkiWiki/Plugin/inline.pm:378 +#: ../IkiWiki/Plugin/inline.pm:382 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nebyl nalezen, nepinkám" diff --git a/po/es.po b/po/es.po index ce94334d6..54681f741 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-06 15:06-0500\n" +"POT-Creation-Date: 2007-02-08 14:47-0500\n" "PO-Revision-Date: 2007-01-03 09:37+0100\n" "Last-Translator: Víctor Moral \n" "Language-Team: spanish \n" @@ -25,7 +25,7 @@ msgid "Preferences saved." msgstr "Las preferencias se han guardado." #: ../IkiWiki/CGI.pm:412 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:160 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/Plugin/inline.pm:164 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97 #: ../IkiWiki/Render.pm:165 msgid "discussion" @@ -124,11 +124,11 @@ msgstr "" msgid "unknown sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki/Plugin/inline.pm:165 ../IkiWiki/Render.pm:101 +#: ../IkiWiki/Plugin/inline.pm:169 ../IkiWiki/Render.pm:101 msgid "Discussion" msgstr "Comentarios" -#: ../IkiWiki/Plugin/inline.pm:378 +#: ../IkiWiki/Plugin/inline.pm:382 msgid "RPC::XML::Client not found, not pinging" msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna" diff --git a/po/fr.po b/po/fr.po index da62f2a74..7651ed9f7 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-06 15:06-0500\n" +"POT-Creation-Date: 2007-02-08 14:47-0500\n" "PO-Revision-Date: 2007-01-22 22:12+0100\n" "Last-Translator: Jean-Luc Coulon (f5ibh) \n" "Language-Team: French \n" @@ -26,7 +26,7 @@ msgid "Preferences saved." msgstr "Les préférences ont été enregistrées." #: ../IkiWiki/CGI.pm:412 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:160 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/Plugin/inline.pm:164 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97 #: ../IkiWiki/Render.pm:165 msgid "discussion" @@ -125,11 +125,11 @@ msgstr "" msgid "unknown sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki/Plugin/inline.pm:165 ../IkiWiki/Render.pm:101 +#: ../IkiWiki/Plugin/inline.pm:169 ../IkiWiki/Render.pm:101 msgid "Discussion" msgstr "Discussion" -#: ../IkiWiki/Plugin/inline.pm:378 +#: ../IkiWiki/Plugin/inline.pm:382 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" diff --git a/po/gu.po b/po/gu.po index e9b06baef..7c80d1da5 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-06 15:06-0500\n" +"POT-Creation-Date: 2007-02-08 14:47-0500\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -24,7 +24,7 @@ msgid "Preferences saved." msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." #: ../IkiWiki/CGI.pm:412 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:160 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/Plugin/inline.pm:164 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97 #: ../IkiWiki/Render.pm:165 msgid "discussion" @@ -120,11 +120,11 @@ msgstr "--rss અથવા --atom ઉપયોગ કરતી વખતે વ msgid "unknown sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki/Plugin/inline.pm:165 ../IkiWiki/Render.pm:101 +#: ../IkiWiki/Plugin/inline.pm:169 ../IkiWiki/Render.pm:101 msgid "Discussion" msgstr "ચર્ચા" -#: ../IkiWiki/Plugin/inline.pm:378 +#: ../IkiWiki/Plugin/inline.pm:382 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 6ee943b26..296aab6db 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-02-06 19:45-0500\n" +"POT-Creation-Date: 2007-02-08 14:47-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,7 +25,7 @@ msgid "Preferences saved." msgstr "" #: ../IkiWiki/CGI.pm:412 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:160 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/Plugin/inline.pm:164 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97 #: ../IkiWiki/Render.pm:165 msgid "discussion" @@ -121,11 +121,11 @@ msgstr "" msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:165 ../IkiWiki/Render.pm:101 +#: ../IkiWiki/Plugin/inline.pm:169 ../IkiWiki/Render.pm:101 msgid "Discussion" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:378 +#: ../IkiWiki/Plugin/inline.pm:382 msgid "RPC::XML::Client not found, not pinging" msgstr "" diff --git a/po/pl.po b/po/pl.po index a9f55dfc0..4e23cf434 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.37\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-06 15:06-0500\n" +"POT-Creation-Date: 2007-02-08 14:47-0500\n" "PO-Revision-Date: 2007-01-05 16:33+100\n" "Last-Translator: Paweł Tęcza \n" "Language-Team: Debian L10n Polish \n" @@ -25,7 +25,7 @@ msgid "Preferences saved." msgstr "Ustawienia zostały zapisane." #: ../IkiWiki/CGI.pm:412 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:160 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/Plugin/inline.pm:164 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97 #: ../IkiWiki/Render.pm:165 msgid "discussion" @@ -125,11 +125,11 @@ msgstr "" msgid "unknown sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki/Plugin/inline.pm:165 ../IkiWiki/Render.pm:101 +#: ../IkiWiki/Plugin/inline.pm:169 ../IkiWiki/Render.pm:101 msgid "Discussion" msgstr "Dyskusja" -#: ../IkiWiki/Plugin/inline.pm:378 +#: ../IkiWiki/Plugin/inline.pm:382 msgid "RPC::XML::Client not found, not pinging" msgstr "Niezainstalowany moduł RPC::XML::Client, brak możliwości pingowania" diff --git a/po/sv.po b/po/sv.po index dfb972f81..2263152c0 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-06 15:06-0500\n" +"POT-Creation-Date: 2007-02-08 14:47-0500\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -24,7 +24,7 @@ msgid "Preferences saved." msgstr "Inställningar sparades." #: ../IkiWiki/CGI.pm:412 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:160 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/Plugin/inline.pm:164 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97 #: ../IkiWiki/Render.pm:165 msgid "discussion" @@ -120,11 +120,11 @@ msgstr "Måste ange url till wiki med --url när --rss eller --atom används" msgid "unknown sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki/Plugin/inline.pm:165 ../IkiWiki/Render.pm:101 +#: ../IkiWiki/Plugin/inline.pm:169 ../IkiWiki/Render.pm:101 msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki/Plugin/inline.pm:378 +#: ../IkiWiki/Plugin/inline.pm:382 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client hittades inte, pingar inte" diff --git a/po/vi.po b/po/vi.po index 297bab716..3f8741522 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-06 15:06-0500\n" +"POT-Creation-Date: 2007-02-08 14:47-0500\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -25,7 +25,7 @@ msgid "Preferences saved." msgstr "Tùy thích đã được lưu." #: ../IkiWiki/CGI.pm:412 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:160 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/Plugin/inline.pm:164 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97 #: ../IkiWiki/Render.pm:165 msgid "discussion" @@ -123,11 +123,11 @@ msgstr "" msgid "unknown sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki/Plugin/inline.pm:165 ../IkiWiki/Render.pm:101 +#: ../IkiWiki/Plugin/inline.pm:169 ../IkiWiki/Render.pm:101 msgid "Discussion" msgstr "Thảo luận" -#: ../IkiWiki/Plugin/inline.pm:378 +#: ../IkiWiki/Plugin/inline.pm:382 msgid "RPC::XML::Client not found, not pinging" msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" -- 2.26.2