diff options
| -rw-r--r-- | doc/bugs/xgettext_issue.mdwn | 34 | ||||
| -rw-r--r-- | doc/index/discussion.mdwn | 79 | ||||
| -rw-r--r-- | po/ikiwiki.pot | 382 |
3 files changed, 418 insertions, 77 deletions
diff --git a/doc/bugs/xgettext_issue.mdwn b/doc/bugs/xgettext_issue.mdwn new file mode 100644 index 000000000..7ad79a4ec --- /dev/null +++ b/doc/bugs/xgettext_issue.mdwn @@ -0,0 +1,34 @@ +I ran into a problem when installing from svn. I got "invalid variable +interpolation" errors for Wrappers.pm. I added the flag '--extract-all' to +'po/Makefile' and 'po/t' to the xgettext line. Once I did that I was able +to make and make test just fine. --HarleyPig + +> It would be helpful if you could post the actual error message you saw. +> Also would be nice to know what versions of perl and gettext you have. +> Perhaps your xgettext is an older version from before it natively +> supported perl. +> Adding --extract-all doesn't seem like a good idea, since this causes it +> to treat every string in the entire wiki as translatable. I don't know +> what you're talking about regarding 'po/t'. --[[Joey]] + +>> make[1]: Entering directory `/home/www/ikiwiki/po' +>> Rebuilding the pot file +>> xgettext ../IkiWiki/CGI.pm ../IkiWiki/Plugin/aggregate.pm ../IkiWiki/Plugin/brokenlinks.pm ../IkiWiki/Plugin/camelcase.pm ../IkiWiki/Plugin/ddate.pm ../IkiWiki/Plugin/favicon.pm ../IkiWiki/Plugin/fortune.pm ../IkiWiki/Plugin/goodstuff.pm ../IkiWiki/Plugin/googlecalendar.pm ../IkiWiki/Plugin/haiku.pm ../IkiWiki/Plugin/html.pm ../IkiWiki/Plugin/htmlscrubber.pm ../IkiWiki/Plugin/htmltidy.pm ../IkiWiki/Plugin/httpauth.pm ../IkiWiki/Plugin/img.pm ../IkiWiki/Plugin/inline.pm ../IkiWiki/Plugin/linkmap.pm ../IkiWiki/Plugin/map.pm ../IkiWiki/Plugin/mdwn.pm ../IkiWiki/Plugin/meta.pm ../IkiWiki/Plugin/mirrorlist.pm ../IkiWiki/Plugin/openid.pm ../IkiWiki/Plugin/orphans.pm ../IkiWiki/Plugin/otl.pm ../IkiWiki/Plugin/pagecount.pm ../IkiWiki/Plugin/pagestats.pm ../IkiWiki/Plugin/passwordauth.pm ../IkiWiki/Plugin/poll.pm ../IkiWiki/Plugin/polygen.pm ../IkiWiki/Plugin/rawhtml.pm ../IkiWiki/Plugin/rst.pm ../IkiWiki/Plugin/search.pm ../IkiWiki/Plugin/shortcut.pm ../IkiWiki/Plugin/sidebar.pm ../IkiWiki/Plugin/skeleton.pm ../IkiWiki/Plugin/smiley.pm ../IkiWiki/Plugin/tag.pm ../IkiWiki/Plugin/template.pm ../IkiWiki/Plugin/textile.pm ../IkiWiki/Plugin/toc.pm ../IkiWiki/Plugin/toggle.pm ../IkiWiki/Plugin/typography.pm ../IkiWiki/Plugin/wikitext.pm ../IkiWiki/Rcs/Stub.pm ../IkiWiki/Rcs/git.pm ../IkiWiki/Rcs/mercurial.pm ../IkiWiki/Rcs/svn.pm ../IkiWiki/Rcs/tla.pm ../IkiWiki/Render.pm ../IkiWiki/Setup.pm ../IkiWiki/Setup/Standard.pm ../IkiWiki/UserInfo.pm ../IkiWiki/Wrapper.pm ../ikiwiki.in ../IkiWiki.pm -o ikiwiki.pot -Lperl --add-comments=translators ../IkiWiki/Wrapper.pm:64: invalid variable interpolation at "$" +>> make[1]: *** [ikiwiki.pot] Error 1 +>> make[1]: Leaving directory `/home/www/ikiwiki/po' +>> make: *** [extra_build] Error 2 +>> +>> harleypig ikiwiki # xgettext --version +>> +>> xgettext (GNU gettext-tools) 0.15 +>> +>> harleypig ikiwiki # perl -v +>> +>> This is perl, v5.8.8 built for i686-linux +>> +>> Sorry about the po/t report ... it was the test file I used to figure out what was wrong and I forgot to remove it. This is against the subversion repository, version 2338. +>> The referenced line has a $! variable, which the documentation for gettext indicates is the problem. + +>>> Ok, I think that you need to upgrade xgettext to 0.16. However, there's +>>> no reason why you should need to rebuild the pot file anyway, so I've +>>> checked it into svn, and that's one problem [[bugs/done]]. diff --git a/doc/index/discussion.mdwn b/doc/index/discussion.mdwn index fc17ab380..05b034026 100644 --- a/doc/index/discussion.mdwn +++ b/doc/index/discussion.mdwn @@ -9,83 +9,8 @@ Note that for more formal bug reports or todo items, you can also edit the # Installation/Setup questions -I ran into a problem when installing from svn. I got "invalid variable -interpolation" errors for Wrappers.pm. I added the flag '--extract-all' to -'po/Makefile' and 'po/t' to the xgettext line. Once I did that I was able -to make and make test just fine. --HarleyPig - -> It would be helpful if you could post the actual error message you saw. -> Also would be nice to know what versions of perl and gettext you have. -> Perhaps your xgettext is an older version from before it natively -> supported perl. -> Adding --extract-all doesn't seem like a good idea, since this causes it -> to treat every string in the entire wiki as translatable. I don't know -> what you're talking about regarding 'po/t'. --[[Joey]] - ->> make[1]: Entering directory `/home/www/ikiwiki/po' ->> Rebuilding the pot file ->> xgettext ../IkiWiki/CGI.pm ../IkiWiki/Plugin/aggregate.pm ../IkiWiki/Plugin/brokenlinks.pm ../IkiWiki/Plugin/camelcase.pm ../IkiWiki/Plugin/ddate.pm ../IkiWiki/Plugin/favicon.pm ../IkiWiki/Plugin/fortune.pm ../IkiWiki/Plugin/goodstuff.pm ../IkiWiki/Plugin/googlecalendar.pm ../IkiWiki/Plugin/haiku.pm ../IkiWiki/Plugin/html.pm ../IkiWiki/Plugin/htmlscrubber.pm ../IkiWiki/Plugin/htmltidy.pm ../IkiWiki/Plugin/httpauth.pm ../IkiWiki/Plugin/img.pm ../IkiWiki/Plugin/inline.pm ../IkiWiki/Plugin/linkmap.pm ../IkiWiki/Plugin/map.pm ../IkiWiki/Plugin/mdwn.pm ../IkiWiki/Plugin/meta.pm ../IkiWiki/Plugin/mirrorlist.pm ../IkiWiki/Plugin/openid.pm ../IkiWiki/Plugin/orphans.pm ../IkiWiki/Plugin/otl.pm ../IkiWiki/Plugin/pagecount.pm ../IkiWiki/Plugin/pagestats.pm ../IkiWiki/Plugin/passwordauth.pm ../IkiWiki/Plugin/poll.pm ../IkiWiki/Plugin/polygen.pm ../IkiWiki/Plugin/rawhtml.pm ../IkiWiki/Plugin/rst.pm ../IkiWiki/Plugin/search.pm ../IkiWiki/Plugin/shortcut.pm ../IkiWiki/Plugin/sidebar.pm ../IkiWiki/Plugin/skeleton.pm ../IkiWiki/Plugin/smiley.pm ../IkiWiki/Plugin/tag.pm ../IkiWiki/Plugin/template.pm ../IkiWiki/Plugin/textile.pm ../IkiWiki/Plugin/toc.pm ../IkiWiki/Plugin/toggle.pm ../IkiWiki/Plugin/typography.pm ../IkiWiki/Plugin/wikitext.pm ../IkiWiki/Rcs/Stub.pm ../IkiWiki/Rcs/git.pm ../IkiWiki/Rcs/mercurial.pm ../IkiWiki/Rcs/svn.pm ../IkiWiki/Rcs/tla.pm ../IkiWiki/Render.pm ../IkiWiki/Setup.pm ../IkiWiki/Setup/Standard.pm ../IkiWiki/UserInfo.pm ../IkiWiki/Wrapper.pm ../ikiwiki.in ../IkiWiki.pm -o ikiwiki.pot -Lperl --add-comments=translators ../IkiWiki/Wrapper.pm:64: invalid variable interpolation at "$" ->> make[1]: *** [ikiwiki.pot] Error 1 ->> make[1]: Leaving directory `/home/www/ikiwiki/po' ->> make: *** [extra_build] Error 2 ->> ->> harleypig ikiwiki # xgettext --version ->> ->> xgettext (GNU gettext-tools) 0.15 ->> ->> harleypig ikiwiki # perl -v ->> ->> This is perl, v5.8.8 built for i686-linux ->> ->> Sorry about the po/t report ... it was the test file I used to figure out what was wrong and I forgot to remove it. This is against the subversion repository, version 2338. ->> The referenced line has a $! variable, which the documentation for gettext indicates is the problem. - -I have just installed ikiwiki and it works - at least I have the example index.mdwn page -compiled and visible. However I have a few issues/problems:- - -* A couple of the 'optional' Perl modules aren't optional, you can't install ikiwiki without them, -these are HTML::Template and HTML::Scrubber (at least I think it was these two, it's a bit messy -to go back and find out). - -> You're right, HTML::Template is required. HTML::Scrubber is only required -> in the default configuration, and is optional if the htmlscrubber plugin -> is disabled. --[[Joey]] - -* I don't seem to have got an ikiwiki man page created. - -> It should be installed in /usr/share/man, or a similar directory -> depending on how your perl is set up and how you did the install. -> --[[Joey]] - -> Found it, in /usr/local/share/man, since no other man pages are in either /usr/share/man or in /usr/local/share/man the ikiwiki -> man page is a bit lonely, and more to the point not on my MANPATH. Still I have found it now, I'll just move it to somewhere -> more sensible. [[Chris]] - -* Running "ikiwiki --setup ikiwiki.setup" doesn't do anything. I have edited ikiwiki.setup to -my local settings. There are no errors but neither does anything get compiled. An ikiwiki -command to explicitly do the compile works fine. Am I misunderstanding something here? - -> Further tests indicate that ikiwiki isn't seeing changed files so doesn't always rebuild. -> How does ikiwiki decide when to rebuild? I tried a full command line like "ikiwiki --verbose ikiwiki ~/public_html/ikiwiki --url=http://www.isbd.ltd.uk/~chris/ikiwiki/" and that doesn't do anything -either though it was the command line I originally used to compile. After a long interval I 'touch'ed -the files and then it *did* compile but 'touch'ing the files after a few minutes only doesn't seem to force a recompile. I'm even more confused! - -> ikiwiki only compiles files whose modification times have changed. It -> should see any change made as close as a second after the last compile. -> When run with --setup, ikiwiki always rebuilds every file in the wiki. If -> --setup is not working, you must have it pointed at the wrong path or -> something; you can pass -v to see what it's doing. I don't know why it -> would not see recently changed files; you could try stracing it. -> --[[Joey]] - -> OK, thanks, I don't quite know what was happening before but it seems to be working right now. -> --[[Chris]] - ->> Weird. I wish I knew what happened, but as it's working now, I'm ->> guessing some kind of user error was involved. --[[Joey]] - -* I wish there was a mailing list, much easier for this sort of stuff than this, apart from -anything else I get to use a decent editor. +(I've moved HarleyPig's problem to its [[own_page|bugs/xgettext_issue]] +--[[Joey]]) ---- # Excellent - how do I translate a TWiki site? diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot new file mode 100644 index 000000000..4d312e2e7 --- /dev/null +++ b/po/ikiwiki.pot @@ -0,0 +1,382 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-27 20:16-0500\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" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. translators: The first parameter is a page name, +#. translators: second is the user who locked it. +#: ../IkiWiki/CGI.pm:51 +#, perl-format +msgid "%s is locked by %s and cannot be edited" +msgstr "" + +#: ../IkiWiki/CGI.pm:140 +msgid "You need to log in first." +msgstr "" + +#: ../IkiWiki/CGI.pm:257 +msgid "Preferences saved." +msgstr "" + +#: ../IkiWiki/CGI.pm:407 ../IkiWiki/Plugin/inline.pm:160 +#: ../IkiWiki/Render.pm:97 ../IkiWiki/Render.pm:165 +msgid "discussion" +msgstr "" + +#: ../IkiWiki/CGI.pm:446 +#, perl-format +msgid "creating %s" +msgstr "" + +#: ../IkiWiki/CGI.pm:463 ../IkiWiki/CGI.pm:506 +#, perl-format +msgid "editing %s" +msgstr "" + +#: ../IkiWiki/CGI.pm:629 +msgid "You are banned." +msgstr "" + +#: ../IkiWiki/CGI.pm:656 +msgid "login failed, perhaps you need to turn on cookies?" +msgstr "" + +#: ../IkiWiki/Plugin/aggregate.pm:61 +#, perl-format +msgid "aggregate plugin missing %s parameter" +msgstr "" + +#: ../IkiWiki/Plugin/aggregate.pm:89 +msgid "new feed" +msgstr "" + +#: ../IkiWiki/Plugin/aggregate.pm:103 +msgid "posts" +msgstr "" + +#: ../IkiWiki/Plugin/aggregate.pm:105 +msgid "new" +msgstr "" + +#: ../IkiWiki/Plugin/aggregate.pm:206 +#, perl-format +msgid "expiring %s (%s days old)" +msgstr "" + +#: ../IkiWiki/Plugin/aggregate.pm:213 +#, perl-format +msgid "expiring %s" +msgstr "" + +#: ../IkiWiki/Plugin/aggregate.pm:236 +#, perl-format +msgid "checking feed %s ..." +msgstr "" + +#: ../IkiWiki/Plugin/aggregate.pm:241 +#, perl-format +msgid "could not find feed at %s" +msgstr "" + +#: ../IkiWiki/Plugin/aggregate.pm:250 +msgid "feed crashed XML::Feed!" +msgstr "" + +#: ../IkiWiki/Plugin/aggregate.pm:273 +#, perl-format +msgid "processed ok at %s" +msgstr "" + +#: ../IkiWiki/Plugin/aggregate.pm:328 +#, perl-format +msgid "creating new page %s" +msgstr "" + +#: ../IkiWiki/Plugin/brokenlinks.pm:36 +msgid "There are no broken links!" +msgstr "" + +#: ../IkiWiki/Plugin/fortune.pm:18 +msgid "fortune failed" +msgstr "" + +#: ../IkiWiki/Plugin/googlecalendar.pm:22 +msgid "googlecalendar failed to find url in html" +msgstr "" + +#: ../IkiWiki/Plugin/inline.pm:36 +msgid "Must specify url to wiki with --url when using --rss or --atom" +msgstr "" + +#: ../IkiWiki/Plugin/inline.pm:96 +#, perl-format +msgid "unknown sort type %s" +msgstr "" + +#: ../IkiWiki/Plugin/inline.pm:372 +msgid "RPC::XML::Client not found, not pinging" +msgstr "" + +#: ../IkiWiki/Plugin/linkmap.pm:99 +msgid "linkmap failed to run dot" +msgstr "" + +#: ../IkiWiki/Plugin/mdwn.pm:37 +#, perl-format +msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" +msgstr "" + +#: ../IkiWiki/Plugin/mirrorlist.pm:23 +msgid "Mirrors" +msgstr "" + +#: ../IkiWiki/Plugin/mirrorlist.pm:23 +msgid "Mirror" +msgstr "" + +#: ../IkiWiki/Plugin/openid.pm:36 +msgid "What's this?" +msgstr "" + +#: ../IkiWiki/Plugin/openid.pm:37 +msgid "Get an OpenID" +msgstr "" + +#: ../IkiWiki/Plugin/orphans.pm:41 +msgid "All pages are linked to by other pages." +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:104 +msgid "(use FirstnameLastName)" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:144 +msgid "Account creation successful. Now you can Login." +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:147 +msgid "Error creating account." +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:168 +msgid "Failed to send mail" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:170 +msgid "Your password has been emailed to you." +msgstr "" + +#: ../IkiWiki/Plugin/poll.pm:64 +msgid "vote" +msgstr "" + +#: ../IkiWiki/Plugin/poll.pm:72 +msgid "Total votes:" +msgstr "" + +#: ../IkiWiki/Plugin/polygen.pm:32 +msgid "polygen not installed" +msgstr "" + +#: ../IkiWiki/Plugin/polygen.pm:51 +msgid "polygen failed" +msgstr "" + +#: ../IkiWiki/Plugin/search.pm:34 +#, perl-format +msgid "Must specify %s when using the search plugin" +msgstr "" + +#: ../IkiWiki/Plugin/search.pm:58 +msgid "cleaning hyperestraier search index" +msgstr "" + +#: ../IkiWiki/Plugin/search.pm:64 +msgid "updating hyperestraier search index" +msgstr "" + +#: ../IkiWiki/Plugin/shortcut.pm:24 +msgid "shortcut missing name or url parameter" +msgstr "" + +#. translators: This is used to display what shortcuts are defined. +#. translators: First parameter is the name of the shortcut, the second +#. translators: is an URL. +#: ../IkiWiki/Plugin/shortcut.pm:33 +#, perl-format +msgid "shortcut %s points to %s" +msgstr "" + +#: ../IkiWiki/Plugin/smiley.pm:22 +msgid "failed to parse any smileys, disabling plugin" +msgstr "" + +#: ../IkiWiki/Plugin/template.pm:19 +msgid "template missing id parameter" +msgstr "" + +#: ../IkiWiki/Plugin/template.pm:26 +#, perl-format +msgid "template %s not found" +msgstr "" + +#: ../IkiWiki/Plugin/template.pm:45 +msgid "template failed to process:" +msgstr "" + +#: ../IkiWiki/Rcs/Stub.pm:66 +msgid "getctime not implemented" +msgstr "" + +#: ../IkiWiki/Rcs/svn.pm:205 +msgid "" +"REV is not set, not running from svn post-commit hook, cannot send " +"notifications" +msgstr "" + +#: ../IkiWiki/Render.pm:101 +msgid "Discussion" +msgstr "" + +#: ../IkiWiki/Render.pm:232 ../IkiWiki/Render.pm:252 +#, perl-format +msgid "skipping bad filename %s" +msgstr "" + +#: ../IkiWiki/Render.pm:292 +#, perl-format +msgid "removing old page %s" +msgstr "" + +#: ../IkiWiki/Render.pm:311 +#, perl-format +msgid "scanning %s" +msgstr "" + +#: ../IkiWiki/Render.pm:320 +#, perl-format +msgid "rendering %s" +msgstr "" + +#: ../IkiWiki/Render.pm:332 +#, perl-format +msgid "rendering %s, which links to %s" +msgstr "" + +#: ../IkiWiki/Render.pm:349 +#, perl-format +msgid "rendering %s, which depends on %s" +msgstr "" + +#: ../IkiWiki/Render.pm:387 +#, perl-format +msgid "rendering %s, to update its backlinks" +msgstr "" + +#: ../IkiWiki/Render.pm:399 +#, perl-format +msgid "removing %s, no longer rendered by %s" +msgstr "" + +#: ../IkiWiki/Render.pm:425 +#, perl-format +msgid "ikiwiki: cannot render %s" +msgstr "" + +#. translators: The first parameter is a filename, and the second +#. translators: is a (probably not translated) error message. +#: ../IkiWiki/Setup.pm:15 +#, perl-format +msgid "cannot read %s: %s" +msgstr "" + +#: ../IkiWiki/Setup/Standard.pm:32 +msgid "generating wrappers.." +msgstr "" + +#: ../IkiWiki/Setup/Standard.pm:68 +msgid "rebuilding wiki.." +msgstr "" + +#: ../IkiWiki/Setup/Standard.pm:71 +msgid "refreshing wiki.." +msgstr "" + +#: ../IkiWiki/Setup/Standard.pm:80 +msgid "done" +msgstr "" + +#. translators: The three variables are the name of the wiki, +#. translators: A list of one or more pages that were changed, +#. translators: And the name of the user making the change. +#. translators: This is used as the subject of a commit email. +#: ../IkiWiki/UserInfo.pm:139 +#, perl-format +msgid "update of %s's %s by %s" +msgstr "" + +#: ../IkiWiki/Wrapper.pm:16 +#, perl-format +msgid "%s doesn't seem to be executable" +msgstr "" + +#: ../IkiWiki/Wrapper.pm:20 +msgid "cannot create a wrapper that uses a setup file" +msgstr "" + +#: ../IkiWiki/Wrapper.pm:24 +msgid "wrapper filename not specified" +msgstr "" + +#. translators: The first parameter is a filename, and the second is +#. translators: a (probably not translated) error message. +#: ../IkiWiki/Wrapper.pm:64 +#, perl-format +msgid "failed to write %s: %s" +msgstr "" + +#. translators: The parameter is a C filename. +#: ../IkiWiki/Wrapper.pm:100 +#, perl-format +msgid "failed to compile %s" +msgstr "" + +#. translators: The parameter is a filename. +#: ../IkiWiki/Wrapper.pm:108 +#, perl-format +msgid "successfully generated %s" +msgstr "" + +#: ../ikiwiki.in:13 +msgid "usage: ikiwiki [options] source dest" +msgstr "" + +#: ../IkiWiki.pm:101 +msgid "Must specify url to wiki with --url when using --cgi" +msgstr "" + +#: ../IkiWiki.pm:146 ../IkiWiki.pm:147 +msgid "Error" +msgstr "" + +#. translators: The first parameter is a +#. translators: preprocessor directive name, +#. translators: the second a page name, the +#. translators: third a number. +#: ../IkiWiki.pm:526 +#, perl-format +msgid "%s preprocessing loop detected on %s at depth %i" +msgstr "" |