Joey Hess
4971f873a0
more idiomatic use of foreach
2009-08-12 12:49:40 -04:00
Joey Hess
63ce4459f5
fix some more foreaches that clal functions to not use $_
2009-08-12 12:49:16 -04:00
Joey Hess
906c8f6e58
use a more idiomatic foreach my
2009-08-12 12:43:57 -04:00
Joey Hess
04014e4775
inline: Avoid use of my $_ as it fails with older perls. Closes : #541215
2009-08-12 12:33:02 -04:00
Joey Hess
b4d7dfcbe1
po: Detect if nowrapi18n can't be passed to po4a, and warn about the old version, but continue. Closes : #541205
2009-08-12 12:26:07 -04:00
Joey Hess
83480665c2
po: Fix copy of po file from underlay when editing
...
When first editing a page that was in the underlay, avoid losing
the translation by copying the po file over from the underlay.
2009-08-10 15:59:32 -04:00
Joey Hess
8f6e0212fd
verify page name is sane
...
paranoia; I was thinking about XSS attacks specificaly
2009-08-08 12:27:48 -04:00
Joey Hess
22edaf77c2
fix misleading comment
2009-08-08 12:23:50 -04:00
Joey Hess
79312b2754
Merge commit 'smcv/ready/getsource'
...
Conflicts:
debian/changelog
2009-08-08 12:22:10 -04:00
Joey Hess
f1a70921e3
Merge commit 'remotes/smcv/ready/inline-pagenames' into staging
2009-07-31 10:25:43 +02:00
Joey Hess
0bbb3d201e
Merge commit 'remotes/smcv/ready/harishcm-map-fix' into staging
2009-07-31 10:23:06 +02:00
Joey Hess
3d27dac809
Merge commit 'remotes/smcv/ready/among'
2009-07-31 10:12:23 +02:00
Joey Hess
9d96250fc5
img: Fix adding of dependency from page to the image.
...
This was impressively broken. add_depends was being called with params
backwards, and on parameter was set to the name of the generated
file, which isn't in the source.
Now updates to images will update the page that contains them, thus
updating them. This is unncessary for fullsize images, so skipped.
2009-07-27 22:22:26 +02:00
Simon McVittie
70b1c2aabd
getsource: remove temporary variable
2009-07-27 11:58:36 +01:00
Simon McVittie
2ef53b128d
getsource: remove unnecessary IkiWiki:: prefixes
...
Many variables and functions are exported.
2009-07-26 17:04:49 +01:00
Simon McVittie
ea244ab7b5
getsource: don't allow getting the source of an attachment
...
Serving up images etc. as text/plain; charset=utf-8 is unlikely to work
very well, and there's no point in having this CGI action for attachments
(since they're copied into the output as-is anyway).
2009-07-26 17:04:34 +01:00
Simon McVittie
0afcec7346
getsource: turn missing pages into a 404
...
Also restructure so we return early on missing pages.
2009-07-26 17:04:30 +01:00
Simon McVittie
3f520da78a
getsource: default to saying page source is in UTF-8, and make the example match the default
...
IkiWiki mostly assumes that pages are in UTF-8; anyone this doesn't work
for can override it in the setup file.
2009-07-26 16:36:17 +01:00
Simon McVittie
eaf59e5ba9
getsource: run as plain CGI, rather than sessioncgi
...
As I suggested when reviewing Will's code, calling loadindex() should be
sufficient.
2009-07-26 16:33:12 +01:00
Will Uther
01e4cb1464
Add getsource plugin
2009-07-26 16:22:56 +01:00
harishcm
786b78be46
Fix failure to close <ul> in maps with no items
...
Signed-off-by: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/ >
2009-07-25 20:16:11 +01:00
Joey Hess
60ee03bd70
revert revert
2009-07-23 12:01:54 +02:00
Joey Hess
a29507ec26
improve string to be less confusing
2009-07-23 11:52:33 +02:00
Joey Hess
e01badd3e7
reverted a few of the string changes
...
Improved one string.
2009-07-23 11:48:02 +02:00
Jonas Smedegaard
3bdc366e73
Merge branch 'master' of git://git.ikiwiki.info
2009-07-23 01:17:40 +02:00
Jonas Smedegaard
27071f0ba9
Change rendering→building in translatable strings, to ease translations.
2009-07-23 00:53:23 +02:00
Jonas Smedegaard
28b572a61e
Rephrase suggestion to not get confused as info on action already done.
2009-07-23 00:50:42 +02:00
Jonas Smedegaard
106b073ce1
Rephrase 'linked to by' confusing for translators.
2009-07-23 00:48:00 +02:00
Jonas Smedegaard
8b7389b426
Improve translatable texts to ease translation (e.g. to→into and from→inside)
2009-07-23 00:43:28 +02:00
Jonas Smedegaard
dc9e0f3e32
Fix typo attepting→attempting
2009-07-23 00:41:33 +02:00
Joey Hess
88d4fb15ba
add --previous at bubulle's suggestion
2009-07-22 17:48:49 +02:00
Joey Hess
c56ff6cd47
relocate po directory up a level
2009-07-21 13:16:26 +02:00
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
4b1534d5bc
fix example
2009-07-21 09:56:34 +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
4fb0e8720c
s//bad//invalid// # jonas=
2009-07-19 20:13:57 +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
ea8c166a05
bugfix: Avoid generating po files for files that are not httmlizable
2009-07-19 13:46:10 +02:00
Joey Hess
b23ddf6c4a
improve error message
2009-07-19 13:36:46 +02:00
Joey Hess
ec965fc92c
Merge branch 'master' into po
...
Conflicts:
debian/changelog
2009-07-19 12:36:01 +02:00
Simon McVittie
acb79b5c00
pagestats: add `among` parameter, which only counts links from specified pages
2009-07-17 11:12:55 +01:00
Simon McVittie
9c13e29d4f
IkiWiki::Render: split out backlink_pages() function from backlinks()
...
This separates style from content - backlinks() performs lossy
transformations on the page names to get it in the form that the page
template wants.
2009-07-17 11:12:50 +01:00