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

master
Joey Hess 2012-12-21 14:47:46 -04:00
commit c357692b34
3 changed files with 38 additions and 0 deletions

View File

@ -0,0 +1,19 @@
[[!comment format=mdwn
username="http://smcv.pseudorandom.co.uk/"
nickname="smcv"
subject="comment 2"
date="2012-12-21T11:02:19Z"
content="""
Unfortunately, ikiwiki [[doesn't follow symlinks for security
reasons|security]] - if it did, anyone who can commit to the wiki
repository could publish any file readable by the user who runs ikiwiki,
including secrets like `~/.gnupg/secring.gpg` or
`~/.ssh/identity`.
git-annex relies on symlinks, so that restriction breaks it.
It would be great to be able to use some restricted, safe subset
of symlinks (\"relative symlinks that point into `.git/annex`\" would
be enough to support git-annex), and I've looked into it in the past.
My [[plugins/contrib/album]] plugin would benefit from being able
to annex the actual photos, for instance.
"""]]

View File

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="2001:4978:f:21a::2"
subject="comment 3"
date="2012-12-21T14:49:13Z"
content="""
git-annex is gaining a new \"direct\" mode where it does not use symlinks. It remains to be seen if enough git operations will be supported in that mode to make it attractive to use.
"""]]

View File

@ -0,0 +1,11 @@
On [[the po plugin's page|plugins/po]] it is clearly stated that "when the plugin has just been enabled, or when a page has just been declared as being translatable, the needed POT and PO files are created". Yet on all my attempts, only the pot file was created. Do I have to create the po files manually somehow?
To be precise, these are the settings I put in my wiki's setup file to enable the po plugin:
add_plugins => [qw{... po ...}],
po_master_language => 'de|Deutsch',
po_slave_languages => 'en|English',
po_translatable_pages => "mytranslatedpage",
po_link_to => 'current',
… followed by "ikiwiki --setup mysetupfile".