feat(portal-shell): collapse accessibility routes into one i18n-marked route

Continue ADR-0019: replace the `/accessibility` + `/accessibilite`
twin routes with a single canonical `/accessibility` path whose
content is i18n-marked in templates. The per-locale build (en/fr)
already inlines the right copy — the route data + `copy()` service
indirection is no longer needed.

What changes:

- `AccessibilityStatement` loses its `ActivatedRoute` injection, its
  `Lang` discriminator and the `COPY` lookup table. The component is
  now a plain shell over the template.
- `accessibility.html` carries the title + intro + status panel
  strings as `i18n="@@page.accessibility.*"` markers; six new
  trans-units in `messages.fr.xlf` provide the French copy
  (verbatim from the old `COPY.fr` block, kept identical so the page
  reads the same in FR).
- `app.routes.ts` declares the single canonical route and keeps
  `/accessibilite` as a `redirectTo: 'accessibility'` for backward
  compatibility with existing bookmarks. Drops the `data.lang`
  payload — no longer consumed.
- `footer.html` collapses the dual link (`Accessibility` /
  `Accessibilité`) into one i18n-marked link
  (`@@footer.accessibilityLink`). EN bundle reads "Accessibility
  statement"; FR bundle reads "Déclaration d'accessibilité".

The path stays in English across both locales for now
(`/{en,fr}/accessibility`). Translating route segments
(`/fr/declaration-d-accessibilite`) is a future refinement that needs
either a custom URL serializer or per-locale route trees — not worth
the complexity at this scale.

Specs:

- `accessibility.spec.ts` loses the `lang`-based tests and asserts
  on the rendered EN source content + the amber-panel structure
  (specs run in the source locale).
- `footer.spec.ts` asserts on the single accessibility link and the
  absence of the historical `/accessibilite` href.

Test plan / verification:

- 35/35 specs pass (was 36; one obsolete `lang` fallback test
  removed).
- Production build emits both locales; FR chunk contains "Statut",
  "Déclaration", FR intro/panel bodies, and no leftover English from
  the swept strings.

apps/portal-shell/src/app/app.routes.ts

@@ -1,9 +1,9 @@
 import { Route } from '@angular/router';
 
 // Tab titles per route — marked with `$localize` so each locale's
-// bundle ships its own. The `/accessibility` and `/accessibilite`
+// bundle ships its own. The accessibility statement now lives at the
-// pair shares a title key; the upcoming route fusion (per ADR-0019)
+// single canonical path `/accessibility` (per ADR-0019, replacing the
-// collapses them to a single localised route.
+// previous `/accessibility` + `/accessibilite` pair).
 const homeTitle = $localize`:@@route.home.title:APF Portal`;
 const accessibilityTitle = $localize`:@@route.accessibility.title:Accessibility statement · APF Portal`;
 
@@ -14,21 +14,21 @@ export const appRoutes: Route[] = [
     loadComponent: () => import('./pages/home/home').then((m) => m.Home),
     title: homeTitle,
   },
-  // RGAA + ADR-0016: the accessibility statement must be reachable
+  // RGAA + ADR-0016: the accessibility statement is reachable from
-  // from both locales' canonical paths. Same component, content
+  // `/accessibility` in every locale. Content is i18n-marked so the
-  // driven by the `lang` route data property.
+  // per-locale bundle ships the right copy automatically.
   {
     path: 'accessibility',
     loadComponent: () =>
       import('./pages/accessibility/accessibility').then((m) => m.AccessibilityStatement),
-    data: { lang: 'en' },
     title: accessibilityTitle,
   },
+  // Backward-compat: the historical French path redirects to the
+  // canonical one. Bookmarks and existing inbound links keep working.
+  // Drops out of the codebase once analytics confirm no traffic.
   {
     path: 'accessibilite',
-    loadComponent: () =>
+    redirectTo: 'accessibility',
-      import('./pages/accessibility/accessibility').then((m) => m.AccessibilityStatement),
+    pathMatch: 'full',
-    data: { lang: 'fr' },
-    title: accessibilityTitle,
   },
 ];

apps/portal-shell/src/app/components/footer/footer.html

@@ -6,24 +6,11 @@
   <p i18n="@@footer.copyright">&copy; {{ year }} APF France handicap</p>
 
   <nav i18n-aria-label="@@footer.aria.legal" aria-label="Legal">
