yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-03 09:49:20 +02:00
Code Issues Releases Wiki Activity

Migrate to $localize

Browse source 
* 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
This commit is contained in:
Chocobozzz 2020-08-12 10:40:04 +02:00
parent 8c36074799
commit 66357162f8
No known key found for this signature in database
GPG key ID: 583A612D890159BE
136 changed files with 1064 additions and 1631 deletions
Download patch file Download diff file Expand all files Collapse all files

103
client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts
View file

@ -1,7 +1,6 @@
import { Component, EventEmitter, Input, OnChanges, OnInit, Output, ViewChild } from '@angular/core'
import { AuthService, ConfirmService, Notifier, ServerService, UserService } from '@app/core'
import { Account, DropdownAction } from '@app/shared/shared-main'
import { I18n } from '@ngx-translate/i18n-polyfill'
import { BulkRemoveCommentsOfBody, ServerConfig, User, UserRight } from '@shared/models'
import { BlocklistService } from './blocklist.service'
import { BulkService } from './bulk.service'
@ -37,8 +36,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
private serverService: ServerService,
private userService: UserService,
private blocklistService: BlocklistService,
private bulkService: BulkService,
private i18n: I18n
private bulkService: BulkService
) { }
get requiresEmailVerification () {
@ -57,7 +55,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
openBanUserModal (user: User) {
if (user.username === 'root') {
this.notifier.error(this.i18n('You cannot ban root.'))
this.notifier.error($localize`You cannot ban root.`)
return
}
@ -69,15 +67,13 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
}
async unbanUser (user: User) {
const message = this.i18n('Do you really want to unban {{username}}?', { username: user.username })
const res = await this.confirmService.confirm(message, this.i18n('Unban'))
const res = await this.confirmService.confirm($localize`Do you really want to unban ${user.username}?`, $localize`Unban`)
if (res === false) return
this.userService.unbanUsers(user)
.subscribe(
() => {
this.notifier.success(this.i18n('User {{username}} unbanned.', { username: user.username }))
this.notifier.success($localize`User ${user.username} unbanned.`)
this.userChanged.emit()
},
@ -87,17 +83,17 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
async removeUser (user: User) {
if (user.username === 'root') {
this.notifier.error(this.i18n('You cannot delete root.'))
this.notifier.error($localize`You cannot delete root.`)
return
}
const message = this.i18n('If you remove this user, you will not be able to create another with the same username!')
const res = await this.confirmService.confirm(message, this.i18n('Delete'))
const message = $localize`If you remove this user, you will not be able to create another with the same username!`
const res = await this.confirmService.confirm(message, $localize`Delete`)
if (res === false) return
this.userService.removeUser(user).subscribe(
() => {
this.notifier.success(this.i18n('User {{username}} deleted.', { username: user.username }))
this.notifier.success($localize`User ${user.username} deleted.`)
this.userDeleted.emit()
},
@ -108,8 +104,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
setEmailAsVerified (user: User) {
this.userService.updateUser(user.id, { emailVerified: true }).subscribe(
() => {
this.notifier.success(this.i18n('User {{username}} email set as verified', { username: user.username }))
this.notifier.success($localize`User ${user.username} email set as verified`)
this.userChanged.emit()
},
@ -121,7 +116,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
this.blocklistService.blockAccountByUser(account)
.subscribe(
() => {
this.notifier.success(this.i18n('Account {{nameWithHost}} muted.', { nameWithHost: account.nameWithHost }))
this.notifier.success($localize`Account ${account.nameWithHost} muted.`)
this.account.mutedByUser = true
this.userChanged.emit()
@ -135,7 +130,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
this.blocklistService.unblockAccountByUser(account)
.subscribe(
() => {
this.notifier.success(this.i18n('Account {{nameWithHost}} unmuted.', { nameWithHost: account.nameWithHost }))
this.notifier.success($localize`Account ${account.nameWithHost} unmuted.`)
this.account.mutedByUser = false
this.userChanged.emit()
@ -149,7 +144,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
this.blocklistService.blockServerByUser(host)
.subscribe(
() => {
this.notifier.success(this.i18n('Instance {{host}} muted.', { host }))
this.notifier.success($localize`Instance ${host} muted.`)
this.account.mutedServerByUser = true
this.userChanged.emit()
@ -163,7 +158,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
this.blocklistService.unblockServerByUser(host)
.subscribe(
() => {
this.notifier.success(this.i18n('Instance {{host}} unmuted.', { host }))
this.notifier.success($localize`Instance ${host} unmuted.`)
this.account.mutedServerByUser = false
this.userChanged.emit()
@ -177,7 +172,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
this.blocklistService.blockAccountByInstance(account)
.subscribe(
() => {
this.notifier.success(this.i18n('Account {{nameWithHost}} muted by the instance.', { nameWithHost: account.nameWithHost }))
this.notifier.success($localize`Account ${account.nameWithHost} muted by the instance.`)
this.account.mutedByInstance = true
this.userChanged.emit()
@ -191,7 +186,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
this.blocklistService.unblockAccountByInstance(account)
.subscribe(
() => {
this.notifier.success(this.i18n('Account {{nameWithHost}} unmuted by the instance.', { nameWithHost: account.nameWithHost }))
this.notifier.success($localize`Account ${account.nameWithHost} unmuted by the instance.`)
this.account.mutedByInstance = false
this.userChanged.emit()
@ -205,7 +200,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
this.blocklistService.blockServerByInstance(host)
.subscribe(
() => {
this.notifier.success(this.i18n('Instance {{host}} muted by the instance.', { host }))
this.notifier.success($localize`Instance ${host} muted by the instance.`)
this.account.mutedServerByInstance = true
this.userChanged.emit()
@ -219,7 +214,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
this.blocklistService.unblockServerByInstance(host)
.subscribe(
() => {
this.notifier.success(this.i18n('Instance {{host}} unmuted by the instance.', { host }))
this.notifier.success($localize`Instance ${host} unmuted by the instance.`)
this.account.mutedServerByInstance = false
this.userChanged.emit()
@ -230,14 +225,14 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
}
async bulkRemoveCommentsOf (body: BulkRemoveCommentsOfBody) {
const message = this.i18n('Are you sure you want to remove all the comments of this account?')
const res = await this.confirmService.confirm(message, this.i18n('Delete account comments'))
const message = $localize`Are you sure you want to remove all the comments of this account?`
const res = await this.confirmService.confirm(message, $localize`Delete account comments`)
if (res === false) return
this.bulkService.removeCommentsOf(body)
.subscribe(
() => {
this.notifier.success(this.i18n('Will remove comments of this account (may take several minutes).'))
this.notifier.success($localize`Will remove comments of this account (may take several minutes).`)
},
err => this.notifier.error(err.message)
@ -265,29 +260,29 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
if (this.user && authUser.hasRight(UserRight.MANAGE_USERS) && authUser.canManage(this.user)) {
this.userActions.push([
{
label: this.i18n('Edit user'),
description: this.i18n('Change quota, role, and more.'),
label: $localize`Edit user`,
description: $localize`Change quota, role, and more.`,
linkBuilder: ({ user }) => this.getRouterUserEditLink(user)
},
{
label: this.i18n('Delete user'),
description: this.i18n('Videos will be deleted, comments will be tombstoned.'),
label: $localize`Delete user`,
description: $localize`Videos will be deleted, comments will be tombstoned.`,
handler: ({ user }) => this.removeUser(user)
},
{
label: this.i18n('Ban'),
description: this.i18n('User won\'t be able to login anymore, but videos and comments will be kept as is.'),
label: $localize`Ban`,
description: $localize`User won't be able to login anymore, but videos and comments will be kept as is.`,
handler: ({ user }) => this.openBanUserModal(user),
isDisplayed: ({ user }) => !user.blocked
},
{
label: this.i18n('Unban user'),
description: this.i18n('Allow the user to login and create videos/comments again'),
label: $localize`Unban user`,
description: $localize`Allow the user to login and create videos/comments again`,
handler: ({ user }) => this.unbanUser(user),
isDisplayed: ({ user }) => user.blocked
},
{
label: this.i18n('Set Email as Verified'),
label: $localize`Set Email as Verified`,
handler: ({ user }) => this.setEmailAsVerified(user),
isDisplayed: ({ user }) => this.requiresEmailVerification && !user.blocked && user.emailVerified === false
}
@ -299,32 +294,32 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
// User actions
this.userActions.push([
{
label: this.i18n('Mute this account'),
description: this.i18n('Hide any content from that user for you.'),
label: $localize`Mute this account`,
description: $localize`Hide any content from that user for you.`,
isDisplayed: ({ account }) => account.mutedByUser === false,
handler: ({ account }) => this.blockAccountByUser(account)
},
{
label: this.i18n('Unmute this account'),
description: this.i18n('Show back content from that user for you.'),
label: $localize`Unmute this account`,
description: $localize`Show back content from that user for you.`,
isDisplayed: ({ account }) => account.mutedByUser === true,
handler: ({ account }) => this.unblockAccountByUser(account)
},
{
label: this.i18n('Mute the instance'),
description: this.i18n('Hide any content from that instance for you.'),
label: $localize`Mute the instance`,
description: $localize`Hide any content from that instance for you.`,
isDisplayed: ({ account }) => !account.userId && account.mutedServerByInstance === false,
handler: ({ account }) => this.blockServerByUser(account.host)
},
{
label: this.i18n('Unmute the instance'),
description: this.i18n('Show back content from that instance for you.'),
label: $localize`Unmute the instance`,
description: $localize`Show back content from that instance for you.`,
isDisplayed: ({ account }) => !account.userId && account.mutedServerByInstance === true,
handler: ({ account }) => this.unblockServerByUser(account.host)
},
{
label: this.i18n('Remove comments from your videos'),
description: this.i18n('Remove comments of this account from your videos.'),
label: $localize`Remove comments from your videos`,
description: $localize`Remove comments of this account from your videos.`,
handler: ({ account }) => this.bulkRemoveCommentsOf({ accountName: account.nameWithHost, scope: 'my-videos' })
}
])
@ -335,14 +330,14 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
if (authUser.hasRight(UserRight.MANAGE_ACCOUNTS_BLOCKLIST)) {
instanceActions = instanceActions.concat([
{
label: this.i18n('Mute this account by your instance'),
description: this.i18n('Hide any content from that user for you, your instance and its users.'),
label: $localize`Mute this account by your instance`,
description: $localize`Hide any content from that user for you, your instance and its users.`,
isDisplayed: ({ account }) => account.mutedByInstance === false,
handler: ({ account }) => this.blockAccountByInstance(account)
},
{
label: this.i18n('Unmute this account by your instance'),
description: this.i18n('Show back content from that user for you, your instance and its users.'),
label: $localize`Unmute this account by your instance`,
description: $localize`Show back content from that user for you, your instance and its users.`,
isDisplayed: ({ account }) => account.mutedByInstance === true,
handler: ({ account }) => this.unblockAccountByInstance(account)
}
@ -353,14 +348,14 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
if (authUser.hasRight(UserRight.MANAGE_SERVERS_BLOCKLIST)) {
instanceActions = instanceActions.concat([
{
label: this.i18n('Mute the instance by your instance'),
description: this.i18n('Hide any content from that instance for you, your instance and its users.'),
label: $localize`Mute the instance by your instance`,
description: $localize`Hide any content from that instance for you, your instance and its users.`,
isDisplayed: ({ account }) => !account.userId && account.mutedServerByInstance === false,
handler: ({ account }) => this.blockServerByInstance(account.host)
},
{
label: this.i18n('Unmute the instance by your instance'),
description: this.i18n('Show back content from that instance for you, your instance and its users.'),
label: $localize`Unmute the instance by your instance`,
description: $localize`Show back content from that instance for you, your instance and its users.`,
isDisplayed: ({ account }) => !account.userId && account.mutedServerByInstance === true,
handler: ({ account }) => this.unblockServerByInstance(account.host)
}
@ -370,8 +365,8 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
if (authUser.hasRight(UserRight.REMOVE_ANY_VIDEO_COMMENT)) {
instanceActions = instanceActions.concat([
{
label: this.i18n('Remove comments from your instance'),
description: this.i18n('Remove comments of this account from your instance.'),
label: $localize`Remove comments from your instance`,
description: $localize`Remove comments of this account from your instance.`,
handler: ({ account }) => this.bulkRemoveCommentsOf({ accountName: account.nameWithHost, scope: 'instance' })
}
])