Re: [translate-pootle] How to automate updates from a SVN repository

2007-04-18 Thread Dwayne Bailey
On Tue, 2007-04-17 at 13:52 +0200, David Fraser wrote:
 Christian Perrier wrote:
  I suppose that the Update option from Pootle handles such
  conflicts...but I guess that a svn up will not handle them.
  
 
  It does not. If I use the Update function for a given file in a
  project which uses SVN repository, the changes I made locally without
  committing are overwritten by the content of the translations from the
  SVN server.
 
  That makes any automated SVN update very likely to discard changes
  made through the Pootle interface and not committed.

 This is a bug then from how I remember coding this. I think what
 actually is supposed to happen is local changes that conflict with
 repository changes get moved to suggestions - you could check this.

Yes definitely a bug it should go into the suggestions file for
resolution by a translator.  The assumption was always that SVN is
authoritative thus we have to abandon the local translation unless the
message from SVN was untranslated.

So untranslated should be accepted.  Translated in SVN and changed in
Pootle should become a suggestion.

One thing which we have not looked at but that could make this process
better is the new feature in Gettext 0.16 (I think) which allows PO
files to store the previous translation. This would allow make it easier
to accept some translations made in Pootle when doing this upgrade.

Re: a command line tool.  One doesn't exist.  We'd need to pull out the
code that does merging from Pootle.  Another concern would be locking
which isn't being done currently in Pootle.

-- 
Dwayne Bailey
Translate.org.za

+27-12-460-1095 (w)
+27-83-443-7114 (cell)


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Translate-pootle mailing list
Translate-pootle@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/translate-pootle


[translate-pootle] How to automate updates from a SVN repository

2007-04-15 Thread Christian Perrier
The http://i18n.debian.net:8080/projects/test/ project is a Pootle
project using the Debian Installer translation files directly from D-I
SVN.

If I go on a given translation (say, French), I can update the file
from D-I SVN.

However, what I would like to do is automating this process for all
languages so that this project is always up-to-date.

Of course, I can cd /var/lib/pootle/test ; svn up but what will then
happen to strings modified by the translators in case they didn't
commit them yet...and the file was changed in the SVN (for instance
because strings have been added meanwhile).

I suppose that the Update option from Pootle handles such
conflicts...but I guess that a svn up will not handle them.

Is is possible to run the Update function from a script and not from
Pootle's web interface?



-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Translate-pootle mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/translate-pootle


Re: [translate-pootle] How to automate updates from a SVN repository

2007-04-15 Thread Christian Perrier
 I suppose that the Update option from Pootle handles such
 conflicts...but I guess that a svn up will not handle them.

It does not. If I use the Update function for a given file in a
project which uses SVN repository, the changes I made locally without
committing are overwritten by the content of the translations from the
SVN server.

That makes any automated SVN update very likely to discard changes
made through the Pootle interface and not committed.





-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Translate-pootle mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/translate-pootle