Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/debian/changelog b/debian/changelog
index 39ff60717a3bb49001ac986d6d1f7ff529d0cef5..88fac32eee0b96551ab6d3896e57b3b8ce217d4e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ikiwiki (3.141593) UNRELEASED; urgency=low
   * meta, img: Fix bugs in dependency code. (smcv)
   * Allow building ikiwiki on systems w/o po4a --
     building of the translated underlays will be skipped in this case.
+  * Add basic styling of po plugin's languages list.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
 

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 2fbf67016b173f747d09245786a131923a60f062..5016f1037dac7329cda77de1b28f5a94895201af 100644 (file)
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -277,6 +277,23 @@ That used to be so, but the bug was fixed. Does this mean
 that po might be replacing the only link on a page, in error? 
 --[[Joey]] 
 
+Name of toplevel index page
+---------------------------
+
+Normally at the top index page of a wiki, you see the wiki name at
+the top. However, at the top *translated* index page, you see something
+like "index.da". --[[Joey]] 
+
+Pagespecs
+---------
+
+I was suprised that, when using the map directive, a pagespec of "*"
+listed all the translated pages as well as regular pages. That can 
+make a big difference to an existing wiki when po is turned on,
+and seems generally not wanted.
+(OTOH, you do want to match translated pages by
+default when locking pages.) --[[Joey]]
+
 Documentation
 -------------
 

diff --git a/doc/style.css b/doc/style.css
index e6512aed8834971abf312c3d1ae36f940630e7f9..4fa48b1404f63a1cfc5352fa7601775c476d2ecf 100644 (file)
--- a/doc/style.css
+++ b/doc/style.css
@@ -32,6 +32,15 @@
        border-bottom: 0;
 }
 
+#otherlanguages ul {
+       margin: 0;
+       padding: 6px;
+       list-style-type: none;
+}
+.pageheader #otherlanguages {
+       border-bottom: 1px solid #000;
+}
+
 div.inlinecontent {
        margin-top: .4em;
 }

diff --git a/doc/todo/l10n.mdwn b/doc/todo/l10n.mdwn
index bba1034947ccc822d93933151e795f75cd8062f0..fed3f63b69b3b667750b917bea6e886f734052f0 100644 (file)
--- a/doc/todo/l10n.mdwn
+++ b/doc/todo/l10n.mdwn
@@ -1,3 +1,19 @@
+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]]
+
+----
+
 From [[Recai]]:
 > Here is my initial work on ikiwiki l10n infrastructure (I'm sending it
 > before finalizing, there may be errors).
@@ -54,48 +70,3 @@ kullanıcının ait IP adresi: <TMPL_VAR REMOTE_ADDR>[2] <TMPL_VAR WIKIURL>
 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
-
-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
-separately but as an integral part of upstream source (GIT seems to not support subscribing to
-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/):
-
-    mkdir -p ~/public_cgi/support.redpill.dk
-    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]]
-
-> 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.
->
-> The now merged po plugin also handles some of this.
-> --[[Joey]]