rename

diff --git a/Makefile.PL b/Makefile.PL
index b6d1bd29228bcc9c9a95413c94a53bb8d6554f7d..61e2c147fd6c04ec3a2cbe3a79a8e61fdac4c482 100755 (executable)
--- 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
 
 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 \
        # 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
                        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
 
        rm -rf po/html po/underlays/.ikiwiki
        find po/underlays -name \*.mdwn | xargs rm -f
 

diff --git a/basewikipo.setup b/basewikipo.setup
deleted file mode 100644 (file)
index 1119747..0000000
--- a/basewikipo.setup
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/perl
-# Configuration file for ikiwiki that uses the po plugin to build/update
-# po files for pages in the base wiki.
-
-use IkiWiki::Setup::Standard {
-       wikiname => "ikiwiki",
-       srcdir => "po/underlays",
-       destdir => "po/html",
-       templatedir => "templates",
-       # we don't want to pull in the normal underlays
-       underlaydirbase => "po/underlays",
-       underlaydir => "po/underlays/basewiki",
-       discussion => 0,
-       locale => '',
-       verbose => 1,
-       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.
-        po_slave_languages => {
-               #'fr' => 'Français',
-                #'es' => 'Español',
-                #'de' => 'Deutsch',
-        },
-       po_translatable_pages => "*",
-}

diff --git a/debian/changelog b/debian/changelog
index dffab53497b78231eeb594b457d61dd887dfa56e..54d222fdfe5c302b35e24245ce3ba74bc02879e6 100644 (file)
--- 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)
   * 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 <joeyh@debian.org>  Tue, 02 Jun 2009 17:03:41 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Tue, 02 Jun 2009 17:03:41 -0400
 

diff --git a/doc/translation.mdwn b/doc/translation.mdwn
index 71e50cb1b2efb3b24fc0c5f64d4fb6622a27f4b6..005d9c8890382a70b08d06f0d067e27e5ee9b2fc 100644 (file)
--- 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.
 
    * 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,
 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.
    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.
 
    `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/underlaypo.setup b/underlaypo.setup
new file mode 100644 (file)
index 0000000..530bda4
--- /dev/null
+++ b/underlaypo.setup
@@ -0,0 +1,28 @@
+#!/usr/bin/perl
+# Configuration file for ikiwiki that uses the po plugin to build/update
+# po files for pages in the underlays.
+
+use IkiWiki::Setup::Standard {
+       wikiname => "ikiwiki",
+       srcdir => "po/underlays",
+       destdir => "po/html",
+       templatedir => "templates",
+       # we don't want to pull in the normal underlays
+       underlaydirbase => "po/underlays",
+       underlaydir => "po/underlays/basewiki",
+       discussion => 0,
+       locale => '',
+       verbose => 1,
+       syslog => 0,
+       add_plugins => [qw{po}],
+       po_master_language => { 'code' => 'en', 'name' => 'English' },
+       # 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',
+                #'de' => 'Deutsch',
+        },
+       po_translatable_pages => "*",
+}