-    <ul class="flex items-center gap-4">
+    <a
-      <li>
+      routerLink="/accessibility"
-        <a
+      class="rounded hover:text-brand-primary-500 hover:underline focus-visible:outline-2 focus-visible:outline-offset-4 focus-visible:outline-brand-primary-500 dark:hover:text-brand-primary-300"
-          routerLink="/accessibility"
+      i18n="@@footer.accessibilityLink"
-          lang="en"
+      >Accessibility statement</a
-          class="rounded hover:text-brand-primary-500 hover:underline focus-visible:outline-2 focus-visible:outline-offset-4 focus-visible:outline-brand-primary-500 dark:hover:text-brand-primary-300"
+    >
-          >Accessibility</a
-        >
-      </li>
-      <li aria-hidden="true" class="text-gray-300 dark:text-gray-700">|</li>
-      <li>
-        <a
-          routerLink="/accessibilite"
-          lang="fr"
-          class="rounded hover:text-brand-primary-500 hover:underline focus-visible:outline-2 focus-visible:outline-offset-4 focus-visible:outline-brand-primary-500 dark:hover:text-brand-primary-300"
-          >Accessibilité</a
-        >
-      </li>
-    </ul>
   </nav>
 </footer>

apps/portal-shell/src/app/components/footer/footer.spec.ts

@@ -25,11 +25,15 @@ describe('Footer', () => {
     expect(text).toContain(String(new Date().getFullYear()));
   });
 
-  it('renders both accessibility statement links (EN + FR)', async () => {
+  it('renders the accessibility statement link (single, locale-aware via i18n)', async () => {
     const fixture = TestBed.createComponent(Footer);
     await fixture.whenStable();
     const root = fixture.nativeElement as HTMLElement;
-    expect(root.querySelector('a[href="/accessibility"]')).not.toBeNull();
+    const link = root.querySelector('a[href="/accessibility"]') as HTMLAnchorElement | null;
-    expect(root.querySelector('a[href="/accessibilite"]')).not.toBeNull();
+    expect(link).not.toBeNull();
+    expect(link?.textContent?.trim()).toBe('Accessibility statement');
+    // The historical `/accessibilite` link is gone — that path now
+    // redirects at the route level rather than being a separate link.
+    expect(root.querySelector('a[href="/accessibilite"]')).toBeNull();
   });
 });

apps/portal-shell/src/app/pages/accessibility/accessibility.html

@@ -1,14 +1,26 @@
-<article class="mx-auto max-w-3xl px-6 py-12" [attr.lang]="copy().htmlLang">
+<article class="mx-auto max-w-3xl px-6 py-12">
-  <h1 class="text-3xl font-semibold tracking-tight text-gray-900 dark:text-gray-100">
+  <h1
-    {{ copy().pageTitle }}
+    class="text-3xl font-semibold tracking-tight text-gray-900 dark:text-gray-100"
+    i18n="@@page.accessibility.title"
+  >
+    Accessibility statement
   </h1>
 
   <section class="mt-8" aria-labelledby="intro-heading">
-    <h2 id="intro-heading" class="text-lg font-medium text-gray-900 dark:text-gray-100">
+    <h2
-      {{ copy().introTitle }}
+      id="intro-heading"
+      class="text-lg font-medium text-gray-900 dark:text-gray-100"
+      i18n="@@page.accessibility.intro.title"
+    >
+      About this statement
     </h2>
-    <p class="mt-3 text-base leading-relaxed text-gray-700 dark:text-gray-300">
+    <p
-      {{ copy().introBody }}
+      class="mt-3 text-base leading-relaxed text-gray-700 dark:text-gray-300"
+      i18n="@@page.accessibility.intro.body"
+    >
+      The APF Portal is committed to making its digital services accessible, in line with WCAG 2.2
+      level AA and the French RGAA 4.1 reference, with targeted AAA criteria on the items most
+      impactful to the association's user base (see ADR-0016).
     </p>
   </section>
 
@@ -16,11 +28,20 @@
     class="mt-8 rounded-md border-l-4 border-amber-400 bg-amber-50 p-4 dark:border-amber-500 dark:bg-amber-950/40"
     aria-labelledby="status-heading"
   >
-    <h2 id="status-heading" class="text-base font-medium text-amber-900 dark:text-amber-200">
+    <h2
-      {{ copy().panelNoticeTitle }}
+      id="status-heading"
+      class="text-base font-medium text-amber-900 dark:text-amber-200"
+      i18n="@@page.accessibility.panel.title"
+    >
+      Status of this document
     </h2>
-    <p class="mt-2 text-sm leading-relaxed text-amber-900 dark:text-amber-200">
+    <p
-      {{ copy().panelNoticeBody }}
+      class="mt-2 text-sm leading-relaxed text-amber-900 dark:text-amber-200"
+      i18n="@@page.accessibility.panel.body"
+    >
+      This statement is awaiting review and sign-off by the APF France handicap user panel. The
+      final version will integrate the RGAA audit grid, the list of any identified gaps, the
+      remediation plan, and the contact details for reporting accessibility issues.
     </p>
   </section>
 </article>

