Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / todo / l10n.mdwn

diff --git a/doc/todo/l10n.mdwn b/doc/todo/l10n.mdwn
index e035d344a0b16e953c9c71c0d36119cbca01053a..f777a33dfdc76145917c0e14ed87c4ceb63ab86b 100644 (file)
--- a/doc/todo/l10n.mdwn
+++ b/doc/todo/l10n.mdwn
@@ -72,11 +72,8 @@ Updates are retrieved with this single command:
 
     make
 
 
     make
 

-Right now the l10n is maintained by manually comparing against each new upstream release, and
-updating both the master mirror and the l10n as needed.
-
-Work is in progress to semi-automate this to still check manually for updates, but maintain the
-l10n as PO files - to allow more translations to more than the few languages I know about myself.
+l10n is maintained using po4a for basewiki, smiley and templates - please  send me PO files if you
+translate to other languagess than the few I know about myself: <dr@jones.dk>

 
 As upstream ikiwiki is now maintained in GIT too, keeping the master mirror in sync with upstream
 could probably be automated even more - but an obstacle seems to be that content is not maintained
 
 As upstream ikiwiki is now maintained in GIT too, keeping the master mirror in sync with upstream
 could probably be automated even more - but an obstacle seems to be that content is not maintained


@@ -85,15 +82,18 @@ only parts of a repository).
 
 For example use, here's how to roll out a clone of the [Redpill support site](http://support.redpill.dk/):
 
 
 For example use, here's how to roll out a clone of the [Redpill support site](http://support.redpill.dk/):
 

-    mkdir -p ~/private_webdata
-    git clone http://source.tedpill.dk/support.git ~/private_webdata/support.redpill.dk
-    cd ~/private_webdata/support.redpill.dk
-    make
-    mkdir -p ~/public_websites/support.redpill.dk
-    mkdir -p ~/public_websites/source.redpill.dk/support_redpill_content.git/hooks

     mkdir -p ~/public_cgi/support.redpill.dk
     mkdir -p ~/public_cgi/support.redpill.dk

-    make install
+    git clone git://source.jones.dk/bin
+    bin/localikiwikicreatesite -o git://source.redpill.dk/support rpdemo

 
 (Redpill support is inspired by <http://help.riseup.net> but needs to be reusable for several similarly configured networks)
 
 --[[JonasSmedegaard]]
 
 (Redpill support is inspired by <http://help.riseup.net> but needs to be reusable for several similarly configured networks)
 
 --[[JonasSmedegaard]]

+
+> I don't understand at all why you're using git the way you are.
+> 
+> I think that this needs to be reworked into a patch against the regular
+> ikiwiki tree, that adds the po4a stuff needed to generate the pot files for the
+> basewiki and template content, as well as the stuff that generates the
+> translated versions of those from the po files.
+> --[[Joey]]