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) => { diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html index 83b0068ca9..b8b9ec0658 100644 --- a/src/app/footer/footer.component.html +++ b/src/app/footer/footer.component.html @@ -68,6 +68,10 @@ {{ 'footer.link.cookies' | translate}} +
  • + {{ 'footer.link.accessibility' | translate }} +
  • {{ 'footer.link.privacy-policy' | translate}} @@ -80,10 +84,6 @@ {{ 'footer.link.feedback' | translate}}
  • -
  • - {{ 'footer.link.accessibility' | translate }} -
  • diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index b65f9a12fa..7a2f5a55ef 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1926,7 +1926,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",