From bf386e22f5fb65999c38668cb011bdf4ae26d72c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 1 Oct 2008 17:29:03 -0400 Subject: inline: Fix handling of rootpage that doesn't exist. It makes sense to use bestlink to determine which page rootpage refers to, but if no page matches, just use the raw value. --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1320e4f41..6c6eea205 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,7 @@ ikiwiki (2.66) UNRELEASED; urgency=low (Sponsored by The TOVA Company.) * httpauth: Document that ikiwiki.cgi has to be in a directory subject to authentication. Closes: #500524 + * inline: Fix handling of rootpage that doesn't exist. -- Joey Hess Thu, 25 Sep 2008 13:45:55 -0400 -- cgit v1.2.3 From c9459523813052ee187bdad1c8594ae114bece62 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 2 Oct 2008 12:48:06 -0400 Subject: attachment: Support adding attachments to pages even as they are being created. --- IkiWiki/Plugin/attachment.pm | 5 +++-- debian/changelog | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm index 837992841..2d1fe51cf 100644 --- a/IkiWiki/Plugin/attachment.pm +++ b/IkiWiki/Plugin/attachment.pm @@ -94,7 +94,8 @@ sub formbuilder_setup (@) { #{{{ my $form=$params{form}; my $q=$params{cgi}; - if (defined $form->field("do") && $form->field("do") eq "edit") { + if (defined $form->field("do") && ($form->field("do") eq "edit" || + $form->field("do") eq "create")) { # Add attachment field, set type to multipart. $form->enctype(&CGI::MULTIPART); $form->field(name => 'attachment', type => 'file'); @@ -158,7 +159,7 @@ sub formbuilder (@) { #{{{ my $form=$params{form}; my $q=$params{cgi}; - return if ! defined $form->field("do") || $form->field("do") ne "edit"; + return if ! defined $form->field("do") || ($form->field("do") ne "edit" && $form->field("do") ne "create") ; my $filename=$q->param('attachment'); if (defined $filename && length $filename && diff --git a/debian/changelog b/debian/changelog index 6c6eea205..b54fce784 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,8 @@ ikiwiki (2.66) UNRELEASED; urgency=low * httpauth: Document that ikiwiki.cgi has to be in a directory subject to authentication. Closes: #500524 * inline: Fix handling of rootpage that doesn't exist. + * attachment: Support adding attachments to pages even as they are being + created. -- Joey Hess Thu, 25 Sep 2008 13:45:55 -0400 -- cgit v1.2.3 From 3b47dae9ca03b31cf5915c0d12215883fe2c32c1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 2 Oct 2008 12:53:53 -0400 Subject: remove, rename: Allow acting on attachments as a page is being created. --- IkiWiki/Plugin/remove.pm | 10 ++++++---- IkiWiki/Plugin/rename.pm | 10 ++++++---- debian/changelog | 1 + 3 files changed, 13 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm index c8d76368e..cf95026c8 100644 --- a/IkiWiki/Plugin/remove.pm +++ b/IkiWiki/Plugin/remove.pm @@ -61,9 +61,10 @@ sub formbuilder_setup (@) { #{{{ my $form=$params{form}; my $q=$params{cgi}; - if (defined $form->field("do") && $form->field("do") eq "edit") { + if (defined $form->field("do") && ($form->field("do") eq "edit" || + $form->field("do") eq "create")) { # Removal button for the page, and also for attachments. - push @{$params{buttons}}, "Remove"; + push @{$params{buttons}}, "Remove" if $form->field("do") eq "edit"; $form->tmpl_param("field-remove" => ''); } } #}}} @@ -135,11 +136,12 @@ sub formbuilder (@) { #{{{ my %params=@_; my $form=$params{form}; - if (defined $form->field("do") && $form->field("do") eq "edit") { + if (defined $form->field("do") && ($form->field("do") eq "edit" || + $form->field("do") eq "create")) { my $q=$params{cgi}; my $session=$params{session}; - if ($form->submitted eq "Remove") { + if ($form->submitted eq "Remove" && $form->field("do") eq "edit") { removal_confirm($q, $session, 0, $form->field("page")); } elsif ($form->submitted eq "Remove Attachments") { diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm index 6c131487a..7e55e271c 100644 --- a/IkiWiki/Plugin/rename.pm +++ b/IkiWiki/Plugin/rename.pm @@ -210,11 +210,12 @@ sub formbuilder (@) { #{{{ my %params=@_; my $form=$params{form}; - if (defined $form->field("do") && $form->field("do") eq "edit") { + if (defined $form->field("do") && ($form->field("do") eq "edit" || + $form->field("do") eq "create")) { my $q=$params{cgi}; my $session=$params{session}; - if ($form->submitted eq "Rename") { + if ($form->submitted eq "Rename" && $form->field("do") eq "edit") { rename_start($q, $session, 0, $form->field("page")); } elsif ($form->submitted eq "Rename Attachment") { @@ -237,9 +238,10 @@ sub formbuilder_setup (@) { #{{{ my $form=$params{form}; my $q=$params{cgi}; - if (defined $form->field("do") && $form->field("do") eq "edit") { + if (defined $form->field("do") && ($form->field("do") eq "edit" || + $form->field("do") eq "create")) { # Rename button for the page, and also for attachments. - push @{$params{buttons}}, "Rename"; + push @{$params{buttons}}, "Rename" if $form->field("do") eq "edit"; $form->tmpl_param("field-rename" => ''); if (defined $renamesummary) { diff --git a/debian/changelog b/debian/changelog index b54fce784..0f3530cb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,7 @@ ikiwiki (2.66) UNRELEASED; urgency=low * inline: Fix handling of rootpage that doesn't exist. * attachment: Support adding attachments to pages even as they are being created. + * remove, rename: Allow acting on attachments as a page is being created. -- Joey Hess Thu, 25 Sep 2008 13:45:55 -0400 -- cgit v1.2.3 From 49992eb2cec8bb3baeb89b33c29fdec0116529a5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 2 Oct 2008 14:03:04 -0400 Subject: Updated French translation. Closes: #500929 --- debian/changelog | 1 + po/fr.po | 435 ++++++++++++++++++++++++------------------------------- 2 files changed, 193 insertions(+), 243 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0f3530cb2..f77141a73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,7 @@ ikiwiki (2.66) UNRELEASED; urgency=low * attachment: Support adding attachments to pages even as they are being created. * remove, rename: Allow acting on attachments as a page is being created. + * Updated French translation. Closes: #500929 -- Joey Hess Thu, 25 Sep 2008 13:45:55 -0400 diff --git a/po/fr.po b/po/fr.po index b935bd420..abd2c0efc 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,59 +9,90 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-29 17:12-0400\n" -"PO-Revision-Date: 2008-04-29 17:46+0200\n" -"Last-Translator: Christian Perrier \n" +"POT-Creation-Date: 2008-08-28 13:05-0400\n" +"PO-Revision-Date: 2008-09-23 10:00+0100\n" +"Last-Translator: Julien Patriarca \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: ../IkiWiki/CGI.pm:113 +#: ../IkiWiki/CGI.pm:139 msgid "You need to log in first." msgstr "Vous devez d'abord vous identifier." -#: ../IkiWiki/CGI.pm:145 +#: ../IkiWiki/CGI.pm:171 msgid "login failed, perhaps you need to turn on cookies?" -msgstr "" -"Échec de l'identification, vous devriez peut-être autoriser les cookies." +msgstr "Échec de l'identification, vous devriez peut-être autoriser les cookies." -#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:350 +#: ../IkiWiki/CGI.pm:189 +#: ../IkiWiki/CGI.pm:538 msgid "Your login session has expired." msgstr "Session d'authentification expirée." -#: ../IkiWiki/CGI.pm:184 +#: ../IkiWiki/CGI.pm:210 msgid "Login" msgstr "S’identifier" -#: ../IkiWiki/CGI.pm:185 +#: ../IkiWiki/CGI.pm:211 msgid "Preferences" msgstr "Préférences" -#: ../IkiWiki/CGI.pm:186 +#: ../IkiWiki/CGI.pm:212 msgid "Admin" msgstr "Administrateur" -#: ../IkiWiki/CGI.pm:253 +#: ../IkiWiki/CGI.pm:279 msgid "Preferences saved." msgstr "Les préférences ont été enregistrées." -#: ../IkiWiki/CGI.pm:271 +#: ../IkiWiki/CGI.pm:338 +#, perl-format +msgid "%s is not an editable page" +msgstr "%s n'est pas une page éditable" + +#: ../IkiWiki/CGI.pm:449 +#: ../IkiWiki/Plugin/brokenlinks.pm:33 +#: ../IkiWiki/Plugin/inline.pm:310 +#: ../IkiWiki/Plugin/opendiscussion.pm:26 +#: ../IkiWiki/Plugin/orphans.pm:37 +#: ../IkiWiki/Render.pm:78 +#: ../IkiWiki/Render.pm:148 +msgid "discussion" +msgstr "Discussion" + +#: ../IkiWiki/CGI.pm:505 +#, perl-format +msgid "creating %s" +msgstr "Création de %s" + +#: ../IkiWiki/CGI.pm:523 +#: ../IkiWiki/CGI.pm:551 +#: ../IkiWiki/CGI.pm:561 +#: ../IkiWiki/CGI.pm:596 +#: ../IkiWiki/CGI.pm:641 +#, perl-format +msgid "editing %s" +msgstr "Édition de %s" + +#: ../IkiWiki/CGI.pm:666 msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1153 +#: ../IkiWiki/CGI.pm:783 +#: ../IkiWiki/CGI.pm:784 +#: ../IkiWiki.pm:1117 msgid "Error" msgstr "Erreur" #: ../IkiWiki/Plugin/aggregate.pm:80 msgid "Aggregation triggered via web." -msgstr "" +msgstr "Agrégation déclenchée via Internet" #: ../IkiWiki/Plugin/aggregate.pm:89 msgid "Nothing to do right now, all feeds are up-to-date!" -msgstr "" +msgstr "Rien à faire pour le moment, tous les flux sont à jour!" #: ../IkiWiki/Plugin/aggregate.pm:216 #, perl-format @@ -123,65 +154,57 @@ msgstr "(échappement des entités de flux)" msgid "feed crashed XML::Feed!" msgstr "Plantage du flux XML::Feed !" -#: ../IkiWiki/Plugin/aggregate.pm:590 +#: ../IkiWiki/Plugin/aggregate.pm:584 #, perl-format msgid "creating new page %s" msgstr "Création de la nouvelle page %s" #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." -msgstr "" +msgstr "vidage du panier..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 +#: ../ikiwiki.in:192 msgid "done" msgstr "Terminé" #: ../IkiWiki/Plugin/amazon_s3.pm:97 #, perl-format msgid "Must specify %s" -msgstr "" +msgstr "Vous devez spécifier %s" #: ../IkiWiki/Plugin/amazon_s3.pm:136 msgid "Failed to create bucket in S3: " -msgstr "" +msgstr "Echec lors de la création du panier en S3:" #: ../IkiWiki/Plugin/amazon_s3.pm:221 -#, fuzzy msgid "Failed to save file to S3: " -msgstr "Échec de l'envoi du courriel" +msgstr "Echec lors de la création du fichier en S3:" #: ../IkiWiki/Plugin/amazon_s3.pm:243 -#, fuzzy msgid "Failed to delete file from S3: " -msgstr "Échec de la création de l'image à partir du code" +msgstr "Echec lors de la suppression du fichier de S3:" #: ../IkiWiki/Plugin/attachment.pm:48 #, perl-format msgid "there is already a page named %s" -msgstr "" +msgstr "il existe déjà une page nommée %s" #: ../IkiWiki/Plugin/attachment.pm:81 msgid "prohibited by allowed_attachments" -msgstr "" +msgstr "action interdite par pièces jointes autorisées" -#: ../IkiWiki/Plugin/attachment.pm:188 +#: ../IkiWiki/Plugin/attachment.pm:189 msgid "bad attachment filename" -msgstr "" +msgstr "Mauvais nom de la pièce jointe" -#: ../IkiWiki/Plugin/attachment.pm:230 +#: ../IkiWiki/Plugin/attachment.pm:231 msgid "attachment upload" -msgstr "" +msgstr "envoi de la pièce jointe" #: ../IkiWiki/Plugin/autoindex.pm:103 msgid "automatic index generation" -msgstr "" - -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:261 -#: ../IkiWiki/Plugin/inline.pm:323 ../IkiWiki/Plugin/opendiscussion.pm:26 -#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79 -#: ../IkiWiki/Render.pm:149 -msgid "discussion" -msgstr "Discussion" +msgstr "génération de l'index automatique" #: ../IkiWiki/Plugin/brokenlinks.pm:49 #, perl-format @@ -192,43 +215,23 @@ msgstr "%s sur %s" msgid "There are no broken links!" msgstr "Il n'existe pas de lien cassé !" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:27 +#: ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "le paramètre %s est obligatoire" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" -msgstr "" +msgstr "aucun texte n'a été copié dans cette page" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" -msgstr "" - -#: ../IkiWiki/Plugin/editpage.pm:40 -#, fuzzy, perl-format -msgid "removing old preview %s" -msgstr "Suppression de l'ancienne page %s" - -#: ../IkiWiki/Plugin/editpage.pm:141 -#, perl-format -msgid "%s is not an editable page" -msgstr "%s n'est pas une page éditable" - -#: ../IkiWiki/Plugin/editpage.pm:317 -#, perl-format -msgid "creating %s" -msgstr "Création de %s" - -#: ../IkiWiki/Plugin/editpage.pm:335 ../IkiWiki/Plugin/editpage.pm:363 -#: ../IkiWiki/Plugin/editpage.pm:373 ../IkiWiki/Plugin/editpage.pm:408 -#: ../IkiWiki/Plugin/editpage.pm:453 -#, perl-format -msgid "editing %s" -msgstr "Édition de %s" +msgstr "Aucun texte n'a été copié dans cette page avec l'identifiant %s" #: ../IkiWiki/Plugin/edittemplate.pm:51 msgid "template not specified" @@ -238,12 +241,12 @@ msgstr "modèle (« template ») non indiqué" msgid "match not specified" msgstr "correspondance non indiquée" -#: ../IkiWiki/Plugin/edittemplate.pm:62 +#: ../IkiWiki/Plugin/edittemplate.pm:59 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s enregistré pour %s" -#: ../IkiWiki/Plugin/edittemplate.pm:133 +#: ../IkiWiki/Plugin/edittemplate.pm:125 msgid "failed to process" msgstr "Échec du traitement" @@ -264,66 +267,59 @@ msgid "prog not a valid graphviz program" msgstr "Ce programme n'est pas un programme graphviz valable" #: ../IkiWiki/Plugin/img.pm:62 -#, fuzzy msgid "Image::Magick is not installed" -msgstr "polygen n'est pas installé" +msgstr "Image::Magick n'est pas installé" #: ../IkiWiki/Plugin/img.pm:69 #, perl-format msgid "bad size \"%s\"" msgstr "taille incorrecte « %s »" -#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84 -#: ../IkiWiki/Plugin/img.pm:101 +#: ../IkiWiki/Plugin/img.pm:79 +#: ../IkiWiki/Plugin/img.pm:83 +#: ../IkiWiki/Plugin/img.pm:100 #, perl-format msgid "failed to read %s: %s" msgstr "Échec de la lecture de %s : %s" -#: ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:86 #, perl-format msgid "failed to resize: %s" msgstr "Échec du redimensionnement : %s" -#: ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to determine size of image %s" msgstr "Échec de la détermination de la taille de l'image : %s" #: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" -msgstr "" -"Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --rss " -"ou --atom" +msgstr "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --rss ou --atom" -#: ../IkiWiki/Plugin/inline.pm:139 -#, fuzzy -msgid "page editing not allowed" -msgstr "Redirection cyclique non autorisée" - -#: ../IkiWiki/Plugin/inline.pm:156 -#, fuzzy +#: ../IkiWiki/Plugin/inline.pm:150 msgid "missing pages parameter" -msgstr "Paramètre %s manquant" +msgstr "paramètres de la page manquants" -#: ../IkiWiki/Plugin/inline.pm:204 +#: ../IkiWiki/Plugin/inline.pm:198 #, perl-format msgid "unknown sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki/Plugin/inline.pm:282 +#: ../IkiWiki/Plugin/inline.pm:269 msgid "Add a new post titled:" msgstr "Ajouter un nouvel article dont le titre est :" -#: ../IkiWiki/Plugin/inline.pm:298 +#: ../IkiWiki/Plugin/inline.pm:285 #, perl-format msgid "nonexistant template %s" msgstr "Le modèle (« template ») %s n'existe pas" -#: ../IkiWiki/Plugin/inline.pm:331 ../IkiWiki/Render.pm:83 +#: ../IkiWiki/Plugin/inline.pm:318 +#: ../IkiWiki/Render.pm:82 msgid "Discussion" msgstr "Discussion" -#: ../IkiWiki/Plugin/inline.pm:568 +#: ../IkiWiki/Plugin/inline.pm:555 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" @@ -331,21 +327,20 @@ msgstr "RPC::XML::Client introuvable, pas de réponse au ping" msgid "failed to run dot" msgstr "Échec du lancement de dot" -#: ../IkiWiki/Plugin/lockedit.pm:46 ../IkiWiki/Plugin/lockedit.pm:60 -#, fuzzy, perl-format +#: ../IkiWiki/Plugin/lockedit.pm:46 +#: ../IkiWiki/Plugin/lockedit.pm:60 +#, perl-format msgid "%s is locked and cannot be edited" -msgstr "%s est verrouillé par %s et ne peut être édité" +msgstr "%s est verouillé et ne peut être édité" #: ../IkiWiki/Plugin/mdwn.pm:44 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" -msgstr "" +msgstr "mulitmarkdown est activé mais Text::Multimarkdown n'est pas installé" #: ../IkiWiki/Plugin/mdwn.pm:67 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" -msgstr "" -"Échec du chargement du module Perl Markdown.pm (%s) ou de /usr/bin/markdown " -"(%s)" +msgstr "Échec du chargement du module Perl Markdown.pm (%s) ou de /usr/bin/markdown (%s)" #: ../IkiWiki/Plugin/meta.pm:150 msgid "stylesheet not found" @@ -401,7 +396,7 @@ msgstr "Erreur lors de la création du compte." #: ../IkiWiki/Plugin/passwordauth.pm:257 msgid "No email address, so cannot email password reset instructions." -msgstr "" +msgstr "Pas d'adresse email spécifiée. Impossible d'envoyer les instructions de remise à zéro du mot de passe" #: ../IkiWiki/Plugin/passwordauth.pm:291 msgid "Failed to send mail" @@ -409,38 +404,37 @@ msgstr "Échec de l'envoi du courriel" #: ../IkiWiki/Plugin/passwordauth.pm:293 msgid "You have been mailed password reset instructions." -msgstr "" +msgstr "Vous avez reçu un message contenant les instructions de remise à zéro du mot de passe" #: ../IkiWiki/Plugin/passwordauth.pm:328 msgid "incorrect password reset url" -msgstr "" +msgstr "Adresse de remise à zéro du mot de passe incorrecte" #: ../IkiWiki/Plugin/passwordauth.pm:331 msgid "password reset denied" -msgstr "" +msgstr "remise à zéro du mot de passe refusée" #: ../IkiWiki/Plugin/pingee.pm:30 msgid "Ping received." -msgstr "" +msgstr "Ping reçu" #: ../IkiWiki/Plugin/pinger.pm:53 msgid "requires 'from' and 'to' parameters" -msgstr "" +msgstr "les paramètres 'de' et 'à' sont nécessaires" #: ../IkiWiki/Plugin/pinger.pm:58 -#, fuzzy, perl-format +#, perl-format msgid "Will ping %s" -msgstr "Édition de %s" +msgstr "va envoyer un ping à %s" #: ../IkiWiki/Plugin/pinger.pm:61 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" -msgstr "" +msgstr "les instructions du wiki %s sont ignorées (ce wiki est %s)" #: ../IkiWiki/Plugin/pinger.pm:77 -#, fuzzy msgid "LWP not found, not pinging" -msgstr "RPC::XML::Client introuvable, pas de réponse au ping" +msgstr "LWP est introuvable. Pas de réponse au ping" #: ../IkiWiki/Plugin/poll.pm:69 msgid "vote" @@ -455,9 +449,8 @@ msgid "polygen not installed" msgstr "polygen n'est pas installé" #: ../IkiWiki/Plugin/polygen.pm:60 -#, fuzzy msgid "command failed" -msgstr "Échec du lancement de « fortune »" +msgstr "Echec lors du lancement de la commande" #: ../IkiWiki/Plugin/postsparkline.pm:41 msgid "missing formula" @@ -531,20 +524,11 @@ msgstr "à minuit" msgid "at noon on %A" msgstr "%A, à midi" -#: ../IkiWiki/Plugin/progress.pm:34 -#, perl-format -msgid "illegal percent value %s" -msgstr "" - -#: ../IkiWiki/Plugin/progress.pm:59 -msgid "need either `percent` or `totalpages` and `donepages` parameters" -msgstr "" - -#: ../IkiWiki/Plugin/recentchanges.pm:100 +#: ../IkiWiki/Plugin/recentchanges.pm:99 msgid "missing page" msgstr "Page manquante" -#: ../IkiWiki/Plugin/recentchanges.pm:102 +#: ../IkiWiki/Plugin/recentchanges.pm:101 #, perl-format msgid "The page %s does not exist." msgstr "La page %s n'existe pas." @@ -553,85 +537,82 @@ msgstr "La page %s n'existe pas." msgid "(Diff truncated)" msgstr "(fichier de différences tronqué)" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 -#, fuzzy, perl-format +#: ../IkiWiki/Plugin/remove.pm:32 +#: ../IkiWiki/Plugin/rename.pm:35 +#, perl-format msgid "%s does not exist" -msgstr "La page %s n'existe pas." +msgstr "%s n'existe pas" -#: ../IkiWiki/Plugin/remove.pm:38 -#, fuzzy, perl-format +#: ../IkiWiki/Plugin/remove.pm:39 +#, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" -msgstr "%s est verrouillé par %s et ne peut être édité" +msgstr "%s n'est pas dans srcdir et ne peut donc pas être supprimé" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 -#, fuzzy, perl-format +#: ../IkiWiki/Plugin/remove.pm:42 +#: ../IkiWiki/Plugin/rename.pm:44 +#, perl-format msgid "%s is not a file" -msgstr "%s n'est pas une page éditable" +msgstr "%s n'est pas un fichier" -#: ../IkiWiki/Plugin/remove.pm:112 +#: ../IkiWiki/Plugin/remove.pm:109 #, perl-format msgid "confirm removal of %s" -msgstr "" +msgstr "Suppression de %s confirmée" -#: ../IkiWiki/Plugin/remove.pm:148 +#: ../IkiWiki/Plugin/remove.pm:145 msgid "Please select the attachments to remove." -msgstr "" +msgstr "Veuillez choisir la pièce jointe à supprimer" -#: ../IkiWiki/Plugin/remove.pm:188 +#: ../IkiWiki/Plugin/remove.pm:185 msgid "removed" -msgstr "" +msgstr "supprimé" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:41 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" -msgstr "" +msgstr "%s n'est pas dans srcdir. Impossible de le renommer" -#: ../IkiWiki/Plugin/rename.pm:62 -#, fuzzy +#: ../IkiWiki/Plugin/rename.pm:56 msgid "no change to the file name was specified" -msgstr "Le nom de fichier de l'enrobage n'a pas été indiqué" +msgstr "Aucun changement dans le nom du fichier n'a été spécifié" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:62 #, perl-format msgid "illegal name" -msgstr "" +msgstr "appellation non autorisé" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:67 #, perl-format msgid "%s already exists" -msgstr "" +msgstr "%s existe déjà" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:73 #, perl-format msgid "%s already exists on disk" -msgstr "" +msgstr "%s existe déjà sur le disque" -#: ../IkiWiki/Plugin/rename.pm:101 -#, fuzzy, perl-format +#: ../IkiWiki/Plugin/rename.pm:95 +#, perl-format msgid "rename %s" -msgstr "Affichage de %s" - -#: ../IkiWiki/Plugin/rename.pm:138 -msgid "Also rename SubPages and attachments" -msgstr "" +msgstr "%s renommé" -#: ../IkiWiki/Plugin/rename.pm:223 +#: ../IkiWiki/Plugin/rename.pm:206 msgid "Only one attachment can be renamed at a time." -msgstr "" +msgstr "Seule une pièce jointe peut être renommée à la fois" -#: ../IkiWiki/Plugin/rename.pm:226 +#: ../IkiWiki/Plugin/rename.pm:209 msgid "Please select the attachment to rename." -msgstr "" +msgstr "Veuillez sélectionner la pièce jointe à renommer" -#: ../IkiWiki/Plugin/rename.pm:332 +#: ../IkiWiki/Plugin/rename.pm:277 #, perl-format msgid "rename %s to %s" -msgstr "" +msgstr "renomme %s en %s" -#: ../IkiWiki/Plugin/rename.pm:484 +#: ../IkiWiki/Plugin/rename.pm:306 #, perl-format msgid "update for rename of %s to %s" -msgstr "" +msgstr "du nouveau nom de %s en %s" #: ../IkiWiki/Plugin/search.pm:36 #, perl-format @@ -641,16 +622,15 @@ msgstr "Vous devez indiquer %s lors de l'utilisation du greffon de recherche" #: ../IkiWiki/Plugin/search.pm:182 #, perl-format msgid "need Digest::SHA1 to index %s" -msgstr "" +msgstr "Digest::SHA1 est nécessaire pour indexer %s" #: ../IkiWiki/Plugin/search.pm:217 msgid "search" -msgstr "" +msgstr "recherche" #: ../IkiWiki/Plugin/shortcut.pm:27 msgid "shortcut plugin will not work without a shortcuts.mdwn" -msgstr "" -"Le greffon de raccourci (« shortcut ») ne fonctionnera pas sans shortcuts.mdwn" +msgstr "Le greffon de raccourci (« shortcut ») ne fonctionnera pas sans shortcuts.mdwn" #: ../IkiWiki/Plugin/shortcut.pm:36 msgid "missing name or url parameter" @@ -712,11 +692,11 @@ msgstr "Format de données inconnu" msgid "empty data" msgstr "Données vides" -#: ../IkiWiki/Plugin/table.pm:100 +#: ../IkiWiki/Plugin/table.pm:101 msgid "Direct data download" msgstr "Téléchargement direct des données" -#: ../IkiWiki/Plugin/table.pm:134 +#: ../IkiWiki/Plugin/table.pm:135 #, perl-format msgid "parse fail at line %d: %s" msgstr "Erreur d'analyse à la ligne %d : %s" @@ -748,99 +728,84 @@ msgstr "Échec de la création de l'image à partir du code" #: ../IkiWiki/Plugin/websetup.pm:89 msgid "plugin" -msgstr "" +msgstr "module complémentaire" #: ../IkiWiki/Plugin/websetup.pm:108 #, perl-format msgid "enable %s?" -msgstr "" +msgstr "activer %s?" #: ../IkiWiki/Plugin/websetup.pm:236 msgid "you are not logged in as an admin" -msgstr "" +msgstr "vous n'êtes pas authentifié comme administrateur" #: ../IkiWiki/Plugin/websetup.pm:240 msgid "setup file for this wiki is not known" -msgstr "" +msgstr "le fichier de configuration de ce wiki n'est pas connu" #: ../IkiWiki/Plugin/websetup.pm:256 -#, fuzzy msgid "main" -msgstr "Administrateur" +msgstr "principal" #: ../IkiWiki/Plugin/websetup.pm:257 msgid "plugins" -msgstr "" +msgstr "modules complémentaires" #: ../IkiWiki/Plugin/websetup.pm:395 -msgid "" -"The configuration changes shown below require a wiki rebuild to take effect." -msgstr "" +msgid "The configuration changes shown below require a wiki rebuild to take effect." +msgstr "les changements de configuration ci dessous nécessitent une recompilation du wiki pour prendre effet" #: ../IkiWiki/Plugin/websetup.pm:399 -msgid "" -"For the configuration changes shown below to fully take effect, you may need " -"to rebuild the wiki." -msgstr "" +msgid "For the configuration changes shown below to fully take effect, you may need to rebuild the wiki." +msgstr "Pour que les changements de configuration ci dessous prennent effet vous devez recompiler le wiki" #: ../IkiWiki/Plugin/websetup.pm:433 #, perl-format msgid "

Error: %s exited nonzero (%s)" -msgstr "" +msgstr "

Erreur: %s a quitté nonzero (%s)" -#: ../IkiWiki/Render.pm:253 -#, perl-format -msgid "" -"symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " -"allow this" -msgstr "" - -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:276 +#: ../IkiWiki/Render.pm:297 #, perl-format msgid "skipping bad filename %s" msgstr "Omission du fichier au nom incorrect %s" -#: ../IkiWiki/Render.pm:284 -#, perl-format -msgid "%s has multiple possible source pages" -msgstr "" - -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:355 #, perl-format msgid "removing old page %s" msgstr "Suppression de l'ancienne page %s" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:395 #, perl-format msgid "scanning %s" msgstr "Parcours de %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:400 #, perl-format msgid "rendering %s" msgstr "Affichage de %s" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "rendering %s, which links to %s" msgstr "Affichage de %s, qui est lié à %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:442 #, perl-format msgid "rendering %s, which depends on %s" msgstr "Affichage de %s, qui dépend de %s" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:481 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "Affichage de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:498 +#: ../IkiWiki/Render.pm:493 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "Suppression de %s, qui n'est plus affiché par %s" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:517 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki : impossible d'afficher %s" @@ -854,16 +819,16 @@ msgstr "Lecture impossible de %s : %s" #: ../IkiWiki/Setup/Automator.pm:33 msgid "you must enter a wikiname (that contains alphanumerics)" -msgstr "" +msgstr "Vous devez spécifier un nom de wiki (contenant des caractères alphanumériques)" #: ../IkiWiki/Setup/Automator.pm:67 #, perl-format msgid "unsupported revision control system %s" -msgstr "" +msgstr "Système de contôles des version non supporté" #: ../IkiWiki/Setup/Automator.pm:83 msgid "failed to set up the repository with ikiwiki-makerepo" -msgstr "" +msgstr "Echec lors de la création du dépôt avec ikiwiki-makerepo" #: ../IkiWiki/Wrapper.pm:16 #, perl-format @@ -872,8 +837,7 @@ msgstr "%s ne semble pas être exécutable" #: ../IkiWiki/Wrapper.pm:20 msgid "cannot create a wrapper that uses a setup file" -msgstr "" -"Impossible de créer un fichier CGI utilisant un fichier de configuration" +msgstr "Impossible de créer un fichier CGI utilisant un fichier de configuration" #: ../IkiWiki/Wrapper.pm:24 msgid "wrapper filename not specified" @@ -902,82 +866,67 @@ msgstr "%s a été créé avec succès" msgid "usage: ikiwiki [options] source dest" msgstr "Syntaxe : ikiwiki [options] source destination" -#: ../ikiwiki.in:14 -msgid " ikiwiki --setup configfile" -msgstr "" - -#: ../ikiwiki.in:90 +#: ../ikiwiki.in:83 msgid "usage: --set var=value" msgstr "Syntaxe : -- set var=valeur" -#: ../ikiwiki.in:137 +#: ../ikiwiki.in:129 msgid "generating wrappers.." msgstr "Création des fichiers CGI..." -#: ../ikiwiki.in:188 +#: ../ikiwiki.in:181 msgid "rebuilding wiki.." msgstr "Reconstruction du wiki..." -#: ../ikiwiki.in:191 +#: ../ikiwiki.in:184 msgid "refreshing wiki.." msgstr "Rafraîchissement du wiki..." -#: ../IkiWiki.pm:458 +#: ../IkiWiki.pm:434 msgid "Must specify url to wiki with --url when using --cgi" -msgstr "" -"Vous devez indiquer une URL vers le wiki par --url lors de l'utilisation de " -"--cgi" +msgstr "Vous devez indiquer une URL vers le wiki par --url lors de l'utilisation de --cgi" -#: ../IkiWiki.pm:504 +#: ../IkiWiki.pm:478 msgid "cannot use multiple rcs plugins" -msgstr "" +msgstr "impossible d'utiliser plusieurs modules complémentaires dans le système de contrôle des versions" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:1100 #, perl-format -msgid "failed to load external plugin needed for %s plugin: %s" -msgstr "" - -#: ../IkiWiki.pm:1136 -#, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" -msgstr "" -"%s une boucle a été détectée dans le prétraitement de %s, à la profondeur %i" +msgstr "une boucle de pré traitement a été detectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:1645 +#: ../IkiWiki.pm:1588 msgid "yes" -msgstr "" +msgstr "oui" #: ../auto.setup:16 msgid "What will the wiki be named?" -msgstr "" +msgstr "Nom du wiki" #: ../auto.setup:16 msgid "wiki" -msgstr "" +msgstr "wiki" #: ../auto.setup:18 msgid "What revision control system to use?" -msgstr "" +msgstr "Système de contrôle de version utilisé?" #: ../auto.setup:20 msgid "What wiki user (or openid) will be wiki admin?" -msgstr "" +msgstr "Identifiant de l'administrateur?" #: ../auto.setup:23 msgid "What is the domain name of the web server?" -msgstr "" +msgstr "Nom de domaine du serveur HTTP?" #~ msgid "Your password has been emailed to you." #~ msgstr "Votre mot de passe vous a été envoyé par courriel." - #~ msgid "polygen failed" #~ msgstr "Échec du lancement de polygen" - #~ msgid "cleaning hyperestraier search index" #~ msgstr "Nettoyage de l'index de recherche de hyperestraier" - #~ msgid "updating hyperestraier search index" #~ msgstr "Mise à jour de l'index de recherche de hyperestraier" - #~ msgid "(not toggleable in preview mode)" #~ msgstr "(non permutable en mode prévisualisation)" + -- cgit v1.2.3 From 92989a3f6cc754dffa69b98292a7de457817a28c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 5 Oct 2008 19:17:16 -0400 Subject: make set -e --- debian/preinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/preinst b/debian/preinst index 12d3d83af..c588901df 100755 --- a/debian/preinst +++ b/debian/preinst @@ -1,5 +1,5 @@ #!/bin/sh - +set -e #DEBHELPER# if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt 1.2; then -- cgit v1.2.3 From a7626cec4aa28f7f39289d474d01f8d7630feaaf Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 5 Oct 2008 19:17:24 -0400 Subject: fix lintian warning --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index b900052dc..fdf2a3a36 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Build-Depends: perl, debhelper (>= 5) Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libtext-markdown-perl | markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libhtml-parser-perl, liburi-perl, perlmagick Maintainer: Joey Hess -Uploaders: Joey Hess , Josh Triplett +Uploaders: Josh Triplett Standards-Version: 3.8.0 Homepage: http://ikiwiki.info/ Vcs-Git: git://git.ikiwiki.info/ -- cgit v1.2.3 From 836a522c8150c80f828e86f3c39ab1223e8ac113 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 5 Oct 2008 19:24:38 -0400 Subject: releasing version 2.66 --- debian/changelog | 4 +- po/fr.po | 298 ++++++++++++++++++++++++++++++++----------------------- po/ikiwiki.pot | 42 ++++---- 3 files changed, 199 insertions(+), 145 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f77141a73..fc1eb4819 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (2.66) UNRELEASED; urgency=low +ikiwiki (2.66) unstable; urgency=low * recentchanges: Fix redirects to non-page files. * aggregate: Avoid uninitialized value warnings for pages with no recorded @@ -38,7 +38,7 @@ ikiwiki (2.66) UNRELEASED; urgency=low * remove, rename: Allow acting on attachments as a page is being created. * Updated French translation. Closes: #500929 - -- Joey Hess Thu, 25 Sep 2008 13:45:55 -0400 + -- Joey Hess Sun, 05 Oct 2008 19:11:08 -0400 ikiwiki (2.65) unstable; urgency=low diff --git a/po/fr.po b/po/fr.po index abd2c0efc..0c8406381 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-28 13:05-0400\n" +"POT-Creation-Date: 2008-10-05 19:11-0400\n" "PO-Revision-Date: 2008-09-23 10:00+0100\n" "Last-Translator: Julien Patriarca \n" "Language-Team: French \n" @@ -18,71 +18,40 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: ../IkiWiki/CGI.pm:139 +#: ../IkiWiki/CGI.pm:113 msgid "You need to log in first." msgstr "Vous devez d'abord vous identifier." -#: ../IkiWiki/CGI.pm:171 +#: ../IkiWiki/CGI.pm:145 msgid "login failed, perhaps you need to turn on cookies?" -msgstr "Échec de l'identification, vous devriez peut-être autoriser les cookies." +msgstr "" +"Échec de l'identification, vous devriez peut-être autoriser les cookies." -#: ../IkiWiki/CGI.pm:189 -#: ../IkiWiki/CGI.pm:538 +#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:350 msgid "Your login session has expired." msgstr "Session d'authentification expirée." -#: ../IkiWiki/CGI.pm:210 +#: ../IkiWiki/CGI.pm:184 msgid "Login" msgstr "S’identifier" -#: ../IkiWiki/CGI.pm:211 +#: ../IkiWiki/CGI.pm:185 msgid "Preferences" msgstr "Préférences" -#: ../IkiWiki/CGI.pm:212 +#: ../IkiWiki/CGI.pm:186 msgid "Admin" msgstr "Administrateur" -#: ../IkiWiki/CGI.pm:279 +#: ../IkiWiki/CGI.pm:253 msgid "Preferences saved." msgstr "Les préférences ont été enregistrées." -#: ../IkiWiki/CGI.pm:338 -#, perl-format -msgid "%s is not an editable page" -msgstr "%s n'est pas une page éditable" - -#: ../IkiWiki/CGI.pm:449 -#: ../IkiWiki/Plugin/brokenlinks.pm:33 -#: ../IkiWiki/Plugin/inline.pm:310 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 -#: ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:78 -#: ../IkiWiki/Render.pm:148 -msgid "discussion" -msgstr "Discussion" - -#: ../IkiWiki/CGI.pm:505 -#, perl-format -msgid "creating %s" -msgstr "Création de %s" - -#: ../IkiWiki/CGI.pm:523 -#: ../IkiWiki/CGI.pm:551 -#: ../IkiWiki/CGI.pm:561 -#: ../IkiWiki/CGI.pm:596 -#: ../IkiWiki/CGI.pm:641 -#, perl-format -msgid "editing %s" -msgstr "Édition de %s" - -#: ../IkiWiki/CGI.pm:666 +#: ../IkiWiki/CGI.pm:271 msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:783 -#: ../IkiWiki/CGI.pm:784 -#: ../IkiWiki.pm:1117 +#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1166 msgid "Error" msgstr "Erreur" @@ -154,7 +123,7 @@ msgstr "(échappement des entités de flux)" msgid "feed crashed XML::Feed!" msgstr "Plantage du flux XML::Feed !" -#: ../IkiWiki/Plugin/aggregate.pm:584 +#: ../IkiWiki/Plugin/aggregate.pm:590 #, perl-format msgid "creating new page %s" msgstr "Création de la nouvelle page %s" @@ -163,8 +132,7 @@ msgstr "Création de la nouvelle page %s" msgid "deleting bucket.." msgstr "vidage du panier..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 -#: ../ikiwiki.in:192 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 msgid "done" msgstr "Terminé" @@ -206,6 +174,13 @@ msgstr "envoi de la pièce jointe" msgid "automatic index generation" msgstr "génération de l'index automatique" +#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:261 +#: ../IkiWiki/Plugin/inline.pm:326 ../IkiWiki/Plugin/opendiscussion.pm:26 +#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79 +#: ../IkiWiki/Render.pm:149 +msgid "discussion" +msgstr "Discussion" + #: ../IkiWiki/Plugin/brokenlinks.pm:49 #, perl-format msgid "%s from %s" @@ -215,24 +190,44 @@ msgstr "%s sur %s" msgid "There are no broken links!" msgstr "Il n'existe pas de lien cassé !" -#: ../IkiWiki/Plugin/conditional.pm:27 -#: ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 -#: ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 +#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "le paramètre %s est obligatoire" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:66 msgid "no text was copied in this page" msgstr "aucun texte n'a été copié dans cette page" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:69 #, perl-format msgid "no text was copied in this page with id %s" msgstr "Aucun texte n'a été copié dans cette page avec l'identifiant %s" +#: ../IkiWiki/Plugin/editpage.pm:40 +#, fuzzy, perl-format +msgid "removing old preview %s" +msgstr "Suppression de l'ancienne page %s" + +#: ../IkiWiki/Plugin/editpage.pm:141 +#, perl-format +msgid "%s is not an editable page" +msgstr "%s n'est pas une page éditable" + +#: ../IkiWiki/Plugin/editpage.pm:317 +#, perl-format +msgid "creating %s" +msgstr "Création de %s" + +#: ../IkiWiki/Plugin/editpage.pm:335 ../IkiWiki/Plugin/editpage.pm:363 +#: ../IkiWiki/Plugin/editpage.pm:373 ../IkiWiki/Plugin/editpage.pm:408 +#: ../IkiWiki/Plugin/editpage.pm:453 +#, perl-format +msgid "editing %s" +msgstr "Édition de %s" + #: ../IkiWiki/Plugin/edittemplate.pm:51 msgid "template not specified" msgstr "modèle (« template ») non indiqué" @@ -241,12 +236,12 @@ msgstr "modèle (« template ») non indiqué" msgid "match not specified" msgstr "correspondance non indiquée" -#: ../IkiWiki/Plugin/edittemplate.pm:59 +#: ../IkiWiki/Plugin/edittemplate.pm:62 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s enregistré pour %s" -#: ../IkiWiki/Plugin/edittemplate.pm:125 +#: ../IkiWiki/Plugin/edittemplate.pm:133 msgid "failed to process" msgstr "Échec du traitement" @@ -275,51 +270,56 @@ msgstr "Image::Magick n'est pas installé" msgid "bad size \"%s\"" msgstr "taille incorrecte « %s »" -#: ../IkiWiki/Plugin/img.pm:79 -#: ../IkiWiki/Plugin/img.pm:83 -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84 +#: ../IkiWiki/Plugin/img.pm:101 #, perl-format msgid "failed to read %s: %s" msgstr "Échec de la lecture de %s : %s" -#: ../IkiWiki/Plugin/img.pm:86 +#: ../IkiWiki/Plugin/img.pm:87 #, perl-format msgid "failed to resize: %s" msgstr "Échec du redimensionnement : %s" -#: ../IkiWiki/Plugin/img.pm:117 +#: ../IkiWiki/Plugin/img.pm:118 #, perl-format msgid "failed to determine size of image %s" msgstr "Échec de la détermination de la taille de l'image : %s" #: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" -msgstr "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --rss ou --atom" +msgstr "" +"Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --rss " +"ou --atom" + +#: ../IkiWiki/Plugin/inline.pm:139 +#, fuzzy +msgid "page editing not allowed" +msgstr "Redirection cyclique non autorisée" -#: ../IkiWiki/Plugin/inline.pm:150 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "paramètres de la page manquants" -#: ../IkiWiki/Plugin/inline.pm:198 +#: ../IkiWiki/Plugin/inline.pm:204 #, perl-format msgid "unknown sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki/Plugin/inline.pm:269 +#: ../IkiWiki/Plugin/inline.pm:285 msgid "Add a new post titled:" msgstr "Ajouter un nouvel article dont le titre est :" -#: ../IkiWiki/Plugin/inline.pm:285 +#: ../IkiWiki/Plugin/inline.pm:301 #, perl-format msgid "nonexistant template %s" msgstr "Le modèle (« template ») %s n'existe pas" -#: ../IkiWiki/Plugin/inline.pm:318 -#: ../IkiWiki/Render.pm:82 +#: ../IkiWiki/Plugin/inline.pm:334 ../IkiWiki/Render.pm:83 msgid "Discussion" msgstr "Discussion" -#: ../IkiWiki/Plugin/inline.pm:555 +#: ../IkiWiki/Plugin/inline.pm:571 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" @@ -327,8 +327,7 @@ msgstr "RPC::XML::Client introuvable, pas de réponse au ping" msgid "failed to run dot" msgstr "Échec du lancement de dot" -#: ../IkiWiki/Plugin/lockedit.pm:46 -#: ../IkiWiki/Plugin/lockedit.pm:60 +#: ../IkiWiki/Plugin/lockedit.pm:46 ../IkiWiki/Plugin/lockedit.pm:60 #, perl-format msgid "%s is locked and cannot be edited" msgstr "%s est verouillé et ne peut être édité" @@ -340,7 +339,9 @@ msgstr "mulitmarkdown est activé mais Text::Multimarkdown n'est pas installé" #: ../IkiWiki/Plugin/mdwn.pm:67 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" -msgstr "Échec du chargement du module Perl Markdown.pm (%s) ou de /usr/bin/markdown (%s)" +msgstr "" +"Échec du chargement du module Perl Markdown.pm (%s) ou de /usr/bin/markdown " +"(%s)" #: ../IkiWiki/Plugin/meta.pm:150 msgid "stylesheet not found" @@ -396,7 +397,9 @@ msgstr "Erreur lors de la création du compte." #: ../IkiWiki/Plugin/passwordauth.pm:257 msgid "No email address, so cannot email password reset instructions." -msgstr "Pas d'adresse email spécifiée. Impossible d'envoyer les instructions de remise à zéro du mot de passe" +msgstr "" +"Pas d'adresse email spécifiée. Impossible d'envoyer les instructions de " +"remise à zéro du mot de passe" #: ../IkiWiki/Plugin/passwordauth.pm:291 msgid "Failed to send mail" @@ -404,7 +407,9 @@ msgstr "Échec de l'envoi du courriel" #: ../IkiWiki/Plugin/passwordauth.pm:293 msgid "You have been mailed password reset instructions." -msgstr "Vous avez reçu un message contenant les instructions de remise à zéro du mot de passe" +msgstr "" +"Vous avez reçu un message contenant les instructions de remise à zéro du mot " +"de passe" #: ../IkiWiki/Plugin/passwordauth.pm:328 msgid "incorrect password reset url" @@ -524,11 +529,20 @@ msgstr "à minuit" msgid "at noon on %A" msgstr "%A, à midi" -#: ../IkiWiki/Plugin/recentchanges.pm:99 +#: ../IkiWiki/Plugin/progress.pm:34 +#, fuzzy, perl-format +msgid "illegal percent value %s" +msgstr "appellation non autorisé" + +#: ../IkiWiki/Plugin/progress.pm:59 +msgid "need either `percent` or `totalpages` and `donepages` parameters" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:100 msgid "missing page" msgstr "Page manquante" -#: ../IkiWiki/Plugin/recentchanges.pm:101 +#: ../IkiWiki/Plugin/recentchanges.pm:102 #, perl-format msgid "The page %s does not exist." msgstr "La page %s n'existe pas." @@ -537,79 +551,81 @@ msgstr "La page %s n'existe pas." msgid "(Diff truncated)" msgstr "(fichier de différences tronqué)" -#: ../IkiWiki/Plugin/remove.pm:32 -#: ../IkiWiki/Plugin/rename.pm:35 +#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 #, perl-format msgid "%s does not exist" msgstr "%s n'existe pas" -#: ../IkiWiki/Plugin/remove.pm:39 +#: ../IkiWiki/Plugin/remove.pm:38 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s n'est pas dans srcdir et ne peut donc pas être supprimé" -#: ../IkiWiki/Plugin/remove.pm:42 -#: ../IkiWiki/Plugin/rename.pm:44 +#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 #, perl-format msgid "%s is not a file" msgstr "%s n'est pas un fichier" -#: ../IkiWiki/Plugin/remove.pm:109 +#: ../IkiWiki/Plugin/remove.pm:113 #, perl-format msgid "confirm removal of %s" msgstr "Suppression de %s confirmée" -#: ../IkiWiki/Plugin/remove.pm:145 +#: ../IkiWiki/Plugin/remove.pm:150 msgid "Please select the attachments to remove." msgstr "Veuillez choisir la pièce jointe à supprimer" -#: ../IkiWiki/Plugin/remove.pm:185 +#: ../IkiWiki/Plugin/remove.pm:190 msgid "removed" msgstr "supprimé" -#: ../IkiWiki/Plugin/rename.pm:41 +#: ../IkiWiki/Plugin/rename.pm:42 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "%s n'est pas dans srcdir. Impossible de le renommer" -#: ../IkiWiki/Plugin/rename.pm:56 +#: ../IkiWiki/Plugin/rename.pm:62 msgid "no change to the file name was specified" msgstr "Aucun changement dans le nom du fichier n'a été spécifié" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:68 #, perl-format msgid "illegal name" msgstr "appellation non autorisé" -#: ../IkiWiki/Plugin/rename.pm:67 +#: ../IkiWiki/Plugin/rename.pm:73 #, perl-format msgid "%s already exists" msgstr "%s existe déjà" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:79 #, perl-format msgid "%s already exists on disk" msgstr "%s existe déjà sur le disque" -#: ../IkiWiki/Plugin/rename.pm:95 +#: ../IkiWiki/Plugin/rename.pm:101 #, perl-format msgid "rename %s" msgstr "%s renommé" -#: ../IkiWiki/Plugin/rename.pm:206 +#: ../IkiWiki/Plugin/rename.pm:138 +msgid "Also rename SubPages and attachments" +msgstr "" + +#: ../IkiWiki/Plugin/rename.pm:224 msgid "Only one attachment can be renamed at a time." msgstr "Seule une pièce jointe peut être renommée à la fois" -#: ../IkiWiki/Plugin/rename.pm:209 +#: ../IkiWiki/Plugin/rename.pm:227 msgid "Please select the attachment to rename." msgstr "Veuillez sélectionner la pièce jointe à renommer" -#: ../IkiWiki/Plugin/rename.pm:277 +#: ../IkiWiki/Plugin/rename.pm:338 #, perl-format msgid "rename %s to %s" msgstr "renomme %s en %s" -#: ../IkiWiki/Plugin/rename.pm:306 +#: ../IkiWiki/Plugin/rename.pm:490 #, perl-format msgid "update for rename of %s to %s" msgstr "du nouveau nom de %s en %s" @@ -630,7 +646,8 @@ msgstr "recherche" #: ../IkiWiki/Plugin/shortcut.pm:27 msgid "shortcut plugin will not work without a shortcuts.mdwn" -msgstr "Le greffon de raccourci (« shortcut ») ne fonctionnera pas sans shortcuts.mdwn" +msgstr "" +"Le greffon de raccourci (« shortcut ») ne fonctionnera pas sans shortcuts.mdwn" #: ../IkiWiki/Plugin/shortcut.pm:36 msgid "missing name or url parameter" @@ -692,11 +709,11 @@ msgstr "Format de données inconnu" msgid "empty data" msgstr "Données vides" -#: ../IkiWiki/Plugin/table.pm:101 +#: ../IkiWiki/Plugin/table.pm:100 msgid "Direct data download" msgstr "Téléchargement direct des données" -#: ../IkiWiki/Plugin/table.pm:135 +#: ../IkiWiki/Plugin/table.pm:134 #, perl-format msgid "parse fail at line %d: %s" msgstr "Erreur d'analyse à la ligne %d : %s" @@ -752,60 +769,78 @@ msgid "plugins" msgstr "modules complémentaires" #: ../IkiWiki/Plugin/websetup.pm:395 -msgid "The configuration changes shown below require a wiki rebuild to take effect." -msgstr "les changements de configuration ci dessous nécessitent une recompilation du wiki pour prendre effet" +msgid "" +"The configuration changes shown below require a wiki rebuild to take effect." +msgstr "" +"les changements de configuration ci dessous nécessitent une recompilation du " +"wiki pour prendre effet" #: ../IkiWiki/Plugin/websetup.pm:399 -msgid "For the configuration changes shown below to fully take effect, you may need to rebuild the wiki." -msgstr "Pour que les changements de configuration ci dessous prennent effet vous devez recompiler le wiki" +msgid "" +"For the configuration changes shown below to fully take effect, you may need " +"to rebuild the wiki." +msgstr "" +"Pour que les changements de configuration ci dessous prennent effet vous " +"devez recompiler le wiki" #: ../IkiWiki/Plugin/websetup.pm:433 #, perl-format msgid "

Error: %s exited nonzero (%s)" msgstr "

Erreur: %s a quitté nonzero (%s)" -#: ../IkiWiki/Render.pm:276 -#: ../IkiWiki/Render.pm:297 +#: ../IkiWiki/Render.pm:253 +#, perl-format +msgid "" +"symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " +"allow this" +msgstr "" + +#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 #, perl-format msgid "skipping bad filename %s" msgstr "Omission du fichier au nom incorrect %s" -#: ../IkiWiki/Render.pm:355 +#: ../IkiWiki/Render.pm:284 +#, perl-format +msgid "%s has multiple possible source pages" +msgstr "" + +#: ../IkiWiki/Render.pm:360 #, perl-format msgid "removing old page %s" msgstr "Suppression de l'ancienne page %s" -#: ../IkiWiki/Render.pm:395 +#: ../IkiWiki/Render.pm:400 #, perl-format msgid "scanning %s" msgstr "Parcours de %s" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:405 #, perl-format msgid "rendering %s" msgstr "Affichage de %s" -#: ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "rendering %s, which links to %s" msgstr "Affichage de %s, qui est lié à %s" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, perl-format msgid "rendering %s, which depends on %s" msgstr "Affichage de %s, qui dépend de %s" -#: ../IkiWiki/Render.pm:481 +#: ../IkiWiki/Render.pm:486 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "Affichage de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:493 +#: ../IkiWiki/Render.pm:498 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "Suppression de %s, qui n'est plus affiché par %s" -#: ../IkiWiki/Render.pm:517 +#: ../IkiWiki/Render.pm:522 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki : impossible d'afficher %s" @@ -819,7 +854,9 @@ msgstr "Lecture impossible de %s : %s" #: ../IkiWiki/Setup/Automator.pm:33 msgid "you must enter a wikiname (that contains alphanumerics)" -msgstr "Vous devez spécifier un nom de wiki (contenant des caractères alphanumériques)" +msgstr "" +"Vous devez spécifier un nom de wiki (contenant des caractères " +"alphanumériques)" #: ../IkiWiki/Setup/Automator.pm:67 #, perl-format @@ -837,7 +874,8 @@ msgstr "%s ne semble pas être exécutable" #: ../IkiWiki/Wrapper.pm:20 msgid "cannot create a wrapper that uses a setup file" -msgstr "Impossible de créer un fichier CGI utilisant un fichier de configuration" +msgstr "" +"Impossible de créer un fichier CGI utilisant un fichier de configuration" #: ../IkiWiki/Wrapper.pm:24 msgid "wrapper filename not specified" @@ -866,36 +904,49 @@ msgstr "%s a été créé avec succès" msgid "usage: ikiwiki [options] source dest" msgstr "Syntaxe : ikiwiki [options] source destination" -#: ../ikiwiki.in:83 +#: ../ikiwiki.in:14 +msgid " ikiwiki --setup configfile" +msgstr "" + +#: ../ikiwiki.in:90 msgid "usage: --set var=value" msgstr "Syntaxe : -- set var=valeur" -#: ../ikiwiki.in:129 +#: ../ikiwiki.in:137 msgid "generating wrappers.." msgstr "Création des fichiers CGI..." -#: ../ikiwiki.in:181 +#: ../ikiwiki.in:188 msgid "rebuilding wiki.." msgstr "Reconstruction du wiki..." -#: ../ikiwiki.in:184 +#: ../ikiwiki.in:191 msgid "refreshing wiki.." msgstr "Rafraîchissement du wiki..." -#: ../IkiWiki.pm:434 +#: ../IkiWiki.pm:458 msgid "Must specify url to wiki with --url when using --cgi" -msgstr "Vous devez indiquer une URL vers le wiki par --url lors de l'utilisation de --cgi" +msgstr "" +"Vous devez indiquer une URL vers le wiki par --url lors de l'utilisation de " +"--cgi" -#: ../IkiWiki.pm:478 +#: ../IkiWiki.pm:504 msgid "cannot use multiple rcs plugins" -msgstr "impossible d'utiliser plusieurs modules complémentaires dans le système de contrôle des versions" +msgstr "" +"impossible d'utiliser plusieurs modules complémentaires dans le système de " +"contrôle des versions" -#: ../IkiWiki.pm:1100 +#: ../IkiWiki.pm:533 +#, perl-format +msgid "failed to load external plugin needed for %s plugin: %s" +msgstr "" + +#: ../IkiWiki.pm:1149 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "une boucle de pré traitement a été detectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:1588 +#: ../IkiWiki.pm:1658 msgid "yes" msgstr "oui" @@ -921,12 +972,15 @@ msgstr "Nom de domaine du serveur HTTP?" #~ msgid "Your password has been emailed to you." #~ msgstr "Votre mot de passe vous a été envoyé par courriel." + #~ msgid "polygen failed" #~ msgstr "Échec du lancement de polygen" + #~ msgid "cleaning hyperestraier search index" #~ msgstr "Nettoyage de l'index de recherche de hyperestraier" + #~ msgid "updating hyperestraier search index" #~ msgstr "Mise à jour de l'index de recherche de hyperestraier" + #~ msgid "(not toggleable in preview mode)" #~ msgstr "(non permutable en mode prévisualisation)" - diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 6f8136413..dbbf986d5 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: 2008-09-30 15:31-0400\n" +"POT-Creation-Date: 2008-10-05 19:11-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -48,7 +48,7 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1143 +#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1166 msgid "Error" msgstr "" @@ -159,11 +159,11 @@ msgstr "" msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:188 +#: ../IkiWiki/Plugin/attachment.pm:189 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:230 +#: ../IkiWiki/Plugin/attachment.pm:231 msgid "attachment upload" msgstr "" @@ -172,7 +172,7 @@ msgid "automatic index generation" msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:261 -#: ../IkiWiki/Plugin/inline.pm:323 ../IkiWiki/Plugin/opendiscussion.pm:26 +#: ../IkiWiki/Plugin/inline.pm:326 ../IkiWiki/Plugin/opendiscussion.pm:26 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79 #: ../IkiWiki/Render.pm:149 msgid "discussion" @@ -300,20 +300,20 @@ msgstr "" msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:282 +#: ../IkiWiki/Plugin/inline.pm:285 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:298 +#: ../IkiWiki/Plugin/inline.pm:301 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:331 ../IkiWiki/Render.pm:83 +#: ../IkiWiki/Plugin/inline.pm:334 ../IkiWiki/Render.pm:83 msgid "Discussion" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:568 +#: ../IkiWiki/Plugin/inline.pm:571 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -554,16 +554,16 @@ msgstr "" msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:112 +#: ../IkiWiki/Plugin/remove.pm:113 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:148 +#: ../IkiWiki/Plugin/remove.pm:150 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:188 +#: ../IkiWiki/Plugin/remove.pm:190 msgid "removed" msgstr "" @@ -600,20 +600,20 @@ msgstr "" msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:223 +#: ../IkiWiki/Plugin/rename.pm:224 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:226 +#: ../IkiWiki/Plugin/rename.pm:227 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:332 +#: ../IkiWiki/Plugin/rename.pm:338 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:484 +#: ../IkiWiki/Plugin/rename.pm:490 #, perl-format msgid "update for rename of %s to %s" msgstr "" @@ -904,25 +904,25 @@ msgstr "" msgid "refreshing wiki.." msgstr "" -#: ../IkiWiki.pm:451 +#: ../IkiWiki.pm:458 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:497 +#: ../IkiWiki.pm:504 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:526 +#: ../IkiWiki.pm:533 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1126 +#: ../IkiWiki.pm:1149 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1635 +#: ../IkiWiki.pm:1658 msgid "yes" msgstr "" -- cgit v1.2.3 From fea76a11bc3673bc6fb523cffd8c325982bf44f7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 6 Oct 2008 16:10:47 -0400 Subject: remove: Avoid $_ breakage. (Stupid, stupid perl.) This avoids another one of those $_ scoping issues where a deep call to a function that changes $_ clobbers the array that is being looped over. --- IkiWiki/Plugin/remove.pm | 4 +++- debian/changelog | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm index cf95026c8..68bf9d1ee 100644 --- a/IkiWiki/Plugin/remove.pm +++ b/IkiWiki/Plugin/remove.pm @@ -98,7 +98,9 @@ sub removal_confirm ($$@) { #{{{ my $attachment=shift; my @pages=@_; - check_canremove($_, $q, $session) foreach @pages; + foreach my $page (@pages) { + check_canremove($page, $q, $session); + } # Save current form state to allow returning to it later # without losing any edits. diff --git a/debian/changelog b/debian/changelog index fc1eb4819..2b51dd2d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (2.67) UNRELEASED; urgency=low + + * remove: Avoid $_ breakage. (Stupid, stupid perl.) + + -- Joey Hess Mon, 06 Oct 2008 16:07:50 -0400 + ikiwiki (2.66) unstable; urgency=low * recentchanges: Fix redirects to non-page files. -- cgit v1.2.3 From 781760bfeec2ee931184c4795e262589b35a0da9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Oct 2008 11:51:52 -0400 Subject: Updated Spanish translation from Victor Moral. --- debian/changelog | 1 + po/es.po | 182 ++++++++++++++++++++++++++----------------------------- 2 files changed, 86 insertions(+), 97 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2b51dd2d6..a7b4cbb00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ikiwiki (2.67) UNRELEASED; urgency=low * remove: Avoid $_ breakage. (Stupid, stupid perl.) + * Updated Spanish translation from Victor Moral. -- Joey Hess Mon, 06 Oct 2008 16:07:50 -0400 diff --git a/po/es.po b/po/es.po index e0a355fc0..34a4d3669 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-09-29 17:12-0400\n" -"PO-Revision-Date: 2008-03-06 11:07+0100\n" +"PO-Revision-Date: 2008-10-07 12:44+0200\n" "Last-Translator: Víctor Moral \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -26,7 +26,7 @@ msgstr "" #: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:350 msgid "Your login session has expired." -msgstr "" +msgstr "Su registro en el sistema ha expirado." #: ../IkiWiki/CGI.pm:184 msgid "Login" @@ -54,11 +54,11 @@ msgstr "Error" #: ../IkiWiki/Plugin/aggregate.pm:80 msgid "Aggregation triggered via web." -msgstr "" +msgstr "Contenido añadido activado vía web." #: ../IkiWiki/Plugin/aggregate.pm:89 msgid "Nothing to do right now, all feeds are up-to-date!" -msgstr "" +msgstr "¡ No hay nada que hacer, todas las fuentes de noticias están actualizadas !" #: ../IkiWiki/Plugin/aggregate.pm:216 #, perl-format @@ -127,7 +127,7 @@ msgstr "creando nueva página %s" #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." -msgstr "" +msgstr "borrando el directorio.." #: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 msgid "done" @@ -136,42 +136,40 @@ msgstr "completado" #: ../IkiWiki/Plugin/amazon_s3.pm:97 #, perl-format msgid "Must specify %s" -msgstr "" +msgstr "Debe especificar %s" #: ../IkiWiki/Plugin/amazon_s3.pm:136 msgid "Failed to create bucket in S3: " -msgstr "" +msgstr "Creación de directorio en S3 fallida: " #: ../IkiWiki/Plugin/amazon_s3.pm:221 -#, fuzzy msgid "Failed to save file to S3: " -msgstr "No he podido enviar el mensaje de correo electrónico" +msgstr "No puedo guardar el archivo en S3: " #: ../IkiWiki/Plugin/amazon_s3.pm:243 -#, fuzzy msgid "Failed to delete file from S3: " -msgstr "no he podido crear la imagen desde el código" +msgstr "No puedo borrar archivo en S3: " #: ../IkiWiki/Plugin/attachment.pm:48 #, perl-format msgid "there is already a page named %s" -msgstr "" +msgstr "ya existe una página de nombre %s" #: ../IkiWiki/Plugin/attachment.pm:81 msgid "prohibited by allowed_attachments" -msgstr "" +msgstr "prohibido por la claúsula allowed_attachments" #: ../IkiWiki/Plugin/attachment.pm:188 msgid "bad attachment filename" -msgstr "" +msgstr "nombre de archivo adjunto erróneo" #: ../IkiWiki/Plugin/attachment.pm:230 msgid "attachment upload" -msgstr "" +msgstr "enviado el adjunto" #: ../IkiWiki/Plugin/autoindex.pm:103 msgid "automatic index generation" -msgstr "" +msgstr "creación de índice automática" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:261 #: ../IkiWiki/Plugin/inline.pm:323 ../IkiWiki/Plugin/opendiscussion.pm:26 @@ -198,17 +196,17 @@ msgstr "el parámetro %s es obligatorio" #: ../IkiWiki/Plugin/cutpaste.pm:66 msgid "no text was copied in this page" -msgstr "" +msgstr "no se ha copiado ningún texto en esta página" #: ../IkiWiki/Plugin/cutpaste.pm:69 #, perl-format msgid "no text was copied in this page with id %s" -msgstr "" +msgstr "no se ha copiado ningún texto con el identificador %s en esta pagina" #: ../IkiWiki/Plugin/editpage.pm:40 -#, fuzzy, perl-format +#, perl-format msgid "removing old preview %s" -msgstr "eliminando la antigua página %s" +msgstr "eliminando la antigua previsualización %s" #: ../IkiWiki/Plugin/editpage.pm:141 #, perl-format @@ -262,9 +260,8 @@ msgid "prog not a valid graphviz program" msgstr "prog no es un programa graphviz válido " #: ../IkiWiki/Plugin/img.pm:62 -#, fuzzy msgid "Image::Magick is not installed" -msgstr "El complemento polygen no ha sido instalado" +msgstr "El complemento Image::Magick no ha sido instalado" #: ../IkiWiki/Plugin/img.pm:69 #, perl-format @@ -294,14 +291,12 @@ msgstr "" "--atom" #: ../IkiWiki/Plugin/inline.pm:139 -#, fuzzy msgid "page editing not allowed" -msgstr "ciclo de redirección no permitido" +msgstr "no está permitida la modificación de páginas" #: ../IkiWiki/Plugin/inline.pm:156 -#, fuzzy msgid "missing pages parameter" -msgstr "falta el parámetro %s" +msgstr "falta el parámetro pages" #: ../IkiWiki/Plugin/inline.pm:204 #, perl-format @@ -330,13 +325,12 @@ msgid "failed to run dot" msgstr "no he podido ejecutar el programa dot" #: ../IkiWiki/Plugin/lockedit.pm:46 ../IkiWiki/Plugin/lockedit.pm:60 -#, fuzzy, perl-format msgid "%s is locked and cannot be edited" -msgstr "La página %s está bloqueada por %s y no puede modificarse" +msgstr "La página %s está bloqueada y no puede modificarse" #: ../IkiWiki/Plugin/mdwn.pm:44 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" -msgstr "" +msgstr "el modo multimarkdown está activo, pero no está instalado Text::MultiMarkdown" #: ../IkiWiki/Plugin/mdwn.pm:67 #, perl-format @@ -399,7 +393,7 @@ msgstr "Error creando la cuenta de usuario." #: ../IkiWiki/Plugin/passwordauth.pm:257 msgid "No email address, so cannot email password reset instructions." -msgstr "" +msgstr "No tengo dirección de correo electrónica, así que no puedo enviar instrucciones para reiniciar la contraseña" #: ../IkiWiki/Plugin/passwordauth.pm:291 msgid "Failed to send mail" @@ -407,38 +401,37 @@ msgstr "No he podido enviar el mensaje de correo electrónico" #: ../IkiWiki/Plugin/passwordauth.pm:293 msgid "You have been mailed password reset instructions." -msgstr "" +msgstr "Las instrucciones para reinicar la contraseña se le han enviado por correo electrónico" #: ../IkiWiki/Plugin/passwordauth.pm:328 msgid "incorrect password reset url" -msgstr "" +msgstr "el url para reiniciar la contraseña es incorrecto" #: ../IkiWiki/Plugin/passwordauth.pm:331 msgid "password reset denied" -msgstr "" +msgstr "reinicio de contraseña denegado" #: ../IkiWiki/Plugin/pingee.pm:30 msgid "Ping received." -msgstr "" +msgstr "Recibida una señal ping." #: ../IkiWiki/Plugin/pinger.pm:53 msgid "requires 'from' and 'to' parameters" -msgstr "" +msgstr "los parámetros 'from' y 'to' son obligatorios" #: ../IkiWiki/Plugin/pinger.pm:58 -#, fuzzy, perl-format +#, perl-format msgid "Will ping %s" -msgstr "modificando página %s" +msgstr "Informaremos a %s" #: ../IkiWiki/Plugin/pinger.pm:61 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" -msgstr "" +msgstr "Ignorando directiva 'ping' para el wiki %s (este wiki es %s)" #: ../IkiWiki/Plugin/pinger.pm:77 -#, fuzzy msgid "LWP not found, not pinging" -msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna" +msgstr "No he encontrado el componente LWP, no envío señal alguna" #: ../IkiWiki/Plugin/poll.pm:69 msgid "vote" @@ -453,9 +446,8 @@ msgid "polygen not installed" msgstr "El complemento polygen no ha sido instalado" #: ../IkiWiki/Plugin/polygen.pm:60 -#, fuzzy msgid "command failed" -msgstr "el programa fortune ha fallado" +msgstr "la ejecución del programa ha fallado" #: ../IkiWiki/Plugin/postsparkline.pm:41 msgid "missing formula" @@ -532,11 +524,11 @@ msgstr "el %A a media tarde" #: ../IkiWiki/Plugin/progress.pm:34 #, perl-format msgid "illegal percent value %s" -msgstr "" +msgstr "%s es un valor erróneo para un porcentaje" #: ../IkiWiki/Plugin/progress.pm:59 msgid "need either `percent` or `totalpages` and `donepages` parameters" -msgstr "" +msgstr "son necesarios los parámetros 'donepages' y 'percent' ó 'totalpages'" #: ../IkiWiki/Plugin/recentchanges.pm:100 msgid "missing page" @@ -549,87 +541,86 @@ msgstr "No existe la página %s." #: ../IkiWiki/Plugin/recentchangesdiff.pm:36 msgid "(Diff truncated)" -msgstr "" +msgstr "(Lista de diferencias truncada)" #: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 -#, fuzzy, perl-format +#, perl-format msgid "%s does not exist" msgstr "No existe la página %s." #: ../IkiWiki/Plugin/remove.pm:38 -#, fuzzy, perl-format +#, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" -msgstr "La página %s está bloqueada por %s y no puede modificarse" +msgstr "%s no está en el directorio fuente por lo que no puede ser borrada" #: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 -#, fuzzy, perl-format +#, perl-format msgid "%s is not a file" -msgstr "la página %s no es modificable" +msgstr "%s no es un archivo" #: ../IkiWiki/Plugin/remove.pm:112 #, perl-format msgid "confirm removal of %s" -msgstr "" +msgstr "confirme el borrado de %s" #: ../IkiWiki/Plugin/remove.pm:148 msgid "Please select the attachments to remove." -msgstr "" +msgstr "Por favor seleccione los adjuntos que serán borrados." #: ../IkiWiki/Plugin/remove.pm:188 msgid "removed" -msgstr "" +msgstr "borrado" #: ../IkiWiki/Plugin/rename.pm:42 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" -msgstr "" +msgstr "%s no está en el directorio fuente por lo que no puede ser renombrado" #: ../IkiWiki/Plugin/rename.pm:62 -#, fuzzy msgid "no change to the file name was specified" -msgstr "el programa envoltorio no ha sido especificado" +msgstr "no se ha indicado cambio alguno en el nombre del archivo" #: ../IkiWiki/Plugin/rename.pm:68 #, perl-format msgid "illegal name" -msgstr "" +msgstr "nombre no válido" #: ../IkiWiki/Plugin/rename.pm:73 #, perl-format msgid "%s already exists" -msgstr "" +msgstr "%s ya existe" #: ../IkiWiki/Plugin/rename.pm:79 #, perl-format msgid "%s already exists on disk" -msgstr "" +msgstr "%s ya existe en el disco" #: ../IkiWiki/Plugin/rename.pm:101 -#, fuzzy, perl-format +#, perl-format msgid "rename %s" -msgstr "convirtiendo %s" +msgstr "cambiando de nombre %s" #: ../IkiWiki/Plugin/rename.pm:138 msgid "Also rename SubPages and attachments" -msgstr "" +msgstr "También cambia de nombre las subpáginas y los adjuntos" #: ../IkiWiki/Plugin/rename.pm:223 msgid "Only one attachment can be renamed at a time." -msgstr "" +msgstr "Únicamente un adjunto puede ser renombrado a la vez." #: ../IkiWiki/Plugin/rename.pm:226 msgid "Please select the attachment to rename." -msgstr "" +msgstr "Por favor, seleccione el adjunto al que cambiar el nombre." #: ../IkiWiki/Plugin/rename.pm:332 #, perl-format msgid "rename %s to %s" -msgstr "" +msgstr "%s cambia de nombre a %s" #: ../IkiWiki/Plugin/rename.pm:484 -#, fuzzy, perl-format +#, perl-format msgid "update for rename of %s to %s" -msgstr "actualizado el wiki %s y la página %s por el usuario %s" +msgstr "actualizado el cambio de nombre de %s a %s" #: ../IkiWiki/Plugin/search.pm:36 #, perl-format @@ -639,11 +630,11 @@ msgstr "Es obligatorio indicar %s cuando se utiliza el complemento de búsqueda" #: ../IkiWiki/Plugin/search.pm:182 #, perl-format msgid "need Digest::SHA1 to index %s" -msgstr "" +msgstr "se necesita la instalación de Digest::SHA1 para indexar %s" #: ../IkiWiki/Plugin/search.pm:217 msgid "search" -msgstr "" +msgstr "buscar" #: ../IkiWiki/Plugin/shortcut.pm:27 msgid "shortcut plugin will not work without a shortcuts.mdwn" @@ -745,52 +736,51 @@ msgstr "no he podido crear la imagen desde el código" #: ../IkiWiki/Plugin/websetup.pm:89 msgid "plugin" -msgstr "" +msgstr "complemento" #: ../IkiWiki/Plugin/websetup.pm:108 #, perl-format msgid "enable %s?" -msgstr "" +msgstr "¿ activar %s ?" #: ../IkiWiki/Plugin/websetup.pm:236 msgid "you are not logged in as an admin" -msgstr "" +msgstr "No está registrado como un administrador" #: ../IkiWiki/Plugin/websetup.pm:240 msgid "setup file for this wiki is not known" -msgstr "" +msgstr "El archivo de configuración para este wiki es desconocido" #: ../IkiWiki/Plugin/websetup.pm:256 -#, fuzzy msgid "main" -msgstr "Administración" +msgstr "principal" #: ../IkiWiki/Plugin/websetup.pm:257 msgid "plugins" -msgstr "" +msgstr "complementos" #: ../IkiWiki/Plugin/websetup.pm:395 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." -msgstr "" +msgstr "Los cambios en la configuración que se muestran más abajo precisan una reconstrucción del wiki para tener efecto." #: ../IkiWiki/Plugin/websetup.pm:399 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." -msgstr "" +msgstr "Para que los cambios en la configuración mostrados más abajo tengan efecto, es posible que necesite reconstruir el wiki." #: ../IkiWiki/Plugin/websetup.pm:433 #, perl-format msgid "

Error: %s exited nonzero (%s)" -msgstr "" +msgstr "

Error: %s finaliza con código distinto de cero (%s)" #: ../IkiWiki/Render.pm:253 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" -msgstr "" +msgstr "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use la directiva allow_symlinks_before_srcdir para permitir la acción" #: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 #, perl-format @@ -800,7 +790,7 @@ msgstr "ignorando el archivo %s porque su nombre no es correcto" #: ../IkiWiki/Render.pm:284 #, perl-format msgid "%s has multiple possible source pages" -msgstr "" +msgstr "%s tiene mútiples páginas fuente posibles" #: ../IkiWiki/Render.pm:360 #, perl-format @@ -853,16 +843,16 @@ msgstr "no puedo leer el archivo %s: %s" #: ../IkiWiki/Setup/Automator.pm:33 msgid "you must enter a wikiname (that contains alphanumerics)" -msgstr "" +msgstr "debe escribir un nombre wiki (que contiene caracteres alfanuméricos)" #: ../IkiWiki/Setup/Automator.pm:67 #, perl-format msgid "unsupported revision control system %s" -msgstr "" +msgstr "el sistema de control de versiones %s no está soportado" #: ../IkiWiki/Setup/Automator.pm:83 msgid "failed to set up the repository with ikiwiki-makerepo" -msgstr "" +msgstr "no he podido crear un repositorio con el programa ikiwiki-makerepo" #: ../IkiWiki/Wrapper.pm:16 #, perl-format @@ -903,7 +893,7 @@ msgstr "uso: ikiwiki [opciones] origen destino" #: ../ikiwiki.in:14 msgid " ikiwiki --setup configfile" -msgstr "" +msgstr " ikiwiki --setup archivo_de_configuración" #: ../ikiwiki.in:90 msgid "usage: --set var=value" @@ -929,43 +919,41 @@ msgstr "" #: ../IkiWiki.pm:504 msgid "cannot use multiple rcs plugins" -msgstr "" +msgstr "no puedo emplear varios complementos rcs" #: ../IkiWiki.pm:533 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" -msgstr "" +msgstr "no he podido cargar el complemento externo %s necesario para %s" #: ../IkiWiki.pm:1136 -#, fuzzy, perl-format +#, perl-format msgid "preprocessing loop detected on %s at depth %i" -msgstr "" -"se ha detectado un bucle de preprocesado %s en la página %s en la vuelta " -"número %i" +msgstr "se ha detectado en la página %s un bucle de preprocesado en la iteración número %i" #: ../IkiWiki.pm:1645 msgid "yes" -msgstr "" +msgstr "si" #: ../auto.setup:16 msgid "What will the wiki be named?" -msgstr "" +msgstr "¿ Qué nombre tendrá el wiki ?" #: ../auto.setup:16 msgid "wiki" -msgstr "" +msgstr "wiki" #: ../auto.setup:18 msgid "What revision control system to use?" -msgstr "" +msgstr "¿ Qué sistema de control de versiones empleará ?" #: ../auto.setup:20 msgid "What wiki user (or openid) will be wiki admin?" -msgstr "" +msgstr "¿ Qué usuario del wiki (ó identificador openid) será el administrador del wiki ? " #: ../auto.setup:23 msgid "What is the domain name of the web server?" -msgstr "" +msgstr "¿ Cuál es el dominio para el servidor web ?" #~ msgid "Your password has been emailed to you." #~ msgstr "Se le ha enviado su contraseña por correo electrónico." -- cgit v1.2.3 From d3ca495e61e0e9d66095b1aba2fd1995e564e841 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 8 Oct 2008 17:47:38 -0400 Subject: lockedit: Support specifying which users (and IP addresses) a page is locked for. This supports most of the ACL type things users have been wanting to be done. Closes: #443346 (It does not control who can read a page, but that's out of scope for ikiwiki.) --- IkiWiki.pm | 57 +++++++++++++++++++++++++++ IkiWiki/Plugin/attachment.pm | 59 ---------------------------- IkiWiki/Plugin/lockedit.pm | 10 ++++- debian/changelog | 4 ++ doc/ikiwiki/pagespec.mdwn | 10 ++++- doc/ikiwiki/pagespec/attachment.mdwn | 45 ++++++---------------- doc/plugins/lockedit.mdwn | 6 ++- doc/todo/ACL.mdwn | 3 +- po/es.po | 75 ++++++++++++++++++++++-------------- po/ikiwiki.pot | 12 +++--- 10 files changed, 147 insertions(+), 134 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index 82370f430..633c51381 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1919,4 +1919,61 @@ sub match_creation_year ($$;@) { #{{{ } } #}}} +sub match_user ($$;@) { #{{{ + shift; + my $user=shift; + my %params=@_; + + if (! exists $params{user}) { + return IkiWiki::FailReason->new("no user specified"); + } + + if (defined $params{user} && lc $params{user} eq lc $user) { + return IkiWiki::SuccessReason->new("user is $user"); + } + elsif (! defined $params{user}) { + return IkiWiki::FailReason->new("not logged in"); + } + else { + return IkiWiki::FailReason->new("user is $params{user}, not $user"); + } +} #}}} + +sub match_admin ($$;@) { #{{{ + shift; + shift; + my %params=@_; + + if (! exists $params{user}) { + return IkiWiki::FailReason->new("no user specified"); + } + + if (defined $params{user} && IkiWiki::is_admin($params{user})) { + return IkiWiki::SuccessReason->new("user is an admin"); + } + elsif (! defined $params{user}) { + return IkiWiki::FailReason->new("not logged in"); + } + else { + return IkiWiki::FailReason->new("user is not an admin"); + } +} #}}} + +sub match_ip ($$;@) { #{{{ + shift; + my $ip=shift; + my %params=@_; + + if (! exists $params{ip}) { + return IkiWiki::FailReason->new("no IP specified"); + } + + if (defined $params{ip} && lc $params{ip} eq lc $ip) { + return IkiWiki::SuccessReason->new("IP is $ip"); + } + else { + return IkiWiki::FailReason->new("IP is $params{ip}, not $ip"); + } +} #}}} + 1 diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm index 2d1fe51cf..dcac3e820 100644 --- a/IkiWiki/Plugin/attachment.pm +++ b/IkiWiki/Plugin/attachment.pm @@ -289,63 +289,4 @@ sub attachment_list ($) { #{{{ return sort { $b->{mtime_raw} <=> $a->{mtime_raw} || $a->{link} cmp $b->{link} } @ret; } #}}} -package IkiWiki::PageSpec; - -sub match_user ($$;@) { #{{{ - shift; - my $user=shift; - my %params=@_; - - if (! exists $params{user}) { - return IkiWiki::FailReason->new("no user specified"); - } - - if (defined $params{user} && lc $params{user} eq lc $user) { - return IkiWiki::SuccessReason->new("user is $user"); - } - elsif (! defined $params{user}) { - return IkiWiki::FailReason->new("not logged in"); - } - else { - return IkiWiki::FailReason->new("user is $params{user}, not $user"); - } -} #}}} - -sub match_admin ($$;@) { #{{{ - shift; - shift; - my %params=@_; - - if (! exists $params{user}) { - return IkiWiki::FailReason->new("no user specified"); - } - - if (defined $params{user} && IkiWiki::is_admin($params{user})) { - return IkiWiki::SuccessReason->new("user is an admin"); - } - elsif (! defined $params{user}) { - return IkiWiki::FailReason->new("not logged in"); - } - else { - return IkiWiki::FailReason->new("user is not an admin"); - } -} #}}} - -sub match_ip ($$;@) { #{{{ - shift; - my $ip=shift; - my %params=@_; - - if (! exists $params{ip}) { - return IkiWiki::FailReason->new("no IP specified"); - } - - if (defined $params{ip} && lc $params{ip} eq lc $ip) { - return IkiWiki::SuccessReason->new("IP is $ip"); - } - else { - return IkiWiki::FailReason->new("IP is $params{ip}, not $ip"); - } -} #}}} - 1 diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm index 7462de41c..f6cac6cdd 100644 --- a/IkiWiki/Plugin/lockedit.pm +++ b/IkiWiki/Plugin/lockedit.pm @@ -37,7 +37,10 @@ sub canedit ($$) { #{{{ return undef if defined $user && IkiWiki::is_admin($user); if (defined $config{locked_pages} && length $config{locked_pages} && - pagespec_match($page, $config{locked_pages})) { + pagespec_match($page, $config{locked_pages}, + user => $session->param("name"), + ip => $ENV{REMOTE_ADDR}, + )) { if (! defined $user || ! IkiWiki::userinfo_get($session->param("name"), "regdate")) { return sub { IkiWiki::needsignin($cgi, $session) }; @@ -51,7 +54,10 @@ sub canedit ($$) { #{{{ # XXX deprecated, should be removed eventually foreach my $admin (@{$config{adminuser}}) { - if (pagespec_match($page, IkiWiki::userinfo_get($admin, "locked_pages"))) { + if (pagespec_match($page, IkiWiki::userinfo_get($admin, "locked_pages"), + user => $session->param("name"), + ip => $ENV{REMOTE_ADDR}, + )) { if (! defined $user || ! IkiWiki::userinfo_get($session->param("name"), "regdate")) { return sub { IkiWiki::needsignin($cgi, $session) }; diff --git a/debian/changelog b/debian/changelog index a7b4cbb00..9947c8a58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ ikiwiki (2.67) UNRELEASED; urgency=low * remove: Avoid $_ breakage. (Stupid, stupid perl.) * Updated Spanish translation from Victor Moral. + * lockedit: Support specifying which users (and IP addresses) a page + is locked for. This supports most of the ACL type things users have been + wanting to be done. Closes: #443346 (It does not control who can read a + page, but that's out of scope for ikiwiki.) -- Joey Hess Mon, 06 Oct 2008 16:07:50 -0400 diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn index 156e3f6ca..c78666c40 100644 --- a/doc/ikiwiki/pagespec.mdwn +++ b/doc/ikiwiki/pagespec.mdwn @@ -22,8 +22,7 @@ match all pages except for Discussion pages and the SandBox: * and !SandBox and !*/Discussion -Some more elaborate limits can be added to what matches using any of these -functions: +Some more elaborate limits can be added to what matches using these functions: * "`link(page)`" - match only pages that link to a given page (or glob) * "`backlink(page)`" - match only pages that a given page links to @@ -41,6 +40,13 @@ functions: * "`title(glob)`", "`author(glob)`", "`authorurl(glob)`", "`license(glob)`", "`copyright(glob)`" - match pages that have the given metadata, matching the specified glob. +* "`user(username)`" - tests whether a modification is being made by a + user with the specified username. If openid is enabled, an openid can also + be put here. +* "`admin()`" - tests whether a modification is being made by one of the + wiki admins. +* "`ip(address)`" - tests whether a modification is being made from the + specified IP address. 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/ikiwiki/pagespec/attachment.mdwn b/doc/ikiwiki/pagespec/attachment.mdwn index 1287fc0a4..2d33db748 100644 --- a/doc/ikiwiki/pagespec/attachment.mdwn +++ b/doc/ikiwiki/pagespec/attachment.mdwn @@ -16,45 +16,22 @@ check all attachments for virii, something like this could be used: The regular [[ikiwiki/PageSpec]] syntax is expanded with the following additional tests: -* maxsize(size) - - Tests whether the attachment is no larger than the specified size. - The size defaults to being in bytes, but "kb", "mb", "gb" etc can be - used to specify the units. +* "`maxsize(size)`" - Tests whether the attachment is no larger than the + specified size. The size defaults to being in bytes, but "kb", "mb", "gb" + etc can be used to specify the units. -* minsize(size) - - Tests whether the attachment is no smaller than the specified size. - -* ispage() +* "`minsize(size)`" - Tests whether the attachment is no smaller than the + specified size. - Tests whether the attachment will be treated by ikiwiki as a wiki page. - (Ie, if it has an extension of ".mdwn", or of any other enabled page - format). +* "`ispage()`" - Tests whether the attachment will be treated by ikiwiki as a + wiki page. (Ie, if it has an extension of ".mdwn", or of any other enabled + page format). So, if you don't want to allow wiki pages to be uploaded as attachments, use `!ispage()` ; if you only want to allow wiki pages to be uploaded as attachments, use `ispage()`. -* user(username) - - Tests whether the attachment is being uploaded by a user with the - specified username. If openid is enabled, an openid can also be put here. - -* admin() - - Tests whether the attachment is being uploded by one of the wiki admins. - -* ip(address) - - Tests whether the attacment is being uploaded from the specified IP - address. - -* mimetype(foo/bar) - - This checks the MIME type of the attachment. You can include a glob - in the type, for example `mimetype(image/*)`. - -* virusfree() +* "`mimetype(foo/bar)`" - This checks the MIME type of the attachment. You can + include a glob in the type, for example `mimetype(image/*)`. - Checks the attachment with an antiviral program. +* "`virusfree()`" - Checks the attachment with an antiviral program. diff --git a/doc/plugins/lockedit.mdwn b/doc/plugins/lockedit.mdwn index 07abce1af..71bf232ab 100644 --- a/doc/plugins/lockedit.mdwn +++ b/doc/plugins/lockedit.mdwn @@ -17,4 +17,8 @@ One handy thing to do if you're using ikiwiki for your blog is to lock posts in your blog, while still letting them comment via the Discussion pages. -Wiki administrators can always edit locked pages. +Wiki administrators can always edit locked pages. The [[ikiwiki/PageSpec]] +can specify that some pages are not locked for some users. For example, +"important_page and !user(joey)" locks `important_page` while still +allowing joey to edit it, while "!*/Discussion and user(bob)" prevents bob +from editing pages except for Discussion pages. diff --git a/doc/todo/ACL.mdwn b/doc/todo/ACL.mdwn index 373f89364..e9fb2717f 100644 --- a/doc/todo/ACL.mdwn +++ b/doc/todo/ACL.mdwn @@ -44,7 +44,8 @@ Also see [[!debbug 443346]]. >> Yes, writing per-user commit ACLs has become somewhat easier with recent >> features. Breaking `match_user` out of attachment, and making the >> lockedit plugin pass`user` and `ip` params when it calls `pagespec_match` ->> would be sufficient. --[[Joey]] +>> would be sufficient. And [[done]], configurable via +>> [[plugin/lockedit]]'s `locked_pages`. --[[Joey]] I am considering giving this a try, implementing it as a module. Here is how I see it: diff --git a/po/es.po b/po/es.po index 34a4d3669..ff02ea86a 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-29 17:12-0400\n" +"POT-Creation-Date: 2008-10-08 17:34-0400\n" "PO-Revision-Date: 2008-10-07 12:44+0200\n" "Last-Translator: Víctor Moral \n" "Language-Team: Spanish \n" @@ -48,7 +48,7 @@ msgstr "Las preferencias se han guardado." msgid "You are banned." msgstr "Ha sido expulsado." -#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1153 +#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1166 msgid "Error" msgstr "Error" @@ -58,7 +58,8 @@ msgstr "Contenido añadido activado vía web." #: ../IkiWiki/Plugin/aggregate.pm:89 msgid "Nothing to do right now, all feeds are up-to-date!" -msgstr "¡ No hay nada que hacer, todas las fuentes de noticias están actualizadas !" +msgstr "" +"¡ No hay nada que hacer, todas las fuentes de noticias están actualizadas !" #: ../IkiWiki/Plugin/aggregate.pm:216 #, perl-format @@ -159,20 +160,20 @@ msgstr "ya existe una página de nombre %s" msgid "prohibited by allowed_attachments" msgstr "prohibido por la claúsula allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:188 +#: ../IkiWiki/Plugin/attachment.pm:189 msgid "bad attachment filename" msgstr "nombre de archivo adjunto erróneo" -#: ../IkiWiki/Plugin/attachment.pm:230 +#: ../IkiWiki/Plugin/attachment.pm:231 msgid "attachment upload" msgstr "enviado el adjunto" -#: ../IkiWiki/Plugin/autoindex.pm:103 +#: ../IkiWiki/Plugin/autoindex.pm:105 msgid "automatic index generation" msgstr "creación de índice automática" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:261 -#: ../IkiWiki/Plugin/inline.pm:323 ../IkiWiki/Plugin/opendiscussion.pm:26 +#: ../IkiWiki/Plugin/inline.pm:326 ../IkiWiki/Plugin/opendiscussion.pm:26 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79 #: ../IkiWiki/Render.pm:149 msgid "discussion" @@ -303,20 +304,20 @@ msgstr "falta el parámetro pages" msgid "unknown sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki/Plugin/inline.pm:282 +#: ../IkiWiki/Plugin/inline.pm:285 msgid "Add a new post titled:" msgstr "Añadir una entrada nueva titulada:" -#: ../IkiWiki/Plugin/inline.pm:298 +#: ../IkiWiki/Plugin/inline.pm:301 #, perl-format msgid "nonexistant template %s" msgstr "la plantilla %s no existe " -#: ../IkiWiki/Plugin/inline.pm:331 ../IkiWiki/Render.pm:83 +#: ../IkiWiki/Plugin/inline.pm:334 ../IkiWiki/Render.pm:83 msgid "Discussion" msgstr "Comentarios" -#: ../IkiWiki/Plugin/inline.pm:568 +#: ../IkiWiki/Plugin/inline.pm:571 msgid "RPC::XML::Client not found, not pinging" msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna" @@ -324,13 +325,15 @@ msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna msgid "failed to run dot" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/lockedit.pm:46 ../IkiWiki/Plugin/lockedit.pm:60 +#: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66 +#, perl-format msgid "%s is locked and cannot be edited" msgstr "La página %s está bloqueada y no puede modificarse" #: ../IkiWiki/Plugin/mdwn.pm:44 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" -msgstr "el modo multimarkdown está activo, pero no está instalado Text::MultiMarkdown" +msgstr "" +"el modo multimarkdown está activo, pero no está instalado Text::MultiMarkdown" #: ../IkiWiki/Plugin/mdwn.pm:67 #, perl-format @@ -393,7 +396,9 @@ msgstr "Error creando la cuenta de usuario." #: ../IkiWiki/Plugin/passwordauth.pm:257 msgid "No email address, so cannot email password reset instructions." -msgstr "No tengo dirección de correo electrónica, así que no puedo enviar instrucciones para reiniciar la contraseña" +msgstr "" +"No tengo dirección de correo electrónica, así que no puedo enviar " +"instrucciones para reiniciar la contraseña" #: ../IkiWiki/Plugin/passwordauth.pm:291 msgid "Failed to send mail" @@ -401,7 +406,9 @@ msgstr "No he podido enviar el mensaje de correo electrónico" #: ../IkiWiki/Plugin/passwordauth.pm:293 msgid "You have been mailed password reset instructions." -msgstr "Las instrucciones para reinicar la contraseña se le han enviado por correo electrónico" +msgstr "" +"Las instrucciones para reinicar la contraseña se le han enviado por correo " +"electrónico" #: ../IkiWiki/Plugin/passwordauth.pm:328 msgid "incorrect password reset url" @@ -558,16 +565,16 @@ msgstr "%s no está en el directorio fuente por lo que no puede ser borrada" msgid "%s is not a file" msgstr "%s no es un archivo" -#: ../IkiWiki/Plugin/remove.pm:112 +#: ../IkiWiki/Plugin/remove.pm:115 #, perl-format msgid "confirm removal of %s" msgstr "confirme el borrado de %s" -#: ../IkiWiki/Plugin/remove.pm:148 +#: ../IkiWiki/Plugin/remove.pm:152 msgid "Please select the attachments to remove." msgstr "Por favor seleccione los adjuntos que serán borrados." -#: ../IkiWiki/Plugin/remove.pm:188 +#: ../IkiWiki/Plugin/remove.pm:192 msgid "removed" msgstr "borrado" @@ -604,20 +611,20 @@ msgstr "cambiando de nombre %s" msgid "Also rename SubPages and attachments" msgstr "También cambia de nombre las subpáginas y los adjuntos" -#: ../IkiWiki/Plugin/rename.pm:223 +#: ../IkiWiki/Plugin/rename.pm:224 msgid "Only one attachment can be renamed at a time." msgstr "Únicamente un adjunto puede ser renombrado a la vez." -#: ../IkiWiki/Plugin/rename.pm:226 +#: ../IkiWiki/Plugin/rename.pm:227 msgid "Please select the attachment to rename." msgstr "Por favor, seleccione el adjunto al que cambiar el nombre." -#: ../IkiWiki/Plugin/rename.pm:332 +#: ../IkiWiki/Plugin/rename.pm:338 #, perl-format msgid "rename %s to %s" msgstr "%s cambia de nombre a %s" -#: ../IkiWiki/Plugin/rename.pm:484 +#: ../IkiWiki/Plugin/rename.pm:490 #, perl-format msgid "update for rename of %s to %s" msgstr "actualizado el cambio de nombre de %s a %s" @@ -762,13 +769,17 @@ msgstr "complementos" #: ../IkiWiki/Plugin/websetup.pm:395 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." -msgstr "Los cambios en la configuración que se muestran más abajo precisan una reconstrucción del wiki para tener efecto." +msgstr "" +"Los cambios en la configuración que se muestran más abajo precisan una " +"reconstrucción del wiki para tener efecto." #: ../IkiWiki/Plugin/websetup.pm:399 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." -msgstr "Para que los cambios en la configuración mostrados más abajo tengan efecto, es posible que necesite reconstruir el wiki." +msgstr "" +"Para que los cambios en la configuración mostrados más abajo tengan efecto, " +"es posible que necesite reconstruir el wiki." #: ../IkiWiki/Plugin/websetup.pm:433 #, perl-format @@ -780,7 +791,9 @@ msgstr "

Error: %s finaliza con código distinto de cero (%s)" msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" -msgstr "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use la directiva allow_symlinks_before_srcdir para permitir la acción" +msgstr "" +"encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use " +"la directiva allow_symlinks_before_srcdir para permitir la acción" #: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 #, perl-format @@ -926,12 +939,14 @@ msgstr "no puedo emplear varios complementos rcs" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "no he podido cargar el complemento externo %s necesario para %s" -#: ../IkiWiki.pm:1136 +#: ../IkiWiki.pm:1149 #, perl-format msgid "preprocessing loop detected on %s at depth %i" -msgstr "se ha detectado en la página %s un bucle de preprocesado en la iteración número %i" +msgstr "" +"se ha detectado en la página %s un bucle de preprocesado en la iteración " +"número %i" -#: ../IkiWiki.pm:1645 +#: ../IkiWiki.pm:1658 msgid "yes" msgstr "si" @@ -949,7 +964,9 @@ msgstr "¿ Qué sistema de control de versiones empleará ?" #: ../auto.setup:20 msgid "What wiki user (or openid) will be wiki admin?" -msgstr "¿ Qué usuario del wiki (ó identificador openid) será el administrador del wiki ? " +msgstr "" +"¿ Qué usuario del wiki (ó identificador openid) será el administrador del " +"wiki ? " #: ../auto.setup:23 msgid "What is the domain name of the web server?" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index dbbf986d5..f07f2bf62 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: 2008-10-05 19:11-0400\n" +"POT-Creation-Date: 2008-10-08 17:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -167,7 +167,7 @@ msgstr "" msgid "attachment upload" msgstr "" -#: ../IkiWiki/Plugin/autoindex.pm:103 +#: ../IkiWiki/Plugin/autoindex.pm:105 msgid "automatic index generation" msgstr "" @@ -321,7 +321,7 @@ msgstr "" msgid "failed to run dot" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:46 ../IkiWiki/Plugin/lockedit.pm:60 +#: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66 #, perl-format msgid "%s is locked and cannot be edited" msgstr "" @@ -554,16 +554,16 @@ msgstr "" msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:113 +#: ../IkiWiki/Plugin/remove.pm:115 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:150 +#: ../IkiWiki/Plugin/remove.pm:152 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:190 +#: ../IkiWiki/Plugin/remove.pm:192 msgid "removed" msgstr "" -- cgit v1.2.3 From a473cb2f74738d369130135b8c3ce0f6ef66af02 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 9 Oct 2008 19:09:16 -0400 Subject: orphans: Fix unquoted page name in regexp. --- IkiWiki/Plugin/orphans.pm | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm index b910758e0..32cbc5dd5 100644 --- a/IkiWiki/Plugin/orphans.pm +++ b/IkiWiki/Plugin/orphans.pm @@ -43,7 +43,7 @@ sub preprocess (@) { #{{{ next if grep { length $_ && ($_ !~ /\/\Q$discussion\E$/i || ! $config{discussion}) && - bestlink($page, $_) !~ /^($page|)$/ + bestlink($page, $_) !~ /^(\Q$page\E|)$/ } @{$links{$page}}; push @orphans, $page; } diff --git a/debian/changelog b/debian/changelog index 9947c8a58..b89d76e1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ ikiwiki (2.67) UNRELEASED; urgency=low is locked for. This supports most of the ACL type things users have been wanting to be done. Closes: #443346 (It does not control who can read a page, but that's out of scope for ikiwiki.) + * orphans: Fix unquoted page name in regexp. -- Joey Hess Mon, 06 Oct 2008 16:07:50 -0400 -- cgit v1.2.3 From cd305909d37546d1f75365f9e92995429927e91a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Oct 2008 17:13:33 -0400 Subject: document google plugin --- debian/changelog | 1 + debian/copyright | 4 ++++ doc/plugins/google.mdwn | 12 ++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 doc/plugins/google.mdwn (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b89d76e1b..fa6829eb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ ikiwiki (2.67) UNRELEASED; urgency=low wanting to be done. Closes: #443346 (It does not control who can read a page, but that's out of scope for ikiwiki.) * orphans: Fix unquoted page name in regexp. + * google: Plugin provides google site search, contributed by Peter Simons. -- Joey Hess Mon, 06 Oct 2008 16:07:50 -0400 diff --git a/debian/copyright b/debian/copyright index 87f3cac89..f257234dd 100644 --- a/debian/copyright +++ b/debian/copyright @@ -104,6 +104,10 @@ Files: color.pm Copyright: Copyright (C) 2008 Paweł Tęcza License: GPL-2+ +Files: google.pm +Copyright: Copyright (C) 2008 Peter Simons +License: GPL-2+ + Files: doc/logo/* Copyright: © 2006 Recai Oktaş License: GPL-2+ diff --git a/doc/plugins/google.mdwn b/doc/plugins/google.mdwn new file mode 100644 index 000000000..7c61e637b --- /dev/null +++ b/doc/plugins/google.mdwn @@ -0,0 +1,12 @@ +[[!template id=plugin name=google author="Peter Simons"]] +[[!tag type/web]] + +This plugin adds a search form to the wiki, using google's site search. + +Google is asked to search for pages in the domain specified in the wiki's +`url` configuration parameter. Results will depend on whether google has +indexed the site, and how recently. Also, if the same domain has other +content, outside the wiki's content, it will be searched as well. + +The [[search]] plugin offers full text search of only the wiki, but +requires that a search engine be installed on your site. -- cgit v1.2.3 From 3b27af4a29372c6fcd9cf203fff5b3614241bc67 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 Oct 2008 12:32:16 -0400 Subject: Pass HTTPS variable through the wrapper so that CGI->https can be used by plugins. Closes: #502047 --- IkiWiki/Wrapper.pm | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm index 6dc25403e..187314d16 100644 --- a/IkiWiki/Wrapper.pm +++ b/IkiWiki/Wrapper.pm @@ -28,7 +28,7 @@ sub gen_wrapper () { #{{{ my @envsave; push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE - HTTP_COOKIE REMOTE_USER} if $config{cgi}; + HTTP_COOKIE REMOTE_USER HTTPS} if $config{cgi}; my $envsave=""; foreach my $var (@envsave) { $envsave.=<<"EOF" diff --git a/debian/changelog b/debian/changelog index fa6829eb8..c38f44d79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ ikiwiki (2.67) UNRELEASED; urgency=low page, but that's out of scope for ikiwiki.) * orphans: Fix unquoted page name in regexp. * google: Plugin provides google site search, contributed by Peter Simons. + * Pass HTTPS variable through the wrapper so that CGI->https can be used + by plugins. Closes: #502047 -- Joey Hess Mon, 06 Oct 2008 16:07:50 -0400 -- cgit v1.2.3 From c39112e6effa8a4057cc6350c0be46f3363c259a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Oct 2008 15:00:46 -0400 Subject: inline: Allow MTIME to be used in inlinepage.tmpl. --- IkiWiki/Plugin/inline.pm | 1 + debian/changelog | 1 + doc/bugs/MTIME_not_set_for_inline_or_archive_entries.mdwn | 3 +++ 3 files changed, 5 insertions(+) (limited to 'debian') diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 5d2ef5681..037c20618 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -316,6 +316,7 @@ sub preprocess_inline (@) { #{{{ $template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage})); $template->param(title => pagetitle(basename($page))); $template->param(ctime => displaytime($pagectime{$page}, $params{timeformat})); + $template->param(mtime => displaytime($pagemtime{$page}, $params{timeformat})); $template->param(first => 1) if $page eq $list[0]; $template->param(last => 1) if $page eq $list[$#list]; diff --git a/debian/changelog b/debian/changelog index c38f44d79..f5156a667 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ ikiwiki (2.67) UNRELEASED; urgency=low * google: Plugin provides google site search, contributed by Peter Simons. * Pass HTTPS variable through the wrapper so that CGI->https can be used by plugins. Closes: #502047 + * inline: Allow MTIME to be used in inlinepage.tmpl. -- Joey Hess Mon, 06 Oct 2008 16:07:50 -0400 diff --git a/doc/bugs/MTIME_not_set_for_inline_or_archive_entries.mdwn b/doc/bugs/MTIME_not_set_for_inline_or_archive_entries.mdwn index 58579ac35..89947b544 100644 --- a/doc/bugs/MTIME_not_set_for_inline_or_archive_entries.mdwn +++ b/doc/bugs/MTIME_not_set_for_inline_or_archive_entries.mdwn @@ -17,3 +17,6 @@ Update - even though I'm not a Perl programmer, this patch seems right: + $template->param(mtime => displaytime($pagemtime{$page}, $params{timeformat})); $template->param(first => 1) if $page eq $list[0]; $template->param(last => 1) if $page eq $list[$#list]; + + +> [[done]], thanks -- cgit v1.2.3 From b8f4b9c7993cd5e7e5e6b07d512ffa8ecf9f5a7a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 15 Oct 2008 14:45:28 -0400 Subject: inline: Use the feed's description in the rss and atom links. Closes: #502113 --- IkiWiki/Plugin/inline.pm | 4 ++-- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index aa8fe2baa..6d88c2f15 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -376,7 +376,7 @@ sub preprocess_inline (@) { #{{{ genfeed("rss", $config{url}."/".$rssp, $desc, $params{guid}, $params{destpage}, @feedlist)); $toping{$params{destpage}}=1 unless $config{rebuild}; - $feedlinks{$params{destpage}}=qq{}; + $feedlinks{$params{destpage}}=qq{}; } } if ($atom) { @@ -386,7 +386,7 @@ sub preprocess_inline (@) { #{{{ writefile($atomp, $config{destdir}, genfeed("atom", $config{url}."/".$atomp, $desc, $params{guid}, $params{destpage}, @feedlist)); $toping{$params{destpage}}=1 unless $config{rebuild}; - $feedlinks{$params{destpage}}=qq{}; + $feedlinks{$params{destpage}}=qq{}; } } } diff --git a/debian/changelog b/debian/changelog index f5156a667..ecef4f158 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ ikiwiki (2.67) UNRELEASED; urgency=low * Pass HTTPS variable through the wrapper so that CGI->https can be used by plugins. Closes: #502047 * inline: Allow MTIME to be used in inlinepage.tmpl. + * inline: Use the feed's description in the rss and atom links. + Closes: #502113 -- Joey Hess Mon, 06 Oct 2008 16:07:50 -0400 -- cgit v1.2.3