Hi, > > > This is the current behaviour. We always consider version control to be > > > the authority. > > > > not really - for now the "turn the local translation into a suggestion" > > behaviour is only a feature request. In reality all local changes are lost. > > > > Did you check the code in projects.py::updatepofile()? Check where it > calls pootlefile.py::mergeitem()
uh - you got me! I was only looking at the code in versioncontrol.py and not in the places where it is used. May fault - thanks for the pointer. I never tried to use this feature, as it was mentioned as a feature request on http://translate.sourceforge.net/wiki/pootle/version_control - or does the update feature request involve something else? I was not sure, so maybe you could update it to clarify the current state? > > From my point of view, this merging code maybe should be used for all > > sources of > > translations - including revision control system. The problem to be solved > > is always the same - just the source of a translated string differs. > > I agree, it has been on my todo list for more than 6 months now. I would > really like something that merges this code as well as pomerge and > pot2po in the toolkit. They all have something in common. I'm just not > sure that it will be worthwhile or easy enough to really abstract > something useful out of all of them. Any improvement is good, though. > The code is a bit hard to read through. I just noticed :) Sounds like something interesting - I will take a look at it. > > > I didn't realise that we'll handle directories as well, but I see that > > > now. I'm just wondering now: is it ideal that we are recreating objects > > > all the time? > > > > you mean, creating instances of the classes SVN, CVS and DARCS? > > Does this create problems? > > Not really. I just want to keep a check on the number of objects > created. "objects" in the sense of "instance"? As these instances are created in a sequence (not all at the same time), there should be no real resource problem. The time need to create an instance seems to be neglectable from my point of view. But maybe I miss something? Lars ------------------------------------------------------------------------- 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
