Solving PO translation conflicts
Monday, September 17, 2007 at 12:59 If your using gettext in an svn environment, you probably have had the following problem: You and your colleague add some code and some translations. Now you check in your work. What will happen is that the last one o the two who checked in has a major problem. He has a conflict in the po and mo, as they differ. But his mo and po are also completely wrong, as they are based on a now old version of your application. To make things worse, subversion does an extremely bad job in resolving this, as it tries to juggle the three versions.
Luckally I added something to the latest version of my gettext generators plugin: the svnmerge rake task. It works as follows:
rake gettext:pomerge FOLDER=/po/nl-NL/ APP=moves VER1=mine VER2=r318
What this does is create a new po and mo file so that they reflect you current mess. It then fills the new po translation with translations coming from the two conflicting versions (the mine and the r.318) in this example. It does this by using msgmerge in a smart way (so you need msgmerge for this).
After this is done, mark your po, pot and mo as resolved, run rake gettext:makemo and check your source in with a smile.
This was brought to you live from the lounge of Railsconf europe 2007 :).
Reader Comments (5)
You also have a complete line of replica watches to choose from to suit your various needs - from the reasonably priced Caravelle line to the signature Bulova, from the sporty Accutron to the dressy Wittnauer Swiss. Fossil fake watches are best known for their affordable designer swiss watches for urban professionals with the ability to surprise you with its designs.
Post very nicely written, and it contains useful facts. I am happy to find your distinguished way of writing the post. Now you make it easy for me to understand and implement. Thanks for sharing with us.hermes replica handbags
Finding the Cheap Plus Size Prom Dresses is moderately easy if you plan ahead. Most girls will want a unique perfect cheap Long Prom Dresses.
About Prom Dresses 2012. Aside from a wedding dress, one of the most important ... with a rayon or silk skirt that reaches the floor. The bodice is a snug corset. ... Cheap Cocktail Dresses to Find Inexpensive Prom Dresses in Atlanta ...
the designs and Air Jordan Flight 45 styles that beach footwear come in continue to vary. A while back, Ugg Boots Outlet Sale if you wanted beach footwear you had to choose between the flip-flop Nike Shoes Cheap and the Birkenstock.
Replica handbags will be the most popular handbags. To be able to havereplica lv 2011, i highly recommend you mouse clickreplica lv), I uncoveredlouis vuitton wallets replicaround this webpage will be most economical plus top of the line, you will realise an array of best replica handbags, desired to that save, enjop you!!!