From 145d89a6fc03936cc36d70946a8471da9bfe468a Mon Sep 17 00:00:00 2001 From: intrigeri Date: Wed, 26 Aug 2009 01:05:07 -0400 Subject: po: maybe fixed self links --- doc/plugins/po.mdwn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index dca2f5d66..b4c8b135e 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -260,7 +260,9 @@ If a page contains a WikiLink to itself, ikiwiki does not normally turn that into a hyperlink. However, if a translated page contains a WikiLink to itself, a hyperlink is inserted, at least with the default `po_link_to` the link points to the English version of the page. Is there a -good reason for that to be done? --[[Joey]] +good reason for that to be done? --[[Joey]] + +> The commit 0113c69d4fb in my po branch might fix this. --[[intrigeri]] Language display order ---------------------- -- cgit v1.2.3 From 7bd7e78e4a7d31c460909776057687e0e29dba12 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Wed, 26 Aug 2009 01:41:55 -0400 Subject: po: commenting some TODO items --- doc/plugins/po.mdwn | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index b4c8b135e..45630d763 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -282,12 +282,23 @@ That used to be so, but the bug was fixed. Does this mean that po might be replacing the only link on a page, in error? --[[Joey]] +> It would replace it. The only problematic case is when another +> plugin has its own reasons, in its `scan` hook, to add a page +> that is already there to `$links{$page}`. This other plugin's +> effect might then be changed by po's `scan` hook... which could +> be either good (better overall l10n) or bad (break the other +> plugin's goal). --[[intrigeri]] + Name of toplevel index page --------------------------- Normally at the top index page of a wiki, you see the wiki name at the top. However, at the top *translated* index page, you see something -like "index.da". --[[Joey]] +like "index.da". --[[Joey]] + +> I suggest changing `Render.pm`, line 115, to replace the `$page eq 'index'` +> test with a predicate call such as isindexpage($page). Such a predicate +> function could then be overriden by the po plugin. --[[intrigeri]] Pagespecs --------- -- cgit v1.2.3 From d5a04b2de9ce027c0e4cd47c9342bcd3db7f9f27 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Wed, 26 Aug 2009 02:00:48 -0400 Subject: po: more TODO items comments and patches --- doc/plugins/po.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 45630d763..079a36633 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -335,6 +335,10 @@ When a po file is changed, the recentchanges page shows a link such as language) version of the page. It would be better in this one case if the link went direct to the translated version of the page. --[[Joey]] +> The (untested) commit 496e8523c670 in my po branch might fix this... +> or at least, I believe, put someone on the right track. +> --[[intrigeri]] + Double commits of po files -------------------------- -- cgit v1.2.3 From cc76cd64024ed09eff2a3e2da1282497e8c4e21b Mon Sep 17 00:00:00 2001 From: martin Date: Wed, 26 Aug 2009 09:59:39 -0400 Subject: suggestion --- doc/todo/tmplvars_plugin/discussion.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/todo/tmplvars_plugin/discussion.mdwn diff --git a/doc/todo/tmplvars_plugin/discussion.mdwn b/doc/todo/tmplvars_plugin/discussion.mdwn new file mode 100644 index 000000000..93cb9b414 --- /dev/null +++ b/doc/todo/tmplvars_plugin/discussion.mdwn @@ -0,0 +1 @@ +I find this plugin quite usefull. But one thing, I would like to be able to do is set a tmplvar e.g. in a sidebar so that it affects all Pages this sidebar is used in. --martin -- cgit v1.2.3 From 155347837a6757bd85f9b15778133622daa006c0 Mon Sep 17 00:00:00 2001 From: "https://infosoph.myopenid.com/" Date: Wed, 26 Aug 2009 10:25:48 -0400 Subject: initial report --- .../defintion_lists_appear_to_be_disabled.mdwn | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 doc/bugs/defintion_lists_appear_to_be_disabled.mdwn diff --git a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn new file mode 100644 index 000000000..c9756617d --- /dev/null +++ b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn @@ -0,0 +1,38 @@ +Adding text of the format + + Apple + : Pomaceous fruit of plants of the genus Malus in + the family Rosaceae. + : An american computer company. + + Orange + : The fruit of an evergreen tree of the genus Citrus. + +Does not result in expected HTML as described in the [MultiMarkdown Syntax Guide](http://fletcherpenney.net/multimarkdown/users_guide/multimarkdown_syntax_guide/): + +Should be + +
+
Apple
+
+

Pomaceous fruit of plants of the genus Malus in + the family Rosaceae.

+
+
+

An american computer company.

+
+
Orange
+
+

The fruit of an evergreen tree of the genus Citrus.

+
+
+ +But instead it gives: + +

Apple + : Pomaceous fruit of plants of the genus Malus in + the family Rosaceae. + : An american computer company.

+ +

Orange + : The fruit of an evergreen tree of the genus Citrus.

-- cgit v1.2.3 From 2996f0b5ee0b3a06d6476eff57b40cb2d8fc587a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Aug 2009 13:04:09 -0400 Subject: fix emphasis examples to actually work --- doc/ikiwiki/formatting.mdwn | 2 +- po/fr.po | 34 ++++---- po/ikiwiki.pot | 22 ++--- po/it.po | 195 +++++++++++++++++++++++++------------------- 4 files changed, 144 insertions(+), 109 deletions(-) diff --git a/doc/ikiwiki/formatting.mdwn b/doc/ikiwiki/formatting.mdwn index 2ed5cc26f..befbce9aa 100644 --- a/doc/ikiwiki/formatting.mdwn +++ b/doc/ikiwiki/formatting.mdwn @@ -7,7 +7,7 @@ called [[MarkDown]], and it works like this: Leave blank lines between paragraphs. -You can \**emphasise*\* or \*\***strongly emphasise**\*\* text by placing it +You can *\*emphasise\** or **\*\*strongly emphasise\*\*** text by placing it in single or double asterisks. To create a list, start each line with an asterisk: diff --git a/po/fr.po b/po/fr.po index 08ca06d0b..df3b23891 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-15 14:07-0400\n" +"POT-Creation-Date: 2009-08-25 18:43-0400\n" "PO-Revision-Date: 2009-08-17 10:06+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -57,7 +57,7 @@ msgstr "Les préférences ont été enregistrées." msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 msgid "Error" msgstr "Erreur" @@ -184,7 +184,9 @@ msgstr "Génération de l'index automatique" msgid "" "Sorry, but that looks like spam to blogspam: " -msgstr "Désolé, mais cela ressemble à un « spam » selon les critères de blogspam : " +msgstr "" +"Désolé, mais cela ressemble à un « spam » selon les critères de blogspam : " #: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format @@ -444,16 +446,16 @@ msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »" msgid "unknown sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki/Plugin/inline.pm:327 +#: ../IkiWiki/Plugin/inline.pm:329 msgid "Add a new post titled:" msgstr "Ajouter un nouvel article dont le titre est :" -#: ../IkiWiki/Plugin/inline.pm:347 +#: ../IkiWiki/Plugin/inline.pm:349 #, perl-format msgid "nonexistant template %s" msgstr "Le modèle de page %s n'existe pas" -#: ../IkiWiki/Plugin/inline.pm:612 +#: ../IkiWiki/Plugin/inline.pm:614 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" @@ -531,7 +533,9 @@ msgstr "Erreur lors de la création du compte." #: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." -msgstr "Aucune adresse indiquée. Impossible d'envoyer les instructions pour réinitialiser le mot de passe." +msgstr "" +"Aucune adresse indiquée. Impossible d'envoyer les instructions pour " +"réinitialiser le mot de passe." #: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" @@ -1061,22 +1065,22 @@ msgstr "Examen de %s" msgid "building %s, which links to %s" msgstr "Reconstruction de %s, qui est lié à %s" -#: ../IkiWiki/Render.pm:468 +#: ../IkiWiki/Render.pm:473 #, perl-format msgid "building %s, which depends on %s" msgstr "Reconstruction de %s, qui dépend de %s" -#: ../IkiWiki/Render.pm:507 +#: ../IkiWiki/Render.pm:513 #, perl-format msgid "building %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:519 +#: ../IkiWiki/Render.pm:525 #, perl-format msgid "removing %s, no longer built by %s" msgstr "Suppression de %s, qui n'est plus rendu par %s" -#: ../IkiWiki/Render.pm:543 +#: ../IkiWiki/Render.pm:549 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki : impossible de reconstruire %s" @@ -1106,7 +1110,9 @@ msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo" #: ../IkiWiki/Setup/Automator.pm:115 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" -msgstr "** Désactivation du greffon %s, l'installation a échoué avec le message suivant :" +msgstr "" +"** Désactivation du greffon %s, l'installation a échoué avec le message " +"suivant :" #: ../IkiWiki/Wrapper.pm:16 #, perl-format @@ -1176,12 +1182,12 @@ msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s" -#: ../IkiWiki.pm:1243 +#: ../IkiWiki.pm:1251 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:1783 +#: ../IkiWiki.pm:1791 msgid "yes" msgstr "oui" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index a9c0fbb99..29a2d508c 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: 2009-08-15 14:07-0400\n" +"POT-Creation-Date: 2009-08-25 18:43-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,7 +54,7 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 msgid "Error" msgstr "" @@ -437,16 +437,16 @@ msgstr "" msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:327 +#: ../IkiWiki/Plugin/inline.pm:329 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:347 +#: ../IkiWiki/Plugin/inline.pm:349 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:612 +#: ../IkiWiki/Plugin/inline.pm:614 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -1028,22 +1028,22 @@ msgstr "" msgid "building %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:468 +#: ../IkiWiki/Render.pm:473 #, perl-format msgid "building %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:507 +#: ../IkiWiki/Render.pm:513 #, perl-format msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:519 +#: ../IkiWiki/Render.pm:525 #, perl-format msgid "removing %s, no longer built by %s" msgstr "" -#: ../IkiWiki/Render.pm:543 +#: ../IkiWiki/Render.pm:549 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1139,12 +1139,12 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1243 +#: ../IkiWiki.pm:1251 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1783 +#: ../IkiWiki.pm:1791 msgid "yes" msgstr "" diff --git a/po/it.po b/po/it.po index 53fb3e3f4..c740fb0cb 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-15 14:07-0400\n" +"POT-Creation-Date: 2009-08-25 18:43-0400\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -18,15 +18,18 @@ msgid "You need to log in first." msgstr "Occorre prima effettuare l'accesso." #: ../IkiWiki/CGI.pm:146 -msgid "probable misconfiguration: sslcookie is set, but you are attempting to login via http, not https" -msgstr "possibile errore di configurazione: sslcookie è impostato, ma si sta tentando un accesso via http, non https" +msgid "" +"probable misconfiguration: sslcookie is set, but you are attempting to login " +"via http, not https" +msgstr "" +"possibile errore di configurazione: sslcookie è impostato, ma si sta " +"tentando un accesso via http, non https" #: ../IkiWiki/CGI.pm:149 msgid "login failed, perhaps you need to turn on cookies?" msgstr "errore nell'accesso, probabilmente i cookie sono disabilitati?" -#: ../IkiWiki/CGI.pm:168 -#: ../IkiWiki/CGI.pm:299 +#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299 msgid "Your login session has expired." msgstr "La sessione è scaduta." @@ -50,9 +53,7 @@ msgstr "Preferenze salvate." msgid "You are banned." msgstr "Avete ricevuto un ban." -#: ../IkiWiki/CGI.pm:390 -#: ../IkiWiki/CGI.pm:391 -#: ../IkiWiki.pm:1260 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 msgid "Error" msgstr "Errore" @@ -62,7 +63,8 @@ msgstr "Aggregazione attivata dal web." #: ../IkiWiki/Plugin/aggregate.pm:93 msgid "Nothing to do right now, all feeds are up-to-date!" -msgstr "Nessuna azione da intraprendere, tutti i notiziari sono già aggiornati." +msgstr "" +"Nessuna azione da intraprendere, tutti i notiziari sono già aggiornati." #: ../IkiWiki/Plugin/aggregate.pm:220 #, perl-format @@ -133,8 +135,7 @@ msgstr "creazione nuova pagina %s" msgid "deleting bucket.." msgstr "eliminazione contenitore..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 -#: ../ikiwiki.in:210 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210 msgid "done" msgstr "fatto" @@ -177,8 +178,12 @@ msgid "automatic index generation" msgstr "generazione automatica dell'indice" #: ../IkiWiki/Plugin/blogspam.pm:108 -msgid "Sorry, but that looks like spam to blogspam: " -msgstr "È stato riconosciuto come spam da blogspam: " +msgid "" +"Sorry, but that looks like spam to blogspam: " +msgstr "" +"È stato riconosciuto come spam da blogspam: " #: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format @@ -189,8 +194,7 @@ msgstr "%s da %s" msgid "There are no broken links!" msgstr "Non ci sono collegamenti rotti." -#: ../IkiWiki/Plugin/comments.pm:124 -#: ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 #, perl-format msgid "unsupported page format %s" msgstr "formato pagina %s non supportato" @@ -203,8 +207,7 @@ msgstr "i commenti devono avere un contenuto" msgid "Anonymous" msgstr "Anonimo" -#: ../IkiWiki/Plugin/comments.pm:340 -#: ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 msgid "bad page name" msgstr "nome pagina non valido" @@ -240,8 +243,7 @@ msgstr "Aggiunto commento" msgid "Added a comment: %s" msgstr "Aggiunto commento: %s" -#: ../IkiWiki/Plugin/comments.pm:525 -#: ../IkiWiki/Plugin/websetup.pm:236 +#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236 msgid "you are not logged in as an admin" msgstr "non siete autenticati come amministratore" @@ -257,10 +259,8 @@ msgstr "moderazione commento" msgid "Comments" msgstr "Commenti" -#: ../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:30 +#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" @@ -290,10 +290,8 @@ msgstr "%s non è una pagina modificabile" msgid "creating %s" msgstr "creazione %s" -#: ../IkiWiki/Plugin/editpage.pm:310 -#: ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 -#: ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 #: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" @@ -324,13 +322,11 @@ msgstr "occorre specificare formato e testo" msgid "fortune failed" msgstr "errore nel fortune" -#: ../IkiWiki/Plugin/getsource.pm:62 -#: ../IkiWiki/Plugin/goto.pm:55 +#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 msgid "missing page" msgstr "pagina mancante" -#: ../IkiWiki/Plugin/getsource.pm:64 -#: ../IkiWiki/Plugin/goto.pm:57 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "La pagina %s non esiste." @@ -344,8 +340,7 @@ msgstr "non è una pagina" msgid "%s is an attachment, not a page." msgstr "%s è un allegato, non una pagina." -#: ../IkiWiki/Plugin/git.pm:626 -#: ../IkiWiki/Plugin/git.pm:644 +#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 #: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" @@ -360,8 +355,7 @@ msgstr "non è permesso lavorare su un file in modalità %s" msgid "you are not allowed to change file modes" msgstr "non è permesso cambiare la modalità del file" -#: ../IkiWiki/Plugin/google.pm:27 -#: ../IkiWiki/Plugin/po.pm:129 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -369,7 +363,9 @@ msgstr "Occorre specificare %s quando si usa il plugin %s" #: ../IkiWiki/Plugin/google.pm:31 msgid "Failed to parse url, cannot determine domain name" -msgstr "Errore nell'interpretazione dell'URL, impossibile determinare il nome del dominio" +msgstr "" +"Errore nell'interpretazione dell'URL, impossibile determinare il nome del " +"dominio" #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" @@ -390,8 +386,10 @@ msgid "Source code: %s" msgstr "Sorgente: %s" #: ../IkiWiki/Plugin/highlight.pm:123 -msgid "warning: highlight perl module not available; falling back to pass through" -msgstr "attenzione: modulo perl highlight non trovato, verrà passato inalterato" +msgid "" +"warning: highlight perl module not available; falling back to pass through" +msgstr "" +"attenzione: modulo perl highlight non trovato, verrà passato inalterato" #: ../IkiWiki/Plugin/img.pm:63 msgid "Image::Magick is not installed" @@ -402,8 +400,7 @@ msgstr "Image::Magick non è installato" msgid "wrong size format \"%s\" (should be WxH)" msgstr "Formato dimensione «%s» non valido (dovrebbe essere LxA)" -#: ../IkiWiki/Plugin/img.pm:83 -#: ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 #: ../IkiWiki/Plugin/img.pm:104 #, perl-format msgid "failed to read %s: %s" @@ -421,7 +418,8 @@ msgstr "impossibile determinare la dimensione dell'immagine %s" #: ../IkiWiki/Plugin/inline.pm:92 msgid "Must specify url to wiki with --url when using --rss or --atom" -msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --rss o --atom" +msgstr "" +"Occorre specificare l'url del wiki tramite --url quando si usa --rss o --atom" #: ../IkiWiki/Plugin/inline.pm:138 msgid "page editing not allowed" @@ -445,16 +443,16 @@ msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural" msgid "unknown sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki/Plugin/inline.pm:327 +#: ../IkiWiki/Plugin/inline.pm:329 msgid "Add a new post titled:" msgstr "Aggiungere un nuovo articolo dal titolo:" -#: ../IkiWiki/Plugin/inline.pm:347 +#: ../IkiWiki/Plugin/inline.pm:349 #, perl-format msgid "nonexistant template %s" msgstr "modello %s non esistente" -#: ../IkiWiki/Plugin/inline.pm:612 +#: ../IkiWiki/Plugin/inline.pm:614 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client non trovato, impossibile inviare ping" @@ -469,12 +467,14 @@ msgstr "%s è bloccata e non può essere modificata" #: ../IkiWiki/Plugin/mdwn.pm:44 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" -msgstr "multimarkdown è stato abilitato, ma Text::MultiMarkdown non è aggiornato" +msgstr "" +"multimarkdown è stato abilitato, ma Text::MultiMarkdown non è aggiornato" #: ../IkiWiki/Plugin/mdwn.pm:67 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" -msgstr "impossibile caricare il modulo perl Markdown.pm (%s) o /usr/bin/markdown (%s)" +msgstr "" +"impossibile caricare il modulo perl Markdown.pm (%s) o /usr/bin/markdown (%s)" #: ../IkiWiki/Plugin/meta.pm:158 msgid "stylesheet not found" @@ -530,7 +530,9 @@ msgstr "Errore nella creazione dell'account." #: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." -msgstr "Nessun indirizzo email, impossibile inviare per email le istruzioni per reimpostare la password." +msgstr "" +"Nessun indirizzo email, impossibile inviare per email le istruzioni per " +"reimpostare la password." #: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" @@ -538,7 +540,8 @@ msgstr "Impossibile spedire il messaggio" #: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." -msgstr "Il messaggio con le istruzioni per reimpostare la password è stato inviato." +msgstr "" +"Il messaggio con le istruzioni per reimpostare la password è stato inviato." #: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" @@ -572,7 +575,9 @@ msgstr "LWP non trovato, ping non inviato" #: ../IkiWiki/Plugin/po.pm:15 msgid "warning: Old po4a detected! Recommend upgrade to 0.35." -msgstr "attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno alla versione 0.35." +msgstr "" +"attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno " +"alla versione 0.35." #: ../IkiWiki/Plugin/po.pm:136 #, perl-format @@ -581,20 +586,25 @@ msgstr "%s non è una codifica di lingua valida" #: ../IkiWiki/Plugin/po.pm:148 #, perl-format -msgid "%s is not a valid value for po_link_to, falling back to po_link_to=default" -msgstr "%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default" +msgid "" +"%s is not a valid value for po_link_to, falling back to po_link_to=default" +msgstr "" +"%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default" #: ../IkiWiki/Plugin/po.pm:153 -msgid "po_link_to=negotiated requires usedirs to be enabled, falling back to po_link_to=default" -msgstr "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato po_link_to=default" +msgid "" +"po_link_to=negotiated requires usedirs to be enabled, falling back to " +"po_link_to=default" +msgstr "" +"po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato " +"po_link_to=default" #: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli" -#: ../IkiWiki/Plugin/po.pm:387 -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, perl-format msgid "building %s" msgstr "compilazione di %s" @@ -604,12 +614,20 @@ msgid "updated PO files" msgstr "file PO aggiornati" #: ../IkiWiki/Plugin/po.pm:448 -msgid "Can not remove a translation. If the master page is removed, however, its translations will be removed as well." -msgstr "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è stata eliminata anche le traduzioni lo saranno." +msgid "" +"Can not remove a translation. If the master page is removed, however, its " +"translations will be removed as well." +msgstr "" +"Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è " +"stata eliminata anche le traduzioni lo saranno." #: ../IkiWiki/Plugin/po.pm:468 -msgid "Can not rename a translation. If the master page is renamed, however, its translations will be renamed as well." -msgstr "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è stata rinominata anche le traduzioni lo saranno." +msgid "" +"Can not rename a translation. If the master page is renamed, however, its " +"translations will be renamed as well." +msgstr "" +"Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è " +"stata rinominata anche le traduzioni lo saranno." #: ../IkiWiki/Plugin/po.pm:829 #, perl-format @@ -644,8 +662,7 @@ msgstr "impossibile tradurre %s" msgid "removed obsolete PO files" msgstr "file PO obsoleti rimossi" -#: ../IkiWiki/Plugin/po.pm:1046 -#: ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 #: ../IkiWiki/Plugin/po.pm:1100 #, perl-format msgid "failed to write %s" @@ -662,7 +679,9 @@ msgstr "impossibile leggere %s" #: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" -msgstr "dati gettext non validi, tornare alle pagina precedente per continuare le modifiche" +msgstr "" +"dati gettext non validi, tornare alle pagina precedente per continuare le " +"modifiche" #: ../IkiWiki/Plugin/poll.pm:69 msgid "vote" @@ -759,14 +778,15 @@ msgstr "valore percentuale %s non ammesso" #: ../IkiWiki/Plugin/progress.pm:59 msgid "need either `percent` or `totalpages` and `donepages` parameters" -msgstr "occorrono alternativamente i parametri \"percent\" o \"totalpages\" e \"donepages\"" +msgstr "" +"occorrono alternativamente i parametri \"percent\" o \"totalpages\" e " +"\"donepages\"" #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "(Diff troncato)" -#: ../IkiWiki/Plugin/remove.pm:31 -#: ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 #, perl-format msgid "%s does not exist" msgstr "%s non esiste" @@ -776,8 +796,7 @@ msgstr "%s non esiste" msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s non è in src, quindi non può essere eliminato" -#: ../IkiWiki/Plugin/remove.pm:41 -#: ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 #, perl-format msgid "%s is not a file" msgstr "%s non è un file" @@ -976,12 +995,19 @@ msgid "plugins" msgstr "plugin" #: ../IkiWiki/Plugin/websetup.pm:395 -msgid "The configuration changes shown below require a wiki rebuild to take effect." -msgstr "Le sottostanti modifiche alla configurazione richiedono la ricompilazione del wiki." +msgid "" +"The configuration changes shown below require a wiki rebuild to take effect." +msgstr "" +"Le sottostanti modifiche alla configurazione richiedono la ricompilazione " +"del wiki." #: ../IkiWiki/Plugin/websetup.pm:399 -msgid "For the configuration changes shown below to fully take effect, you may need to rebuild the wiki." -msgstr "Affinché le sottostanti modifiche alla configurazione abbiano effetto, occorre ricostruire il wiki." +msgid "" +"For the configuration changes shown below to fully take effect, you may need " +"to rebuild the wiki." +msgstr "" +"Affinché le sottostanti modifiche alla configurazione abbiano effetto, " +"occorre ricostruire il wiki." #: ../IkiWiki/Plugin/websetup.pm:436 #, perl-format @@ -1000,11 +1026,14 @@ msgstr "nome file %s scorretto" #: ../IkiWiki/Render.pm:264 #, perl-format -msgid "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to allow this" -msgstr "collegamento simbolico trovato nel percorso srcdir (%s) -- impostare allow_symlinks_before_srcdir per abilitare questa configurazione" +msgid "" +"symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " +"allow this" +msgstr "" +"collegamento simbolico trovato nel percorso srcdir (%s) -- impostare " +"allow_symlinks_before_srcdir per abilitare questa configurazione" -#: ../IkiWiki/Render.pm:287 -#: ../IkiWiki/Render.pm:312 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "ignorato il file dal nome scorretto %s" @@ -1029,22 +1058,22 @@ msgstr "scansione %s" msgid "building %s, which links to %s" msgstr "compilazione di %s, che è collegato a %s" -#: ../IkiWiki/Render.pm:468 +#: ../IkiWiki/Render.pm:473 #, perl-format msgid "building %s, which depends on %s" msgstr "compilazione di %s, che dipende da %s" -#: ../IkiWiki/Render.pm:507 +#: ../IkiWiki/Render.pm:513 #, perl-format msgid "building %s, to update its backlinks" msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti" -#: ../IkiWiki/Render.pm:519 +#: ../IkiWiki/Render.pm:525 #, perl-format msgid "removing %s, no longer built by %s" msgstr "rimozione di %s, non più richiesto da %s" -#: ../IkiWiki/Render.pm:543 +#: ../IkiWiki/Render.pm:549 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: impossibile compilare %s" @@ -1072,7 +1101,8 @@ msgstr "impossibile creare un repository tramite ikiwiki-makerepo" #: ../IkiWiki/Setup/Automator.pm:115 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" -msgstr "** Plugin %s disabilitato, a causa della seguente segnalazione di errore:" +msgstr "" +"** Plugin %s disabilitato, a causa della seguente segnalazione di errore:" #: ../IkiWiki/Wrapper.pm:16 #, perl-format @@ -1140,12 +1170,12 @@ msgstr "impossibile usare più plugin rcs" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "impossibile caricare il plugin esterno per il plugin %s: %s" -#: ../IkiWiki.pm:1243 +#: ../IkiWiki.pm:1251 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "ciclo del preprocessore individuato su %s alla profondità %i" -#: ../IkiWiki.pm:1783 +#: ../IkiWiki.pm:1791 msgid "yes" msgstr "sì" @@ -1173,4 +1203,3 @@ msgstr "Quale utente (openid o del wiki) sarà l'amministratore?" #: ../auto.setup:23 msgid "What is the domain name of the web server?" msgstr "Qual è il nome del dominio del server web?" - -- cgit v1.2.3 From 27c6f56fcfac8a60b55751a7eda90bf78fab8c1f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Aug 2009 13:05:46 -0400 Subject: typo --- doc/ikiwiki/searching.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ikiwiki/searching.mdwn b/doc/ikiwiki/searching.mdwn index 539e7193d..4c1287933 100644 --- a/doc/ikiwiki/searching.mdwn +++ b/doc/ikiwiki/searching.mdwn @@ -5,7 +5,7 @@ then="This wiki has searching **enabled**." else="This wiki has searching **disabled**."]] If searching is enabled, you can enter search terms in the search field, -as you'd expect. There are a few special things you can do to constuct +as you'd expect. There are a few special things you can do to construct more powerful searches. * To match a phrase, enclose it in double quotes. -- cgit v1.2.3 From 4ce93af516360a223016681961481f51a3ce81f7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Aug 2009 13:09:43 -0400 Subject: translation of directives --- doc/plugins/po.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 079a36633..9273da399 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -358,6 +358,15 @@ Ugly messages with empty files If there are empty .mdwn files, the po plugin displays some ugly messages. +Translation of directives +------------------------- + +If a translated page contains a directive, it may expand to some english +text, or text in whatever single language ikiwiki is configured to "speak". + +Maybe there could be a way to switch ikiwiki to speaking another language +when building a non-english page? Then the directives would get translated. + Documentation ------------- -- cgit v1.2.3 From 2736fc5ba975a92311649b5951c677223732d531 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Aug 2009 13:11:55 -0400 Subject: close; multimarkdown not enabled by default --- doc/bugs/defintion_lists_appear_to_be_disabled.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn index c9756617d..d6136ed4e 100644 --- a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn +++ b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn @@ -36,3 +36,7 @@ But instead it gives:

Orange : The fruit of an evergreen tree of the genus Citrus.

+ +> ikiwiki's markdown support does not include support for multimarkdown by +> default. If you want to enable that, you can turn on the `multimarkdown` +> option in the setup file. --[[Joey]] [[done]] -- cgit v1.2.3 From 4e70f2f0d20bbfc800aafb1b78cc6a41f4617d32 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Aug 2009 13:24:51 -0400 Subject: htmltidy: Print a warning message if tidy fails. Closes: #543722 --- IkiWiki/Plugin/htmltidy.pm | 5 ++++- debian/changelog | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm index 6f3379ef4..fc0d3b1d6 100644 --- a/IkiWiki/Plugin/htmltidy.pm +++ b/IkiWiki/Plugin/htmltidy.pm @@ -46,7 +46,10 @@ sub sanitize (@) { waitpid $pid, 0; $SIG{PIPE}="DEFAULT"; - return "" if $sigpipe || ! defined $ret; + if ($sigpipe || ! defined $ret) { + print STDERR gettext("warning: tidy failed")."\n"; + return ""; + } return $ret; } diff --git a/debian/changelog b/debian/changelog index 0d3f61e6f..69e197e37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,7 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low slower. (smcv) * Rebuild wikis on upgrade to this version to fix bloat caused by the dependency bug. + * htmltidy: Print a warning message if tidy fails. Closes: #543722 -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 -- cgit v1.2.3 From 70c601990b345b03ddf2406c46017da232bef8b9 Mon Sep 17 00:00:00 2001 From: "https://infosoph.myopenid.com/" Date: Wed, 26 Aug 2009 14:39:25 -0400 Subject: Forgot to mention I have multimarkdown enabled --- doc/bugs/defintion_lists_appear_to_be_disabled.mdwn | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn index d6136ed4e..97538ed87 100644 --- a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn +++ b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn @@ -39,4 +39,13 @@ But instead it gives: > ikiwiki's markdown support does not include support for multimarkdown by > default. If you want to enable that, you can turn on the `multimarkdown` -> option in the setup file. --[[Joey]] [[done]] +> option in the setup file. --[[Joey]] + +>> Sorry, I should have indicated, I have multimarkdown enabled: + + # mdwn plugin + # enable multimarkdown features? + multimarkdown => 1, + +>>Other features appear to be working, tables and footnotes for instance. See current install: + -- cgit v1.2.3 From dc1399fa809dc38e070a3c160b26926c27a04ddd Mon Sep 17 00:00:00 2001 From: intrigeri Date: Wed, 26 Aug 2009 21:19:55 -0400 Subject: initial patch proposal --- ...irrorlist_with_per-mirror_usedirs_settings.mdwn | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn diff --git a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn new file mode 100644 index 000000000..6ca9962ba --- /dev/null +++ b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn @@ -0,0 +1,24 @@ +I've got a wiki that is built at two places: + +* a static copy, aimed at being viewed without any web server, using + a web browser's `file:///` urls => usedirs is disabled to get nice + and working links +* an online copy, with usedirs enabled in order to benefit from the + language negotiation using the po plugin + +I need to use mirrorlist on the static copy, so that one can easily +reach the online, possibly updated, pages. But as documented, "pages are +assumed to exist in the same location under the specified url on each +mirror", so the generated urls are wrong. + +My `mirrorlist` branch contains a patch that allows one to configure usedirs +per-mirror. Note: the old configuration format is still supported, so this should +not break existing wikis. + +OT: as a bonus, this branch contains a patch to support {hashes,arrays} of +{hashes,arrays} in `$config`, which I missed a bit when writing the po plugin, +and decided this time it was really needed to implement this feature. + +--[[intrigeri]] + +[[!tag patch]] -- cgit v1.2.3 From 6ba35a7cb41f18e79a0257d40df0ec1d56035101 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 27 Aug 2009 12:41:25 -0400 Subject: forwarded --- doc/bugs/defintion_lists_appear_to_be_disabled.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn index 97538ed87..6dac9c8b8 100644 --- a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn +++ b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn @@ -49,3 +49,6 @@ But instead it gives: >>Other features appear to be working, tables and footnotes for instance. See current install: +>>> Ok, in that case it's a bug in the perl module. Forwarded to +>>> --[[Joey]] +>>> [[!tag done]] -- cgit v1.2.3 From 18fc71f033cf0ff9ccd6ef16212ce3b4e34ac725 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 27 Aug 2009 12:56:24 -0400 Subject: unsure if this patch is enough --- doc/plugins/po.mdwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 9273da399..b77c545d9 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -264,6 +264,11 @@ good reason for that to be done? --[[Joey]] > The commit 0113c69d4fb in my po branch might fix this. --[[intrigeri]] +>> It may fix it in passing, but shouldn't it also be fixed for the other +>> `po_link_to` styles? (Also, if `mybestlink` is going to always +>> just return `bestlink` in this case, there seems no reason to inject +>> it.) --[[Joey]] + Language display order ---------------------- -- cgit v1.2.3 From 5eec60d4c6c34b6f3d0d2bc002f5d4158354910a Mon Sep 17 00:00:00 2001 From: intrigeri Date: Wed, 26 Aug 2009 07:56:33 +0200 Subject: po: do not beautify urls on the recentchanges page ... else, the recentchanges page shows a link such as "sandbox.es". But, clicking on it goes to the English (or negotiated language) version of the page. It is better in this one case if the link goes direct to the translated version of the page. (cherry picked from commit 496e8523c6706d096f1b794e3f3ba5dd2fa260f3) --- IkiWiki/Plugin/po.pm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index 414906999..a9517adce 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -602,17 +602,21 @@ sub myurlto ($$;$) { # so that one is redirected to the just-edited page rather than to the # negociated translation; to prevent unnecessary fiddling with caller/inject, # we only do so when our beautify_urlpath would actually do what we want to - # avoid, i.e. when po_link_to = negotiated + # avoid, i.e. when po_link_to = negotiated. + # also avoid doing so when run by cgi_goto, so that the links on recentchanges + # page actually lead to the exact page they pretend to. if ($config{po_link_to} eq "negotiated") { my @caller = caller(1); - my $run_by_editpage = 0; - $run_by_editpage = 1 if (exists $caller[3] && defined $caller[3] - && $caller[3] eq "IkiWiki::cgi_editpage"); + my $use_orig = 0; + $use_orig = 1 if (exists $caller[3] && defined $caller[3] + && ($caller[3] eq "IkiWiki::cgi_editpage" || + $caller[3] eq "IkiWiki::Plugin::goto::cgi_goto") + ); inject(name => "IkiWiki::beautify_urlpath", call => $origsubs{'beautify_urlpath'}) - if $run_by_editpage; + if $use_orig; my $res = $origsubs{'urlto'}->($to,$from,$absolute); inject(name => "IkiWiki::beautify_urlpath", call => \&mybeautify_urlpath) - if $run_by_editpage; + if $use_orig; return $res; } else { -- cgit v1.2.3 From e1acb707db3f204708f88648ed80762689a15425 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 27 Aug 2009 12:57:04 -0400 Subject: cherry-picked fix for recentchanges links --- doc/plugins/po.mdwn | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index b77c545d9..2e32d78fd 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -332,18 +332,6 @@ Also, this may only happen if the page being linked to is coming from an underlay, and the underlays lack translation to a given language. --[[Joey]] -recentchanges links to po files -------------------------------- - -When a po file is changed, the recentchanges page shows a link such as -"sandbox.es". But, clicking on it goes to the English (or negotiated -language) version of the page. It would be better in this one case if -the link went direct to the translated version of the page. --[[Joey]] - -> The (untested) commit 496e8523c670 in my po branch might fix this... -> or at least, I believe, put someone on the right track. -> --[[intrigeri]] - Double commits of po files -------------------------- -- cgit v1.2.3 From 5e515b493c00c70095aeb8bad1e0b7757ed943db Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 27 Aug 2009 13:10:31 -0400 Subject: followups --- doc/plugins/po.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 2e32d78fd..65573b877 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -294,6 +294,12 @@ that po might be replacing the only link on a page, in error? > be either good (better overall l10n) or bad (break the other > plugin's goal). --[[intrigeri]] +>> Right.. well, the cases where links are added is very small. +>> Grepping for `add_link`, it's just done by link, camelcase, meta, and +>> tag. All of these are supposed to work just link regular links +>> so I'd think that is ok. We could probably remove the currently scary +>> comment about only wanting to change the first link. --[[Joey]] + Name of toplevel index page --------------------------- @@ -305,6 +311,14 @@ like "index.da". --[[Joey]] > test with a predicate call such as isindexpage($page). Such a predicate > function could then be overriden by the po plugin. --[[intrigeri]] +>> Could do that, but if you have such a function it's natural to want to +>> use it elsewhere. Not clear to me it would make sense for po to override +>> such a function if it were used in some of the other places that compare +>> to index. +>> +>> The other option would be for po to override the template setting. +>> --[[Joey]] + Pagespecs --------- -- cgit v1.2.3