apps/portal-shell/src/app/pages/accessibility/accessibility.spec.ts

@@ -1,40 +1,28 @@
 import { TestBed } from '@angular/core/testing';
-import { ActivatedRoute } from '@angular/router';
-import { of } from 'rxjs';
 import { AccessibilityStatement } from './accessibility';
 
-function configureWithLang(lang: 'fr' | 'en' | undefined) {
-  return TestBed.configureTestingModule({
-    imports: [AccessibilityStatement],
-    providers: [{ provide: ActivatedRoute, useValue: { data: of({ lang }) } }],
-  }).compileComponents();
-}
-
 describe('AccessibilityStatement', () => {
-  it('renders the French copy on /accessibilite (lang: fr)', async () => {
+  beforeEach(async () => {
-    await configureWithLang('fr');
+    await TestBed.configureTestingModule({ imports: [AccessibilityStatement] }).compileComponents();
+  });
+
+  it('renders the heading + intro + status sections', async () => {
     const fixture = TestBed.createComponent(AccessibilityStatement);
     await fixture.whenStable();
     const root = fixture.nativeElement as HTMLElement;
-    expect(root.querySelector('h1')?.textContent).toContain('Déclaration d’accessibilité');
+    expect(root.querySelector('h1')?.textContent?.trim()).toBe('Accessibility statement');
-    expect(root.querySelector('article')?.getAttribute('lang')).toBe('fr');
+    expect(root.querySelector('section[aria-labelledby="intro-heading"]')).not.toBeNull();
+    expect(root.querySelector('section[aria-labelledby="status-heading"]')).not.toBeNull();
   });
 
-  it('renders the English copy on /accessibility (lang: en)', async () => {
+  it('exposes the panel-review status with an amber callout structure', async () => {
-    await configureWithLang('en');
     const fixture = TestBed.createComponent(AccessibilityStatement);
     await fixture.whenStable();
     const root = fixture.nativeElement as HTMLElement;
-    expect(root.querySelector('h1')?.textContent).toContain('Accessibility statement');
+    const status = root.querySelector('section[aria-labelledby="status-heading"]');
-    expect(root.querySelector('article')?.getAttribute('lang')).toBe('en');
+    expect(status?.querySelector('#status-heading')?.textContent).toContain(
-  });
+      'Status of this document',
-
-  it('falls back to English when the route omits the lang', async () => {
-    await configureWithLang(undefined);
-    const fixture = TestBed.createComponent(AccessibilityStatement);
-    await fixture.whenStable();
-    expect((fixture.nativeElement as HTMLElement).querySelector('h1')?.textContent).toContain(
-      'Accessibility statement',
     );
+    expect(status?.textContent).toContain('APF France handicap user panel');
   });
 });

apps/portal-shell/src/app/pages/accessibility/accessibility.ts

@@ -1,77 +1,22 @@
-import { ChangeDetectionStrategy, Component, computed, inject } from '@angular/core';
+import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { toSignal } from '@angular/core/rxjs-interop';
-import { map } from 'rxjs';
-
-type Lang = 'fr' | 'en';
-
-interface AccessibilityCopy {
-  htmlLang: Lang;
-  pageTitle: string;
-  introTitle: string;
-  introBody: string;
-  panelNoticeTitle: string;
-  panelNoticeBody: string;
-}
-
-const COPY: Record<Lang, AccessibilityCopy> = {
-  fr: {
-    htmlLang: 'fr',
-    pageTitle: 'Déclaration d’accessibilité',
-    introTitle: 'À propos de cette déclaration',
-    introBody:
-      'Le portail APF s’engage à rendre ses services numériques accessibles, conformément ' +
-      'au RGAA 4.1 et à la norme WCAG 2.2 niveau AA, avec des critères AAA ciblés sur les ' +
-      'points à fort impact pour les usagers de l’association (voir ADR-0016).',
-    panelNoticeTitle: 'Statut du présent document',
-    panelNoticeBody:
-      'Cette déclaration est en attente de revue et de validation par le panel d’usagers ' +
-      'd’APF France handicap. La version définitive intégrera la grille d’audit RGAA, le ' +
-      'recensement des écarts éventuels, le plan de mise en conformité, et les coordonnées ' +
-      'de signalement.',
-  },
-  en: {
-    htmlLang: 'en',
-    pageTitle: 'Accessibility statement',
-    introTitle: 'About this statement',
-    introBody:
-      'The APF Portal is committed to making its digital services accessible, in line with ' +
-      'WCAG 2.2 level AA and the French RGAA 4.1 reference, with targeted AAA criteria on ' +
-      'the items most impactful to the association’s user base (see ADR-0016).',
-    panelNoticeTitle: 'Status of this document',
-    panelNoticeBody:
-      'This statement is awaiting review and sign-off by the APF France handicap user ' +
-      'panel. The final version will integrate the RGAA audit grid, the list of any ' +
-      'identified gaps, the remediation plan, and the contact details for reporting ' +
-      'accessibility issues.',
-  },
-};
 
 /**
- * Accessibility statement, mounted at both `/accessibility` (en) and
+ * Accessibility statement, mounted at `/accessibility` per ADR-0019.
- * `/accessibilite` (fr) per ADR-0016. Same component, content
+ *
- * selected from a route data property.
+ * Content is marked for i18n; the production build emits one bundle
+ * per locale with the right text inlined. The previous twin route
+ * `/accessibilite` survives as a redirect (in `app.routes.ts`) so
+ * existing bookmarks keep working.
  *
  * v1 ships placeholder copy explicitly framed as "awaiting APF panel
  * review" — content is required to exist (RGAA + ADR-0016) but the
  * substance of the statement (audit grid, gaps list, remediation
- * plan) is owned by the accessibility review and lands separately.
+ * plan, reporting channel) is owned by the accessibility review and
+ * lands separately.
  */
 @Component({
   selector: 'app-accessibility-statement',
   templateUrl: './accessibility.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class AccessibilityStatement {
+export class AccessibilityStatement {}
-  private readonly route = inject(ActivatedRoute);
-
-  protected readonly lang = toSignal(
-    this.route.data.pipe(map((data): Lang => (data['lang'] as Lang | undefined) ?? 'en')),
-    // `as Lang` rather than `as const` so the toSignal overload
-    // picks `Signal<T>` instead of `Signal<T | U>` and downstream
-    // consumers see `Signal<Lang>` cleanly.
-    { initialValue: 'en' as Lang },
-  );
-
-  protected readonly copy = computed<AccessibilityCopy>(() => COPY[this.lang()]);
-}

apps/portal-shell/src/locale/messages.fr.xlf

@@ -26,6 +26,10 @@
         <source>Legal</source>
         <target>Mentions légales</target>
       </trans-unit>
+      <trans-unit id="footer.accessibilityLink" datatype="html">
+        <source>Accessibility statement</source>
+        <target>Déclaration d’accessibilité</target>
+      </trans-unit>
       <trans-unit id="footer.copyright" datatype="html">
         <source>© <x id="INTERPOLATION" equiv-text="{{ year }}"/> APF France handicap</source>
         <target>© <x id="INTERPOLATION" equiv-text="{{ year }}"/> APF France handicap</target>
@@ -163,6 +167,28 @@
         <target>Portail APF</target>
       </trans-unit>
 
+      <!-- page.accessibility -->
+      <trans-unit id="page.accessibility.intro.body" datatype="html">
+        <source> The APF Portal is committed to making its digital services accessible, in line with WCAG 2.2 level AA and the French RGAA 4.1 reference, with targeted AAA criteria on the items most impactful to the association&apos;s user base (see ADR-0016). </source>
+        <target> Le portail APF s’engage à rendre ses services numériques accessibles, conformément au RGAA 4.1 et à la norme WCAG 2.2 niveau AA, avec des critères AAA ciblés sur les points à fort impact pour les usagers de l’association (voir ADR-0016). </target>
+      </trans-unit>
+      <trans-unit id="page.accessibility.intro.title" datatype="html">
+        <source> About this statement </source>
+        <target> À propos de cette déclaration </target>
+      </trans-unit>
+      <trans-unit id="page.accessibility.panel.body" datatype="html">
+        <source> This statement is awaiting review and sign-off by the APF France handicap user panel. The final version will integrate the RGAA audit grid, the list of any identified gaps, the remediation plan, and the contact details for reporting accessibility issues. </source>
+        <target> Cette déclaration est en attente de revue et de validation par le panel d’usagers d’APF France handicap. La version définitive intégrera la grille d’audit RGAA, le recensement des écarts éventuels, le plan de mise en conformité, et les coordonnées de signalement. </target>
+      </trans-unit>
+      <trans-unit id="page.accessibility.panel.title" datatype="html">
+        <source> Status of this document </source>
+        <target> Statut du présent document </target>
+      </trans-unit>
+      <trans-unit id="page.accessibility.title" datatype="html">
+        <source> Accessibility statement </source>
+        <target> Déclaration d’accessibilité </target>
+      </trans-unit>
+
       <!-- page.home -->
       <trans-unit id="page.home.intro" datatype="html">
         <source> This is the placeholder home page for the APF Portal. Real content lands once the comms team and the accessibility review panel sign off on the copy. </source>