Re: [vertimus] Merge uploaded file?

[Claude Paroz <claude 2xlibre net>]

Le mardi 20 janvier 2009 à 16:33 +0100, Kenneth Nielsen a écrit :
> Please make the diff work per string, in such a sense that you always
> have the entire section (including comments) belonging toa string as
> context and not just a fixed number of lines. I, at some point, became
> tired of dealing with ordinary diffs, so a wrote a podiff tool that
> works in exactly that way and that the Danish team uses, but the code
> is old and ugly so it is not useable for this.

We're currently using standard Python difflib.HtmlDiff() [1] class, and
there is no such option (only number of context lines can be given). We
could however give the choice to show full files.
Feel free to open a bug report.

Claude 


[1] http://docs.python.org/library/difflib.html

> 
> 2009/1/20 Claude Paroz <claude 2xlibre net>:
> > Le mardi 20 janvier 2009 à 11:17 +0100, Luca Ferretti a écrit :
> >> Il giorno lun, 19/01/2009 alle 22.36 +0100, Claude Paroz ha scritto:
> >> > Hi,
> >> >
> >> > I'd like to know your opinion about the following matter:
> >> > - Should files uploaded by translators on the Vertimus section of
> >> > l10n.gnome.org be always merged with the latest pot file?
> >>
> >> Well, the l10n.g.o workflow is:
> >>       * grab the updated PO
> >>       * work on it
> >>       * upload PO with changes
> >>
> >> While you are working on PO, original messages could be changed by
> >> developers, so we need a way to check and compare uploaded PO against
> >> latest available POT.
> >>
> >> If you don't want to change uploaded stuff, you could add a warning like
> >> in attached screenshot: hovering the mouse on warning message could show
> >> a tooltip explaing the reason of the warning, something like: "The
> >> translation you uploaded was checked against latest POT files. It seems
> >> that some messages was changes while you was working on it. The uploaded
> >> translation compared against latest POT files reports X fuzzy and Y
> >> untranslated". I'm speaking about changed messages, not changed
> >> source/line references.
> >>
> >> Then you could:
> >>      A. add a "Update" button near warning message - translator can
> >>         click on it to force the merge
> >>      B. provide two links, one for original uploaded file, one for the
> >>         merged one
> >>      C. other? any idea?
> >
> > Thanks Luca for your ideas. I finally choose B (as Vincent also
> > suggested), even if this is a little heavy in my opinion. We can always
> > improve it later.
> >
> > I just put in production the merged/diff functionalities. There is still
> > a patch from Og in Bugzilla to provide a classical diff. I'll see if I
> > can add an option somewhere for accessing it.
> > http://bugzilla.gnome.org/show_bug.cgi?id=566060
> >
> > And we also have to provide means to show diff with other files.
> >
> > Hope you'll find this useful.
> >
> > Claude
> >
> > _______________________________________________
> > gnome-i18n mailing list
> > gnome-i18n gnome org
> > http://mail.gnome.org/mailman/listinfo/gnome-i18n
> >
> _______________________________________________
> gnome-i18n mailing list
> gnome-i18n gnome org
> http://mail.gnome.org/mailman/listinfo/gnome-i18n
-- 
www.2xlibre.net