Commit Graph

10367 Commits (637f32480cf8b21009de4d8a83f00a9a3cc04ecd)

Author SHA1 Message Date
Joey Hess 637f32480c turn off pot file underlay again 2009-07-21 12:40:44 +02:00
Joey Hess cebffa917f improve invalid gettext message
(and gettext it as translators will see this!)
2009-07-21 12:39:21 +02:00
Joey Hess 1610b1e9e6 update 2009-07-21 12:38:40 +02:00
Joey Hess 7532eff2b7 update 2009-07-21 11:40:25 +02:00
Joey Hess eca2dbe67f po: Add support for mo files in underlays
In order to support translated basewiki and other underlays, we need
support for mo files in underlays.

The code did not allow this before, because if a mo file was in an
underlay, then it might try to update it, and its pot, and write to the
underlay, which is guaranteed to either fail due to permissions, or be
undesirable.

To fix, my approach is to just detect if a mo or pot file that is about to
be updated is in an underlay, and skip updating it. This seems to work
well:

- If the mo is out of date in the underlay, it won't get updated, but this
  would probably be due to a problem in the underlay, or more likely,
  the wiki is being rebuilt and so it *thinks* the mo is out of date,
  but it's really not (and it would be a waste of time to rebuild it
  anyway).
- If a page from the basewiki is edited, it is saved to the srcdir,
  which causes generation of an updated mo and pot also in the srcdir;
  the underlay stops being used for that page, and everything seems
  to work.

Note that I am not including an underlay search directory for pot files.
They *seem* to be unnecessary for the underlay, since the mo files
in there never need to be updated.
2009-07-21 11:31:51 +02:00
Joey Hess eeeda1295f Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2009-07-21 09:57:08 +02:00
Joey Hess 4b1534d5bc fix example 2009-07-21 09:56:34 +02:00
harishcm 4954ffb558 2009-07-21 00:33:23 -04:00
harishcm 7d682ef4c2 patch overcoming the issue of <ul> with no <li> 2009-07-21 00:29:42 -04:00
http://smcv.pseudorandom.co.uk/ 6463fe7a6b link to alternative patch 2009-07-20 11:19:46 -04:00
http://smcv.pseudorandom.co.uk/ f900e84416 link to existing bug 2009-07-20 11:16:45 -04:00
harishcm 3fef1fbd0d Issue with ul and div tag closure when returning empty map 2009-07-20 10:40:29 -04:00
harishcm 9fb0d03c5a 2009-07-20 10:29:39 -04:00
http://jmtd.livejournal.com/ bfe1961e1d how to achieve this by modifying your templates 2009-07-20 10:03:50 -04:00
Jonas Smedegaard 2227466839 Danish translation update 2009-07-20 12:05:48 +02:00
Jonas Smedegaard 2305f57634 Unfuzz danish translation of basewiki/.../po.da underlay 2009-07-20 11:49:30 +02:00
Joey Hess e61d04463e update 2009-07-20 08:09:27 +02:00
Joey Hess 87486a1699 po/underlay/* should be BSD licensed, like the rest of the underlays 2009-07-20 07:37:06 +02:00
Joey Hess 64f887a0ff fixes for Danish integration 2009-07-20 07:24:22 +02:00
Joey Hess be30203459 Merge branch 'master' into integration 2009-07-20 07:20:43 +02:00
Joey Hess a7b813182d build translated underlays for use with non-English wikis 2009-07-20 07:20:13 +02:00
Joey Hess e04692e059 po: Support running with a non-english master lang; add translated underlays
It seem to make sense to remove the check for there being slave languages
as part of this, since one might want a wiki that is only in non-English.
2009-07-20 07:19:05 +02:00
Joey Hess 9d9826a3d2 remove prototype from renamehook
Recursive calls make perl whine about protypes, and it wasn't
adding any value.
2009-07-20 07:11:22 +02:00
Joey Hess 741c33576e create translated underlays in mdwn format
These are for use by wikis where the primary language is not English.
On such a wiki, it makes sense to use an underlay has the source for pages
in the native language.
2009-07-20 06:23:33 +02:00
Joey Hess 73ae87a4d4 split two helper functions of of render() 2009-07-20 05:23:16 +02:00
Joey Hess 7d56f17891 more thoughts on underlays 2009-07-20 04:54:25 +02:00
Joey Hess 3f517fa143 note branch name 2009-07-20 04:49:16 +02:00
Joey Hess e6709f6677 Merge commit 'remotes/jonas/underlay-da' into integration 2009-07-20 04:47:45 +02:00
Joey Hess 3bfeb51cf5 add jonas's git repo 2009-07-20 04:46:20 +02:00
Jonas Smedegaard 65aa071f97 Update with Git URL for danish l10n. 2009-07-20 01:22:55 +02:00
Jonas Smedegaard 187128d063 Merge branch 'master' of git://git.ikiwiki.info into underlay-da 2009-07-20 01:02:19 +02:00
Jonas Smedegaard 031b880ad9 Add initial danish underlay translation 2009-07-20 00:44:42 +02:00
Joey Hess 7865433d8e update, think I have the real bug this time 2009-07-20 00:11:56 +02:00
Joey Hess 08254c7220 use empty underlay dirs when building po underlays 2009-07-20 00:06:41 +02:00
Joey Hess a7e5541c4d %links dedup bug? 2009-07-19 23:55:58 +02:00
Joey Hess 54280d0215 bad po plugin bug 2009-07-19 23:01:43 +02:00
Joey Hess 33e93cd5e9 speed up incremental underlaypo runs 2009-07-19 22:46:53 +02:00
http://smcv.pseudorandom.co.uk/ 8be86ce596 Use a link that will work on other wikis 2009-07-19 15:17:17 -04:00
http://smcv.pseudorandom.co.uk/ 834b6ef44c meta language vs po language... 2009-07-19 15:13:47 -04:00
Jonas Smedegaard 95b46a9167 Consistency nitpicking in docs: lowercase in attachment and po lists 2009-07-19 21:05:12 +02:00
Jonas Smedegaard ab33e64e90 Consistency nitpicking in docs: Use third tense in pagespec list 2009-07-19 21:02:49 +02:00
Jonas Smedegaard 98e4600fe1 Consistency nitpicking in docs: Note: → Note that 2009-07-19 20:46:29 +02:00
Jonas Smedegaard cccd4e101a Merge branch 'master' of git://git.ikiwiki.info 2009-07-19 20:21:16 +02:00
Jonas Smedegaard adee74a67b Improve wording of tagged() docs 2009-07-19 20:18:25 +02:00
Joey Hess 4fb0e8720c s//bad//invalid// # jonas= 2009-07-19 20:13:57 +02:00
Joey Hess 1a4750b76b language display order 2009-07-19 18:27:20 +02:00
Joey Hess 2f2a721043 reorder 2009-07-19 17:58:26 +02:00
Joey Hess 126952bd33 avoid Po4a::Common exporting anything
It exports gettext and stuff by default, which conflicts with IkiWiki
exports.
2009-07-19 17:50:56 +02:00
Joey Hess 43e5c905cb shut up msgmerge 2009-07-19 16:54:03 +02:00
Joey Hess 6d18bdd65a commit for jonas 2009-07-19 16:53:50 +02:00