X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7ef0c19cdfcb751d2e98c9a38e7460c3e16b3268..c8e3136d0091bd024e6dc1f3c21a10a92f2017d4:/IkiWiki/Plugin/po.pm diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index 01912f813..a307e5d6b 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -39,7 +39,7 @@ sub import { hook(type => "rename", id => "po", call => \&renamepages, first => 1); hook(type => "delete", id => "po", call => \&mydelete); hook(type => "change", id => "po", call => \&change); - # hook(type => "cansave", id => "po", call => \&cansave); + hook(type => "cansave", id => "po", call => \&cansave); hook(type => "canremove", id => "po", call => \&canremove); hook(type => "canrename", id => "po", call => \&canrename); hook(type => "editcontent", id => "po", call => \&editcontent); @@ -503,15 +503,6 @@ sub formbuilder (@) { } } } - - # Prevent invalid PO content to be saved. - # This cannot be done in the formbuilder_setup hook as the editpage plugin - # unconditionally sets the editcontent field's validate code later. - elsif ($form->field("do") eq "edit") { - if (istranslation($form->field("page"))) { - $form->field(name => "editcontent", validate => \&isvalidpo); - } - } } # ,---- @@ -1066,7 +1057,8 @@ sub isvalidpo ($) { if ($res) { return IkiWiki::SuccessReason->new("valid gettext data"); } - return IkiWiki::FailReason->new("invalid gettext data"); + return IkiWiki::FailReason->new("invalid gettext data, go back ". + "to previous page to go on with edit"); } # ,----