Commit Graph

13677 Commits (163fc34db7f29bc75a05c54b83c2a00c5ad899c2)

Author SHA1 Message Date
Joey Hess d2f56f7dea merged; notes 2010-07-23 14:29:17 -04:00
Joey Hess b5bd92e77e whitespace fixes and a typo 2010-07-23 14:26:57 -04:00
Joey Hess e5f67d3c8b Merge commit '862fc7c1ab1f7d709561bcb02fc8ede57b90a51b' 2010-07-23 14:24:48 -04:00
Joey Hess ef8a74fbc3 html 2010-07-23 14:22:18 -04:00
Joey Hess e3004912dd html 2010-07-23 14:19:54 -04:00
Joey Hess 055dfa00c6 html 2010-07-23 14:16:22 -04:00
Joey Hess 87d4ef453c Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-07-23 14:15:18 -04:00
Joey Hess 1b0bef6d49 template: Fix dependency tracking. Broken in version 3.20100427.
template_depends was adding a dependency on the source filename,
instead of on the page name when a template is a page. Such a
dependency doesn't work.
2010-07-23 14:14:25 -04:00
intrigeri 081b43a8ae Implemented, please merge. 2010-07-23 19:30:31 +02:00
intrigeri 8ee3297b50 todo update 2010-07-23 19:30:31 +02:00
Joey Hess d78578f1b8 add tipjar link to sidebar
and flattr button, as an experiment
2010-07-23 13:24:15 -04:00
Joey Hess ddecdbe854 add flattr button 2010-07-23 12:49:34 -04:00
Joey Hess 56ff8b16f2 add news item for ikiwiki 3.20100722 2010-07-22 16:59:40 -04:00
Joey Hess c30f22fc83 releasing version 3.20100722 2010-07-22 16:59:11 -04:00
Joey Hess 44b6101c3f merge translation updates from l10n site 2010-07-22 16:48:38 -04:00
Joey Hess 21fe996544 Avoid showing 'Add a comment' link at the bottom of the comment post form.
Since misctemplate is called with a page context, the comments plugin
thinks it should add that, as well as the comment link in the actionbar.
I kept the comment link because a quick link back to the comments to a page
is sorta useful.
2010-07-22 15:02:04 -04:00
intrigeri d98296d1db po.t: fix expected results
As index.{es,fr} don't exist, po::refreshpofiles copies them from the basewiki
underlay before running msgmerge. msgmerge marks as obsolete the translation
strings that came from the basewiki po files, but the link plugin
does not make the difference between obsolete and up-to-date links.

$links{'index.fr'} and $links{'index.es'} are therefore expected to contain
SandBox and ikiwiki.
2010-07-20 13:41:53 +02:00
intrigeri c66fae8b16 Added tests for po::pofiles. 2010-07-20 13:39:47 +02:00
intrigeri 38014f0cad Run checkconfig after loading the po plugin, else state is not populated.
The pofiles function relies on @slavelanguages to have been populated by po's
checkconfig hook.
2010-07-20 13:27:17 +02:00
intrigeri bb22e8c4a6 po: optimization
No need to use "keys %{$config{po_slave_languages}}" repeatedly:
the slave languages codes list is already cached in @slavelanguages.
2010-07-20 02:26:23 +02:00
intrigeri 862fc7c1ab Support ordered po_slave_languages as discussed previously.
Backward compatibility is still supported.
2010-07-20 02:25:17 +02:00
http://jeremiahfoster.com/ e50df5ea76 2010-07-19 09:16:32 +00:00
http://jeremiahfoster.com/ 011fb0b2e5 2010-07-19 09:16:09 +00:00
http://jeremiahfoster.com/ c4d22bdb75 Added example 2010-07-19 09:15:30 +00:00
http://jeremiahfoster.com/ 1e01ec26fe Added second question. 2010-07-19 09:12:39 +00:00
Javier Rojas bf9cc9e131 typo 2010-07-19 01:14:47 -05:00
Javier Rojas 194817b63d Merge branch 'master' of git://git.ikiwiki.info 2010-07-19 01:11:28 -05:00
Javier Rojas cfed58f290 new syntax file for ikiwiki files in vim 2010-07-19 01:11:22 -05:00
http://weakish.myopenid.com/ 0ddc89123e fix link syntax 2010-07-19 04:33:37 +00:00
http://weakish.myopenid.com/ 47e2e673bc link to 404 plugin 2010-07-19 04:31:08 +00:00
http://weakish.myopenid.com/ e71850f92d remove lighttpd doc: lighttpd send 200 to dynamic error pages. Thus this plugin doesn't work with it w/o modification. 2010-07-19 04:28:55 +00:00
http://weakish.myopenid.com/ 884daeec1b update url 2010-07-19 04:24:15 +00:00
Joey Hess 35c9956df0 Revert "po_slave_languages can now be a hash, if order matters."
This reverts commit 4cf185e781.

