From a80a5a90e4a7a7b664112e69fd01ce02fe9fb76a Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 20 Dec 2010 14:49:45 +0100 Subject: bug+patch Signed-off-by: intrigeri --- doc/bugs/urlto_API_change_breaks_wikis_with_po_plugin.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/bugs/urlto_API_change_breaks_wikis_with_po_plugin.mdwn (limited to 'doc/bugs') diff --git a/doc/bugs/urlto_API_change_breaks_wikis_with_po_plugin.mdwn b/doc/bugs/urlto_API_change_breaks_wikis_with_po_plugin.mdwn new file mode 100644 index 000000000..07e925a03 --- /dev/null +++ b/doc/bugs/urlto_API_change_breaks_wikis_with_po_plugin.mdwn @@ -0,0 +1,11 @@ +The po plugin needs to be updated to match the urlto sub API and +signature changes. Else a wiki with the po plugin enabled cannot be +refreshed / rebuilt because of (correct) Perl errors. + +My po branch contains a fix. + +Also, I fear the lack of any useful `$from` parameter might break some +l10n'd link niceness when using `po_link_to = current` but I have not +investigated this yet. + +--[[intrigeri]] -- cgit v1.2.3 From f83fa962d5a7d43eed5d0902771365b717b224b4 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 20 Dec 2010 23:08:14 +0000 Subject: looks good to merge, suggestions for further testing --- .../urlto_API_change_breaks_wikis_with_po_plugin.mdwn | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'doc/bugs') diff --git a/doc/bugs/urlto_API_change_breaks_wikis_with_po_plugin.mdwn b/doc/bugs/urlto_API_change_breaks_wikis_with_po_plugin.mdwn index 07e925a03..9690b8b7b 100644 --- a/doc/bugs/urlto_API_change_breaks_wikis_with_po_plugin.mdwn +++ b/doc/bugs/urlto_API_change_breaks_wikis_with_po_plugin.mdwn @@ -3,9 +3,25 @@ signature changes. Else a wiki with the po plugin enabled cannot be refreshed / rebuilt because of (correct) Perl errors. My po branch contains a fix. +--[[intrigeri]] + +> The commit looks sane to me, for what it's worth. Joey, please +> consider merging? --[[smcv]] Also, I fear the lack of any useful `$from` parameter might break some l10n'd link niceness when using `po_link_to = current` but I have not investigated this yet. - --[[intrigeri]] + +> If `urlto` is called without a second parameter, it means we need +> a URL valid from either the CGI URL or any page in the wiki, +> (so we'd previously have set the third parameter true), but we +> don't *necessarily* need an absolute URL - so return what you'd +> have returned if asked for an absolute URL, but looking like +> `/bugs/` rather than `http://ikiwiki.info/bugs/` if possible. +> +> It looks as though `beautify_urlpath` under `po_link_to = current`, +> and 3-argument `urlto`, aren't tested by `t/po.t` - perhaps you +> could add some test cases there? To test 3-argument `urlto` you'd +> need to add `$config{baseurl} = "http://example.com"` or +> something. --[[smcv]] -- cgit v1.2.3 From fd4cfe722e99ee5a90030a6e042330633cab6145 Mon Sep 17 00:00:00 2001 From: ricola Date: Wed, 22 Dec 2010 08:32:01 +0000 Subject: --- ...should_not_override_the_title_on_the_homepage.mdwn | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 doc/bugs/po_plugin_should_not_override_the_title_on_the_homepage.mdwn (limited to 'doc/bugs') diff --git a/doc/bugs/po_plugin_should_not_override_the_title_on_the_homepage.mdwn b/doc/bugs/po_plugin_should_not_override_the_title_on_the_homepage.mdwn new file mode 100644 index 000000000..a6287714b --- /dev/null +++ b/doc/bugs/po_plugin_should_not_override_the_title_on_the_homepage.mdwn @@ -0,0 +1,19 @@ +The po plugin systematically overrides the title of the homepage with the wikiname. This prevents explicitly changing it with a meta directive. It should rather check whether it was overridden before setting it back. + +Here is a simple patch for that: + + diff --git a/Plugin/po.pm b/Plugin/po.pm + index 6395ebd..a048c6a 100644 + --- a/Plugin/po.pm + +++ b/Plugin/po.pm + @@ -333,7 +333,7 @@ sub pagetemplate (@) { + && $masterpage eq "index") { + $template->param('parentlinks' => []); + } + - if (ishomepage($page) && $template->query(name => "title")) { + + if (ishomepage($page) && $template->query(name => "title") && !$template->query(name => "title_overridden")) { + $template->param(title => $config{wikiname}); + } + } + +Thanks. -- cgit v1.2.3 From fd6d4fda6a95f8318c33aed66c4fcf05aad72b86 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Wed, 22 Dec 2010 12:50:50 +0100 Subject: Rename new bug so that it appears on the po plugin page. --- ...should_not_override_the_title_on_the_homepage.mdwn | 19 +++++++++++++++++++ ...should_not_override_the_title_on_the_homepage.mdwn | 19 ------------------- 2 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 doc/bugs/po:_plugin_should_not_override_the_title_on_the_homepage.mdwn delete mode 100644 doc/bugs/po_plugin_should_not_override_the_title_on_the_homepage.mdwn (limited to 'doc/bugs') diff --git a/doc/bugs/po:_plugin_should_not_override_the_title_on_the_homepage.mdwn b/doc/bugs/po:_plugin_should_not_override_the_title_on_the_homepage.mdwn new file mode 100644 index 000000000..a6287714b --- /dev/null +++ b/doc/bugs/po:_plugin_should_not_override_the_title_on_the_homepage.mdwn @@ -0,0 +1,19 @@ +The po plugin systematically overrides the title of the homepage with the wikiname. This prevents explicitly changing it with a meta directive. It should rather check whether it was overridden before setting it back. + +Here is a simple patch for that: + + diff --git a/Plugin/po.pm b/Plugin/po.pm + index 6395ebd..a048c6a 100644 + --- a/Plugin/po.pm + +++ b/Plugin/po.pm + @@ -333,7 +333,7 @@ sub pagetemplate (@) { + && $masterpage eq "index") { + $template->param('parentlinks' => []); + } + - if (ishomepage($page) && $template->query(name => "title")) { + + if (ishomepage($page) && $template->query(name => "title") && !$template->query(name => "title_overridden")) { + $template->param(title => $config{wikiname}); + } + } + +Thanks. diff --git a/doc/bugs/po_plugin_should_not_override_the_title_on_the_homepage.mdwn b/doc/bugs/po_plugin_should_not_override_the_title_on_the_homepage.mdwn deleted file mode 100644 index a6287714b..000000000 --- a/doc/bugs/po_plugin_should_not_override_the_title_on_the_homepage.mdwn +++ /dev/null @@ -1,19 +0,0 @@ -The po plugin systematically overrides the title of the homepage with the wikiname. This prevents explicitly changing it with a meta directive. It should rather check whether it was overridden before setting it back. - -Here is a simple patch for that: - - diff --git a/Plugin/po.pm b/Plugin/po.pm - index 6395ebd..a048c6a 100644 - --- a/Plugin/po.pm - +++ b/Plugin/po.pm - @@ -333,7 +333,7 @@ sub pagetemplate (@) { - && $masterpage eq "index") { - $template->param('parentlinks' => []); - } - - if (ishomepage($page) && $template->query(name => "title")) { - + if (ishomepage($page) && $template->query(name => "title") && !$template->query(name => "title_overridden")) { - $template->param(title => $config{wikiname}); - } - } - -Thanks. -- cgit v1.2.3