From: Joey Hess Date: Sun, 19 Jul 2009 12:54:15 +0000 (+0200) Subject: rename X-Git-Tag: 3.15~169 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f08bd11f4202da9d842884f609930957926fcec0;p=ikiwiki.git rename --- diff --git a/Makefile.PL b/Makefile.PL index b6d1bd292..61e2c147f 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -47,7 +47,7 @@ extra_build: ikiwiki.out ikiwiki.setup docwiki docwiki: ikiwiki.out $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh -basewikipo: ikiwiki.out +underlaypo: ikiwiki.out # copy all the files we want to translate into the # po/underlays scrdir. for file in `find underlays -follow -name \*.mdwn`; do \ @@ -61,7 +61,7 @@ basewikipo: ikiwiki.out install -m 644 $$file po/underlays/directives/ikiwiki/directive; \ fi \ done - $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup basewikipo.setup -refresh + $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup underlaypo.setup -refresh rm -rf po/html po/underlays/.ikiwiki find po/underlays -name \*.mdwn | xargs rm -f diff --git a/debian/changelog b/debian/changelog index dffab5349..54d222fdf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ ikiwiki (3.15) unstable; urgency=low * rename: Refactor subpage rename handling code into rename hook. (intrigeri) * po: New plugin, suporting translation of wiki pages using po files. (intrigeri) + * Add underlaypo setup that can be used to generate po files for + translating the underlays. -- Joey Hess Tue, 02 Jun 2009 17:03:41 -0400 diff --git a/doc/translation.mdwn b/doc/translation.mdwn index 71e50cb1b..005d9c889 100644 --- a/doc/translation.mdwn +++ b/doc/translation.mdwn @@ -22,18 +22,13 @@ essentially three pieces needed for a complete translation: * The names and values of parameters, both to the program, in the setup file, and in preprocessor directives. -1. The templates also need to be translated. Some work has been done on an - infrastructure for maintaining translated templates, as documented in - [[todo/l10n]], but until that's complete, you'd need to copy and - translate the templates by hand. - 1. The [[basewiki]] itself needs to be translated. The [[plugins/contrib/po]] ikiwiki plugin will allow translating wikis using po files and can be used for this. To generate the po and pot files for translating the basewiki, - get ikiwiki's source, and edit the `basewikipo.setup` file, - adding your language. Then run 'perl Makefile.PL; make basewikipo`. + get ikiwiki's source, and edit the `underlaypo.setup` file, + adding your language. Then run 'perl Makefile.PL; make underlaypo`. This will generate many po files under `po/underlays`. The first ones you'll want to translate are in the `po/underlays/basewiki` directory, which is really not very large, just a few thousand words. @@ -41,4 +36,7 @@ essentially three pieces needed for a complete translation: `po/underlays/directives`, which are a much larger tens of thousands of words. - +1. The templates also need to be translated. Some work has been done on an + infrastructure for maintaining translated templates, as documented in + [[todo/l10n]], but until that's complete, you'd need to copy and + translate the templates by hand. diff --git a/basewikipo.setup b/underlaypo.setup similarity index 75% rename from basewikipo.setup rename to underlaypo.setup index 111974727..530bda46b 100644 --- a/basewikipo.setup +++ b/underlaypo.setup @@ -1,6 +1,6 @@ #!/usr/bin/perl # Configuration file for ikiwiki that uses the po plugin to build/update -# po files for pages in the base wiki. +# po files for pages in the underlays. use IkiWiki::Setup::Standard { wikiname => "ikiwiki", @@ -16,9 +16,9 @@ use IkiWiki::Setup::Standard { syslog => 0, add_plugins => [qw{po}], po_master_language => { 'code' => 'en', 'name' => 'English' }, - # List here all languages for which someone is working on - # translating the base wiki. Listing languages that are not - # being actively worked on will excessively bloat things. + # List here all languages that have translations. + # Listing languages that are not being actively + # translated on will excessively bloat things. po_slave_languages => { #'fr' => 'Français', #'es' => 'Español',