X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/49e605d71e4a703e6d4792ebe173f7a59908b2bb..2b175d7c1fe997277800c0d501332e96de475c6d:/doc/todo/l10n.mdwn

diff --git a/doc/todo/l10n.mdwn b/doc/todo/l10n.mdwn
index aebba05b2..a539f0424 100644
--- a/doc/todo/l10n.mdwn
+++ b/doc/todo/l10n.mdwn
@@ -1,3 +1,21 @@
+ikiwiki should be fully internationalized.
+
+----
+
+As to the hardcoded strings in ikiwiki, I've internationalized the program,
+and there is a po/ikiwiki.pot in the source that can be translated.
+--[[Joey]]
+
+----
+
+> The now merged po plugin handles l10n of wiki pages. The only missing
+> piece now is l10n of the templates.
+> --[[Joey]]
+
+----
+
+## template i18n
+
 From [[Recai]]:
 > Here is my initial work on ikiwiki l10n infrastructure (I'm sending it
 > before finalizing, there may be errors).
@@ -48,39 +66,19 @@ Birisi[1], ki muhtemelen bu sizsiniz, <TMPL_VAR WIKINAME>[2] üzerindeki
 bulundu. Parola: <TMPL_VAR USER_PASSWORD> -- ikiwiki [1] Parolayı isteyen
 kullanıcının ait IP adresi: <TMPL_VAR REMOTE_ADDR>[2] <TMPL_VAR WIKIURL>
 
-> Looks like, tmpl_process3 cannot preserve line breaks in template files.
-> For example, it processed the following template:
-
 This could be easily worked around in tmpl_process3, but I wouldn't like to
 maintain a separate utility.
 
 ----
 
-As to the hardcoded strings in ikiwiki, I've internationalized the program,
-and there is a po/ikiwiki.pot in the source that can be translated.
---[[Joey]]
-
-----
-
-Danish l10n of templates and basewiki is available with the following commands:
-
-    git clone http://source.jones.dk/ikiwiki.git newsite
-    cd newsite
-    make
-
-Updates are retrieved with this single command:
-
-    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.
+Another way to approach this would be to write a small program that outputs
+the current set of templates. Now i18n of that program is trivial,
+and it can be run once per language to generate localized templates.
 
-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
-separately but as an integral part of upstream source (GIT seems to not support subscribing to
-only parts of a repository).
+Then it's just a matter of installing the templates somewhere, and having
+them be used when a different language is enabled.
 
---[[JonasSmedegaard]]
+It would make sense to make the existing `locale` setting control which
+templates are used. But the [[plugins/po]] plugin would probably want to do
+something more, and use the actual language the page is written in.
+--[[Joey]]