Cyril Brulebois <k...@debian.org> (2020-06-08): > Dropping the ../english/ prefix for sitemap.wml leads to a reasonable > diff for the English sitemap (sitemap.en.html): > > --- stretch.en.html 2020-06-08 00:07:43.916768223 +0200 > +++ buster.en.html 2020-06-08 00:07:47.248781809 +0200 > @@ -4,8 +4,8 @@ > <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> > <title> Site map for Debian web pages </title> > <link rel="author" href="mailto:webmas...@debian.org";> > - <meta name="Generator" content="WML 2.0.12 (16-Apr-2008)"> > - <meta name="Modified" content="2020-06-07 22:07:43"> > + <meta name="Generator" content="WML 2.12.2"> > + <meta name="Modified" content="2020-06-08 00:07:46"> > <meta name="viewport" content="width=device-width"> > <meta name="mobileoptimized" content="300"> > <meta name="HandheldFriendly" content="true"> > @@ -377,7 +377,7 @@ > <p> > Last Modified: Sun, Jun 7 21:49:47 UTC 2020 >   > -Last Built: Sun, Jun 7 22:07:43 UTC 2020 > +Last Built: Sun, Jun 7 22:07:46 UTC 2020 > <br> > Copyright © 1997-2020 > <a href="https://www.spi-inc.org/";>SPI</a> and others; See <a > href="./license" rel="copyright">license terms</a><br> > > Therefore, I suspect we *might* be able to get away with this if we were > to add a symlink from all language directories, from $LANG/sitemap.wml > to ../english/sitemap.wml, as a companion change to dropping the > ../english prefix mentioned above (only tested successfully on English). > I'll be checking this hypothesis and possibly pushing a branch / opening > an MR if that works fine.
OK. This isn't so simple. I've pushed this branch: https://salsa.debian.org/webmaster-team/webwml/-/tree/pu/partial-workaround-924172 I'm attaching several sitemap files, built either in stretch or in buster, in English or in French, from the master branch or from the workaround branch: buster.en.html.master buster.en.html.workaround buster.fr.html.master buster.fr.html.workaround stretch.en.html.master stretch.en.html.workaround stretch.fr.html.master stretch.fr.html.workaround For each language, diffing the stretch built between master and the workaround yields no (practical) differences. Diffing stretch.en.master.html and buster.en.master.html shows many ../english/ being added; which could be arguably seen as a no-op. Diffing stretch.fr.master.html and buster.fr.master.html shows many ../english/ being added; which breaks navigation as that's another language… Diffing stretch.en.master.html and buster.en.workaround.html shows no practical differences (per my previous mail). Diffing stretch.fr.master.html and buster.fr.workaround.html shows the lost translations between (patched or unpatched) French version built in stretch and patched French version built in English. It seems we're losing translations for items which would have suffered from the ../english/ addition. Interestingly, this list seems to match the special cases defined in english/sitemap.wml (which is about pass protection this time, see the escape tag definition and comment above). I haven't tried to double check the flags passed to each pass in each cases though (running out of time). Overall, it seems my proposed patch papers around the issue but not fully. But it could help unstuck the move to buster if we agree the partial translations for the sitemaps are better than rather broken sitemaps. Cheers, -- Cyril Brulebois (k...@debian.org) <https://debamax.com/> D-I release manager -- Release team member -- Freelance Consultant
signature.asc
Description: PGP signature