That commit broke t/po.t (probably the test case only is testing too
close the the old implementation and needs correcting).

Also, we have not decided how to want to represent it yet, so I'm not
ready for this change.

Conflicts:

	IkiWiki/Plugin/po.pm
	doc/plugins/po.mdwn
2010-07-18 20:04:39 -04:00
Joey Hess def97ec7fe merge fix for selflink po problem 2010-07-18 19:43:25 -04:00
Joey Hess 839fae0b2b response on po_slave_languages structure 2010-07-18 19:42:06 -04:00
Joey Hess bfd896f5e5 typo 2010-07-18 19:37:14 -04:00
Joey Hess b45688e34e Merge remote branch 'intrigeri/po' 2010-07-18 19:35:16 -04:00
Joey Hess 4bcd6cc4ff noticed a bug in the po plugin
(I should probably put this in bugs/, but I am not sure if intregriti
watches there..)
2010-07-18 19:33:10 -04:00
crest 6d33160faf 2010-07-18 23:02:32 +00:00
Joey Hess 1f6d6b2a05 remove dup sentence 2010-07-18 18:50:14 -04:00
Joey Hess 626ad04114 merge updated translations from l10n
This includes an (almost) up-to-date French basewiki translation.
2010-07-18 18:35:10 -04:00
Joey Hess e041555e4f Updated French program translation from Philippe Batailler. Closes: #589423 2010-07-18 17:59:33 -04:00
Joey Hess ba36419b0f update standards-version 2010-07-18 17:56:58 -04:00
Joey Hess eeb8e11d65 remove dead case 2010-07-18 17:47:36 -04:00
Joey Hess ad8cb6d6fa Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2010-07-18 17:39:28 -04:00
Joey Hess e674bb1445 fix other 2 cases of conflicting destdir files
Cleanly fixed case where destdir file failed to be written because there
was a directory with the same name. This can be detected with no extra
system calls, and dealt with by finding all pages that wrote files
inside the directory, and removing them and the directory.

The other, inverse case would be expensive to detect in will_render,
since it would need to check each parent directory of the file to see
if the directory is really a conflicting file. But prep_writefile
already does a similar scan for symlinks in the path, so I added code
there to remove the conflicting file. This fix assumes that the file
is written using writefile, and not some other means (but using other means
would be a security hole too, so hopefully nothing does).
2010-07-18 17:38:35 -04:00
Joey Hess 1dbb2632ef another class of conflicts: subdir/file conflicts 2010-07-18 17:16:39 -04:00
Joey Hess 2bf3a6edbb check oldrenderedfiles too
Handles the case where foo.mdwn is moved too foo/index.html
2010-07-18 16:47:52 -04:00
Joey Hess d6cb4436bd 2 more cases 2010-07-18 16:45:44 -04:00
Joey Hess 773db5a35e avoid error if two source files render the same destination file
There are two sub-caces. If both source files still exist, the winner that
renders the destination file is undefined. If one source file is deleted
and the other added, in a refresh, the new file will take over the
destination file.
2010-07-18 16:28:39 -04:00