Re: Debian WWW CVS commit by alfie: webwml/french/devel/debian-volatile submit.wml
* Gerfried Fuchs <email@example.com> [2007-04-18 23:14] :
> * Frédéric Bothamy <firstname.lastname@example.org> [2007-04-18 01:54]:
> > * Debian WWW CVS <email@example.com> [2007-04-17 04:14] :
> >> CVSROOT: /cvs/webwml
> >> Module name: webwml
> >> Changes by: alfie 07/04/17 04:14:15
> >> Modified files:
> >> french/devel/debian-volatile: submit.wml
> >> Log message:
> >> s#mirror/countries.data#template/debian/countries_all.wml#
> > Hello,
> > Is this change correct?
> Yes: it removes a build error because the old file in mirror doesn't
> exist anymore and has been moved. Please read the cvs log for
> english/mirror/countries.data and
> > The English diff is:
> > diff -u -r1.13 -r1.14
> Sorry, but did you took a look at the header of the named file?
> $> head -2 french/devel/debian-volatile/submit.wml
> #use wml::debian::template title="Soumission d'informations de miroir volatile"
> #use wml::debian::translation-check translation="1.13" maintainer="Frédéric Bothamy"
> I haven't incorporated the diff you mention. I don't speak french (or
> just a petit pu), so I when fixing build problems I don't bump the
> translation-check header.
> > --- webwml/english/devel/debian-volatile/submit.wml 2007/04/09 14:55:44 1.13
> > +++ webwml/english/devel/debian-volatile/submit.wml 2007/04/16 23:31:24 1.14
> > @@ -1,4 +1,5 @@
> > #use wml::debian::template title="Submit Volatile Mirror Information"
> > +#use wml::debian::countries_all
> > <p>If you would like to submit information about a mirror of Debian Volatile
> > (FTP archive, web), you can do so using the form below.</p>
> > @@ -174,7 +175,6 @@
> > <tablerow "Name of site maintainer" maint_name 30>
> > <tablerow "Email of site maintainer" maint_email 30>
> > <tr><td>Country of site: <td><select name="country">
> > -#include "$(ENGLISHDIR)/mirror/countries.data"
> > <: country_list() :>
> > </select>
> > <tablerow "Location of site (optional)" location 30>
> Oh - I should have taken a look at diff, then. I wasn't aware when
> noticing the moving of the file that this was the only change in the
> english original. I just saw the file moved and saw the build errors,
> so I did the approach I saw less intrusive. Seeing now that the whole
> diff wasn't more than this change I really wonder why Joy didn't change
> it in all languages so not burden the translation teams with it and not
> break the building of other languages - but that might just be me.
Oh ok, I thought that you did changes for english and other languages as
well and wondered why the translation-check header was not updated as
there was no change in the text. I understand now my mistake.
> > while the French diff is:
> With _no_ translation-check header update, so your file is still marked
> as outdated, and as you notice you have noticed the difference quite
> properly, so there should be nothing holding you back to update your
> file properly. :)
Yes, will do.
> > BTW I have noticed a few country names are missing in
> > english/template/debian/countries.wml (AD, AF, AG, AI, etc.), but are in
> > countries_all.wml and are thus not translated in
> > http://www.debian.org/devel/debian-volatile/submit.fr.html.
> That's not true anymore, if you have checked since the rebuild after my
> - it uses now the countries_all.wml to which the original file was
> moved. I can just guess countries.wml will be removed eventually, but
> that is just my guess, after most propably all the other files have been
> updated accordingly. Or another cleanup round by myself when the file
> gets removed...
Maybe I was not clear enough. countries_all.wml uses countries.wml for
translation (using <gettext domain="countries">). But currently there is
no such entry for Andorra (defined in countries_all.wml) in
countries.wml, and so it can not be translated to French (as it is not
in countries.fr.po) in the submit.fr.html webpage.
The fix would be to add to countries.wml the missing countries, to
regenerate countries.pot and to update the translations.
Thanks for your help.