From 7738273b808f0ff1494f18c4cc13553505e6ac6d Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Fri, 10 Jan 2020 19:50:48 +0100 Subject: Accessibility fixes for #2149 --- client/src/app/+admin/users/user-edit/user-edit.component.html | 2 +- .../my-account-change-email/my-account-change-email.component.html | 2 +- .../my-account-change-password.component.html | 6 +++--- client/src/app/+signup/+register/register-step-user.component.html | 2 +- .../video-channel-videos/video-channel-videos.component.ts | 2 +- client/src/app/+video-channels/video-channels.component.html | 2 +- client/src/app/header/header.component.html | 2 +- client/src/app/header/header.component.ts | 7 ++++++- client/src/app/login/login.component.html | 2 +- client/src/app/reset-password/reset-password.component.html | 4 ++-- client/src/app/shared/images/global-icon.component.ts | 4 ++-- client/src/app/shared/video/video-thumbnail.component.html | 4 ++-- client/src/sass/primeng-custom.scss | 1 + 13 files changed, 23 insertions(+), 17 deletions(-) (limited to 'client/src') diff --git a/client/src/app/+admin/users/user-edit/user-edit.component.html b/client/src/app/+admin/users/user-edit/user-edit.component.html index 6282d48a4..4ff4d0d12 100644 --- a/client/src/app/+admin/users/user-edit/user-edit.component.html +++ b/client/src/app/+admin/users/user-edit/user-edit.component.html @@ -30,7 +30,7 @@
diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html index 5492cdf22..76886c73e 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html +++ b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html @@ -24,7 +24,7 @@
diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html index a39061ee3..cec70c6b5 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html +++ b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html @@ -4,7 +4,7 @@
@@ -12,7 +12,7 @@
@@ -20,7 +20,7 @@
diff --git a/client/src/app/+signup/+register/register-step-user.component.html b/client/src/app/+signup/+register/register-step-user.component.html index 4381702ae..a2a657660 100644 --- a/client/src/app/+signup/+register/register-step-user.component.html +++ b/client/src/app/+signup/+register/register-step-user.component.html @@ -51,7 +51,7 @@
diff --git a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts index c1dc25aaf..f4fe14662 100644 --- a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts +++ b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts @@ -72,7 +72,7 @@ export class VideoChannelVideosComponent extends AbstractVideoList implements On .getVideoChannelVideos(this.videoChannel, newPagination, this.sort) .pipe( tap(({ total }) => { - this.titlePage = this.i18n('Published {{total}} videos', { total }) + this.titlePage = this.i18n(`{total, plural, =1 {Published 1 video} other {Published ${total} videos}}`, { total }) }) ) } diff --git a/client/src/app/+video-channels/video-channels.component.html b/client/src/app/+video-channels/video-channels.component.html index 8ab79526d..065fc2c04 100644 --- a/client/src/app/+video-channels/video-channels.component.html +++ b/client/src/app/+video-channels/video-channels.component.html @@ -20,7 +20,7 @@
-
{{ videoChannel.followersCount }} subscribers
+
{videoChannel.followersCount, plural, =1 {1 subscriber} other {{{ videoChannel.followersCount }} subscribers}}
Created by {{ videoChannel.ownerBy }} diff --git a/client/src/app/header/header.component.html b/client/src/app/header/header.component.html index 599861817..1bdfe9858 100644 --- a/client/src/app/header/header.component.html +++ b/client/src/app/header/header.component.html @@ -1,5 +1,5 @@ diff --git a/client/src/app/header/header.component.ts b/client/src/app/header/header.component.ts index 580535669..5fd122930 100644 --- a/client/src/app/header/header.component.ts +++ b/client/src/app/header/header.component.ts @@ -5,6 +5,7 @@ import { getParameterByName } from '../shared/misc/utils' import { AuthService, ServerService, Notifier } from '@app/core' import { of } from 'rxjs' import { ServerConfig } from '@shared/models' +import { I18n } from '@ngx-translate/i18n-polyfill' @Component({ selector: 'my-header', @@ -14,6 +15,7 @@ import { ServerConfig } from '@shared/models' export class HeaderComponent implements OnInit { searchValue = '' + ariaLabelTextForSearch = '' private serverConfig: ServerConfig @@ -23,10 +25,13 @@ export class HeaderComponent implements OnInit { private auth: AuthService, private serverService: ServerService, private authService: AuthService, - private notifier: Notifier + private notifier: Notifier, + private i18n: I18n ) {} ngOnInit () { + this.ariaLabelTextForSearch = this.i18n('Search videos, channels') + this.router.events .pipe( filter(e => e instanceof NavigationEnd), diff --git a/client/src/app/login/login.component.html b/client/src/app/login/login.component.html index 162f44ded..6c6a41c4a 100644 --- a/client/src/app/login/login.component.html +++ b/client/src/app/login/login.component.html @@ -51,7 +51,7 @@
I forgot my password diff --git a/client/src/app/reset-password/reset-password.component.html b/client/src/app/reset-password/reset-password.component.html index 8398be091..af30af4a0 100644 --- a/client/src/app/reset-password/reset-password.component.html +++ b/client/src/app/reset-password/reset-password.component.html @@ -7,7 +7,7 @@
@@ -18,7 +18,7 @@
diff --git a/client/src/app/shared/images/global-icon.component.ts b/client/src/app/shared/images/global-icon.component.ts index 17186cff4..806aca347 100644 --- a/client/src/app/shared/images/global-icon.component.ts +++ b/client/src/app/shared/images/global-icon.component.ts @@ -1,5 +1,6 @@ import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit } from '@angular/core' import { HooksService } from '@app/core/plugins/hooks.service' +import { I18n } from '@ngx-translate/i18n-polyfill' const icons = { 'add': require('!!raw-loader?!../../../assets/images/global/add.svg'), @@ -70,8 +71,7 @@ export class GlobalIconComponent implements OnInit { ) { } async ngOnInit () { - const nativeElement = this.el.nativeElement - + const nativeElement = this.el.nativeElement as HTMLElement nativeElement.innerHTML = await this.hooks.wrapFun( this.getSVGContent.bind(this), { name: this.iconName }, diff --git a/client/src/app/shared/video/video-thumbnail.component.html b/client/src/app/shared/video/video-thumbnail.component.html index 7e71a390b..b63085b81 100644 --- a/client/src/app/shared/video/video-thumbnail.component.html +++ b/client/src/app/shared/video/video-thumbnail.component.html @@ -1,8 +1,8 @@ - +
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 9aa4d980c..238cb8454 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -8,6 +8,7 @@ font-family: 'Glyphicons Halflings'; text-decoration: none !important; color: var(--mainForegroundColor) !important; + font-display: swap; } my-edit-button, -- cgit v1.2.3