urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

po: Fixed to run rcs_add ralative to srcdir.

master
Joey Hess 2009-08-19 14:05:59 -04:00
parent 036f4f367d
commit 9b799ccc85
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Plugin/po.pm
View File

@ -414,7 +414,7 @@ sub change (@) {
} }
if (@pofiles) { if (@pofiles) {
refreshpofiles($masterfile, @pofiles); refreshpofiles($masterfile, @pofiles);
map { IkiWiki::rcs_add($_) } @pofiles if $config{rcs}; map { s/^\Q$config{srcdir}\E\/*//; IkiWiki::rcs_add($_) } @pofiles if $config{rcs};
$updated_po_files=1; $updated_po_files=1;
} }
} }

1
debian/changelog vendored
View File

@ -18,6 +18,7 @@ ikiwiki (3.141593) UNRELEASED; urgency=low
pages from the basewiki. pages from the basewiki.
* Updated French program translation from Philippe Batailler. * Updated French program translation from Philippe Batailler.
Closes: #542036 Closes: #542036
* po: Fixed to run rcs_add ralative to srcdir.
-- Joey Hess <joeyh@debian.org> Wed, 12 Aug 2009 12:25:30 -0400 -- Joey Hess <joeyh@debian.org> Wed, 12 Aug 2009 12:25:30 -0400

7
doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn
View File

@ -5,3 +5,10 @@ I have set absolute path for srcdir = '/path/to/repo/doc/'. The root of my git r
I have no problem when I use an relative path like srcdir = '.'. I have no problem when I use an relative path like srcdir = '.'.
I have an other issue with the po plugin when I set the srcdir to './doc/' (provided that my config file is in /path/to/repo). In this case the po plugin try to add 'doc/doc/index.fr.po' which does not exists (seems like the srcdir path is prepended twice). I have an other issue with the po plugin when I set the srcdir to './doc/' (provided that my config file is in /path/to/repo). In this case the po plugin try to add 'doc/doc/index.fr.po' which does not exists (seems like the srcdir path is prepended twice).
> You should never use a relative srcdir path with ikiwiki.
>
> I wonder what version of git you have there, since it works ok with the
> version I have here. But, the po plugin is definitly doing the wrong
> thing; it's telling git to add the po file with the full scrdir path
> rather than relative to its root. Fixed that. [[done]] --[[Joey]]