From bd06eded8c513b0e2ae82e41c50c41cfbcca0d61 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 7 Mar 2025 10:02:57 +0100
Subject: [PATCH 1/3] 119602: Fix small accessibility settings typo

---
 src/assets/i18n/en.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index b03e2bb0cc..8ca7f0e213 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1860,7 +1860,7 @@
 
   "info.accessibility-settings.liveRegionTimeOut.label": "ARIA Live region time out (in seconds)",
 
-  "info.accessibility-settings.liveRegionTimeOut.hint": "The duration after which a message in the ARIA live region disappears. ARIA live regions are not visible on the page, but proivde announcements of notifications (or other actions) to screen readers.",
+  "info.accessibility-settings.liveRegionTimeOut.hint": "The duration after which a message in the ARIA live region disappears. ARIA live regions are not visible on the page, but provide announcements of notifications (or other actions) to screen readers.",
 
   "info.accessibility-settings.liveRegionTimeOut.invalid": "Live region time out must be greater than 0",
 

From 7ab598d571a4f2314204634a336c638fd64b61dc Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 7 Mar 2025 10:03:57 +0100
Subject: [PATCH 2/3] 119602: Reorder footer links

---
 src/app/footer/footer.component.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html
index d3534706e8..8e04c7c035 100644
--- a/src/app/footer/footer.component.html
+++ b/src/app/footer/footer.component.html
@@ -67,6 +67,10 @@
             <a class="text-white" href="javascript:void(0);"
              (click)="showCookieSettings()">{{ 'footer.link.cookies' | translate}}</a>
         </li>
+        <li>
+          <a class="text-white"
+             routerLink="info/accessibility">{{ 'footer.link.accessibility' | translate }}</a>
+        </li>
         <li *ngIf="showPrivacyPolicy">
           <a class="text-white"
              routerLink="info/privacy">{{ 'footer.link.privacy-policy' | translate}}</a>
@@ -79,10 +83,6 @@
           <a class="text-white"
              routerLink="info/feedback">{{ 'footer.link.feedback' | translate}}</a>
         </li>
-        <li>
-          <a class="text-white"
-             routerLink="info/accessibility">{{ 'footer.link.accessibility' | translate }}</a>
-        </li>
       </ul>
     </div>
   </div>

From 122d31b11bee9b33ae5bd25936ee1bbe8e2fc05d Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 7 Mar 2025 12:58:31 +0100
Subject: [PATCH 3/3] 119602: Make KlaroService optional in AccSettingsService

---
 src/app/accessibility/accessibility-settings.service.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/accessibility/accessibility-settings.service.ts b/src/app/accessibility/accessibility-settings.service.ts
index 6db4c58977..411d7fae1f 100644
--- a/src/app/accessibility/accessibility-settings.service.ts
+++ b/src/app/accessibility/accessibility-settings.service.ts
@@ -1,4 +1,4 @@
-import { Inject, Injectable } from '@angular/core';
+import { Inject, Injectable, Optional } from '@angular/core';
 import { Observable, of, switchMap, combineLatest } from 'rxjs';
 import { map, take } from 'rxjs/operators';
 import { CookieService } from '../core/services/cookie.service';
@@ -69,7 +69,7 @@ export class AccessibilitySettingsService {
     protected cookieService: CookieService,
     protected authService: AuthService,
     protected ePersonService: EPersonDataService,
-    protected klaroService: KlaroService,
+    @Optional() protected klaroService: KlaroService,
     @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
   }
@@ -223,6 +223,10 @@ export class AccessibilitySettingsService {
    * Emits 'failed' when setting in a cookie failed due to the cookie not being accepted, 'cookie' when it succeeded.
    */
   setSettingsInCookie(settings: AccessibilitySettings): Observable<'cookie' | 'failed'> {
+    if (hasNoValue(this.klaroService)) {
+      return of('failed');
+    }
+
     return this.klaroService.getSavedPreferences().pipe(
       map(preferences => preferences.accessibility),
       map((accessibilityCookieAccepted: boolean) => {