From 66357162f8e1227495f09bd4f68446aad7071c6d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 12 Aug 2020 10:40:04 +0200 Subject: Migrate to $localize * Remove i18n polyfill to translate things in components * Reduce bundle sizes * Improve runtime perf * Reduce a lot the time to make a full client build * Reduce client build complexity * We don't need a service to translate things anymore (so we will be able to translate title pages etc) Unfortunately we may loose some translations in the migration process. I'll put a message on weblate to notify translators --- .../video-block-list/video-block-list.component.ts | 42 ++++++++++------------ 1 file changed, 19 insertions(+), 23 deletions(-) (limited to 'client/src/app/+admin/moderation') diff --git a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts index 422d873c0..2b1ef663c 100644 --- a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts +++ b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts @@ -1,15 +1,14 @@ import { SortMeta } from 'primeng/api' import { filter, switchMap } from 'rxjs/operators' +import { buildVideoLink, buildVideoOrPlaylistEmbed } from 'src/assets/player/utils' +import { environment } from 'src/environments/environment' import { AfterViewInit, Component, OnInit } from '@angular/core' +import { DomSanitizer } from '@angular/platform-browser' import { ActivatedRoute, Params, Router } from '@angular/router' import { ConfirmService, MarkdownService, Notifier, RestPagination, RestTable, ServerService } from '@app/core' import { DropdownAction, Video, VideoService } from '@app/shared/shared-main' import { VideoBlockService } from '@app/shared/shared-moderation' -import { I18n } from '@ngx-translate/i18n-polyfill' import { VideoBlacklist, VideoBlacklistType } from '@shared/models' -import { buildVideoOrPlaylistEmbed, buildVideoLink } from 'src/assets/player/utils' -import { environment } from 'src/environments/environment' -import { DomSanitizer } from '@angular/platform-browser' @Component({ selector: 'my-video-block-list', @@ -34,26 +33,25 @@ export class VideoBlockListComponent extends RestTable implements OnInit, AfterV private sanitizer: DomSanitizer, private videoService: VideoService, private route: ActivatedRoute, - private router: Router, - private i18n: I18n - ) { + private router: Router + ) { super() this.videoBlocklistActions = [ [ { - label: this.i18n('Internal actions'), + label: $localize`Internal actions`, isHeader: true, isDisplayed: videoBlock => videoBlock.type === VideoBlacklistType.AUTO_BEFORE_PUBLISHED }, { - label: this.i18n('Switch video block to manual'), + label: $localize`Switch video block to manual`, handler: videoBlock => { this.videoBlocklistService.unblockVideo(videoBlock.video.id).pipe( switchMap(_ => this.videoBlocklistService.blockVideo(videoBlock.video.id, undefined, true)) ).subscribe( () => { - this.notifier.success(this.i18n('Video {{name}} switched to manual block.', { name: videoBlock.video.name })) + this.notifier.success($localize`Video ${videoBlock.video.name} switched to manual block.`) this.loadData() }, @@ -65,27 +63,27 @@ export class VideoBlockListComponent extends RestTable implements OnInit, AfterV ], [ { - label: this.i18n('Actions for the video'), + label: $localize`Actions for the video`, isHeader: true }, { - label: this.i18n('Unblock'), + label: $localize`Unblock`, handler: videoBlock => this.unblockVideo(videoBlock) }, { - label: this.i18n('Delete'), + label: $localize`Delete`, handler: async videoBlock => { const res = await this.confirmService.confirm( - this.i18n('Do you really want to delete this video?'), - this.i18n('Delete') + $localize`Do you really want to delete this video?`, + $localize`Delete` ) if (res === false) return this.videoService.removeVideo(videoBlock.video.id) .subscribe( () => { - this.notifier.success(this.i18n('Video deleted.')) + this.notifier.success($localize`Video deleted.`) }, err => this.notifier.error(err.message) @@ -148,9 +146,9 @@ export class VideoBlockListComponent extends RestTable implements OnInit, AfterV } booleanToText (value: boolean) { - if (value === true) return this.i18n('yes') + if (value === true) return $localize`yes` - return this.i18n('no') + return $localize`no` } toHtml (text: string) { @@ -158,16 +156,14 @@ export class VideoBlockListComponent extends RestTable implements OnInit, AfterV } async unblockVideo (entry: VideoBlacklist) { - const confirmMessage = this.i18n( - 'Do you really want to unblock this video? It will be available again in the videos list.' - ) + const confirmMessage = $localize`Do you really want to unblock this video? It will be available again in the videos list.` - const res = await this.confirmService.confirm(confirmMessage, this.i18n('Unblock')) + const res = await this.confirmService.confirm(confirmMessage, $localize`Unblock`) if (res === false) return this.videoBlocklistService.unblockVideo(entry.video.id).subscribe( () => { - this.notifier.success(this.i18n('Video {{name}} unblocked.', { name: entry.video.name })) + this.notifier.success($localize`Video ${entry.video.name} unblocked.`) this.loadData() }, -- cgit v1.2.3