diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-04-23 14:07:28 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-04-23 14:07:28 -0400 |
| commit | 748aa7af777caaa32ac5ab56e707509b3739b49e (patch) | |
| tree | e5ab8791c45420d114efee9df68cee2ef8181478 /po/ikiwiki.pot | |
| parent | 2c74f09bb870c717669f273ba7d4aa1637dcccf1 (diff) | |
pagespec error/failure distinction and error display by inline
* Add IkiWiki::ErrorReason objects, and modify pagespecs to return
them in cases where they fail to match due to a configuration or syntax
error.
* inline: Display a handy error message if the inline cannot display any
pages due to such an error.
This is perhaps somewhat incomplete, as other users of pagespecs do not
display the error, and will eventually need similar modifications to inline.
I should probably factor out a pagespec_match_all function and make it throw
ErrorReasons.
Diffstat (limited to 'po/ikiwiki.pot')
| -rw-r--r-- | po/ikiwiki.pot | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index d05a4a693..6c9b16289 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-04-04 18:50-0400\n" +"POT-Creation-Date: 2009-04-23 14:02-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -177,14 +177,14 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:105 +#: ../IkiWiki/Plugin/blogspam.pm:108 msgid "" "Sorry, but that looks like spam to <a href=\"http://blogspam.net/" "\">blogspam</a>: " msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:361 ../IkiWiki/Plugin/opendiscussion.pm:26 +#: ../IkiWiki/Plugin/inline.pm:368 ../IkiWiki/Plugin/opendiscussion.pm:26 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79 #: ../IkiWiki/Render.pm:149 msgid "discussion" @@ -405,29 +405,34 @@ msgstr "" msgid "missing pages parameter" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:200 +#: ../IkiWiki/Plugin/inline.pm:198 +#, perl-format +msgid "cannot match pages: %s" +msgstr "" + +#: ../IkiWiki/Plugin/inline.pm:207 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:211 +#: ../IkiWiki/Plugin/inline.pm:218 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:314 +#: ../IkiWiki/Plugin/inline.pm:321 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:334 +#: ../IkiWiki/Plugin/inline.pm:341 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:369 ../IkiWiki/Render.pm:83 +#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Render.pm:83 msgid "Discussion" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:600 +#: ../IkiWiki/Plugin/inline.pm:607 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -868,9 +873,9 @@ msgid "" "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:433 +#: ../IkiWiki/Plugin/websetup.pm:436 #, perl-format -msgid "<p class=\"error\">Error: %s exited nonzero (%s)" +msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" #: ../IkiWiki/Receive.pm:35 |