From 9639bd175726b73f8fe664b5ced12a72407b1f0b Mon Sep 17 00:00:00 2001 From: buoyantair Date: Mon, 29 Oct 2018 22:18:31 +0530 Subject: [PATCH 001/137] Move utils to /shared Move utils used by /server/tools/* & /server/tests/**/* into /shared folder. Issue: #1336 --- server/tests/activitypub.ts | 9 ++++++- server/tests/api/check-params/accounts.ts | 10 ++++--- server/tests/api/check-params/blocklist.ts | 8 ++++-- server/tests/api/check-params/config.ts | 2 +- server/tests/api/check-params/follows.ts | 8 ++++-- server/tests/api/check-params/jobs.ts | 18 ++++++++++--- server/tests/api/check-params/redundancy.ts | 2 +- server/tests/api/check-params/search.ts | 8 ++++-- server/tests/api/check-params/services.ts | 10 ++++++- .../api/check-params/user-subscriptions.ts | 8 ++++-- server/tests/api/check-params/users.ts | 12 ++++++--- server/tests/api/check-params/video-abuses.ts | 8 ++++-- .../tests/api/check-params/video-blacklist.ts | 8 ++++-- .../tests/api/check-params/video-captions.ts | 4 +-- .../tests/api/check-params/video-channels.ts | 8 ++++-- .../tests/api/check-params/video-comments.ts | 10 ++++--- .../tests/api/check-params/video-imports.ts | 10 ++++--- .../tests/api/check-params/videos-filter.ts | 2 +- .../tests/api/check-params/videos-history.ts | 2 +- server/tests/api/check-params/videos.ts | 10 ++++--- server/tests/api/redundancy/redundancy.ts | 8 +++--- .../search-activitypub-video-channels.ts | 6 ++--- .../api/search/search-activitypub-videos.ts | 4 +-- server/tests/api/search/search-videos.ts | 2 +- server/tests/api/server/config.ts | 7 +++-- server/tests/api/server/email.ts | 13 +++++---- server/tests/api/server/follows.ts | 27 +++++++++++-------- server/tests/api/server/handle-down.ts | 15 +++++++---- server/tests/api/server/jobs.ts | 12 ++++----- server/tests/api/server/redundancy.ts | 8 +++--- server/tests/api/server/reverse-proxy.ts | 4 +-- server/tests/api/server/stats.ts | 10 +++---- server/tests/api/server/tracker.ts | 4 +-- server/tests/api/users/blocklist.ts | 12 ++++----- server/tests/api/users/user-subscriptions.ts | 19 +++++++++---- .../tests/api/users/users-multiple-servers.ts | 10 +++---- server/tests/api/users/users-verification.ts | 8 +++--- server/tests/api/users/users.ts | 8 +++--- server/tests/api/videos/multiple-servers.ts | 6 ++--- server/tests/api/videos/services.ts | 12 +++++++-- server/tests/api/videos/single-server.ts | 2 +- server/tests/api/videos/video-abuse.ts | 6 ++--- .../api/videos/video-blacklist-management.ts | 6 ++--- server/tests/api/videos/video-blacklist.ts | 6 ++--- server/tests/api/videos/video-captions.ts | 15 ++++++++--- .../api/videos/video-change-ownership.ts | 4 +-- server/tests/api/videos/video-channels.ts | 6 ++--- server/tests/api/videos/video-comments.ts | 6 ++--- server/tests/api/videos/video-description.ts | 6 ++--- server/tests/api/videos/video-imports.ts | 6 ++--- server/tests/api/videos/video-nsfw.ts | 17 ++++++++---- server/tests/api/videos/video-privacy.ts | 12 ++++----- .../tests/api/videos/video-schedule-update.ts | 4 +-- server/tests/api/videos/video-transcoder.ts | 4 +-- server/tests/api/videos/videos-filter.ts | 2 +- server/tests/api/videos/videos-history.ts | 4 +-- server/tests/api/videos/videos-overview.ts | 4 +-- .../tests/cli/create-import-video-file-job.ts | 4 +-- server/tests/cli/create-transcoding-job.ts | 4 +-- server/tests/cli/optimize-old-videos.ts | 4 +-- server/tests/cli/peertube.ts | 2 +- server/tests/cli/reset-password.ts | 2 +- server/tests/cli/update-host.ts | 8 +++--- server/tests/client.ts | 2 +- server/tests/feeds/feeds.ts | 6 ++--- server/tests/misc-endpoints.ts | 2 +- server/tests/real-world/populate-database.ts | 2 +- server/tests/real-world/real-world.ts | 4 +-- server/tools/peertube-get-access-token.ts | 2 +- server/tools/peertube-import-videos.ts | 2 +- server/tools/peertube-upload.ts | 4 +-- {server/tests => shared}/utils/cli/cli.ts | 0 {server/tests => shared}/utils/feeds/feeds.ts | 0 {server/tests => shared}/utils/index.ts | 0 {server/tests => shared}/utils/miscs/email.ts | 0 {server/tests => shared}/utils/miscs/miscs.ts | 0 .../utils/overviews/overviews.ts | 0 .../utils/requests/check-api-params.ts | 0 .../utils/requests/requests.ts | 0 .../utils/search/video-channels.ts | 0 .../tests => shared}/utils/search/videos.ts | 0 .../utils/server/activitypub.ts | 0 .../tests => shared}/utils/server/clients.ts | 0 .../tests => shared}/utils/server/config.ts | 0 .../tests => shared}/utils/server/follows.ts | 0 {server/tests => shared}/utils/server/jobs.ts | 0 .../utils/server/redundancy.ts | 0 .../tests => shared}/utils/server/servers.ts | 0 .../tests => shared}/utils/server/stats.ts | 0 .../tests => shared}/utils/users/accounts.ts | 0 .../tests => shared}/utils/users/blocklist.ts | 0 {server/tests => shared}/utils/users/login.ts | 0 .../utils/users/user-subscriptions.ts | 0 {server/tests => shared}/utils/users/users.ts | 4 +-- .../tests => shared}/utils/videos/services.ts | 0 .../utils/videos/video-abuses.ts | 0 .../utils/videos/video-blacklist.ts | 0 .../utils/videos/video-captions.ts | 0 .../utils/videos/video-change-ownership.ts | 0 .../utils/videos/video-channels.ts | 0 .../utils/videos/video-comments.ts | 0 .../utils/videos/video-history.ts | 0 .../utils/videos/video-imports.ts | 0 .../tests => shared}/utils/videos/videos.ts | 0 104 files changed, 318 insertions(+), 196 deletions(-) rename {server/tests => shared}/utils/cli/cli.ts (100%) rename {server/tests => shared}/utils/feeds/feeds.ts (100%) rename {server/tests => shared}/utils/index.ts (100%) rename {server/tests => shared}/utils/miscs/email.ts (100%) rename {server/tests => shared}/utils/miscs/miscs.ts (100%) rename {server/tests => shared}/utils/overviews/overviews.ts (100%) rename {server/tests => shared}/utils/requests/check-api-params.ts (100%) rename {server/tests => shared}/utils/requests/requests.ts (100%) rename {server/tests => shared}/utils/search/video-channels.ts (100%) rename {server/tests => shared}/utils/search/videos.ts (100%) rename {server/tests => shared}/utils/server/activitypub.ts (100%) rename {server/tests => shared}/utils/server/clients.ts (100%) rename {server/tests => shared}/utils/server/config.ts (100%) rename {server/tests => shared}/utils/server/follows.ts (100%) rename {server/tests => shared}/utils/server/jobs.ts (100%) rename {server/tests => shared}/utils/server/redundancy.ts (100%) rename {server/tests => shared}/utils/server/servers.ts (100%) rename {server/tests => shared}/utils/server/stats.ts (100%) rename {server/tests => shared}/utils/users/accounts.ts (100%) rename {server/tests => shared}/utils/users/blocklist.ts (100%) rename {server/tests => shared}/utils/users/login.ts (100%) rename {server/tests => shared}/utils/users/user-subscriptions.ts (100%) rename {server/tests => shared}/utils/users/users.ts (98%) rename {server/tests => shared}/utils/videos/services.ts (100%) rename {server/tests => shared}/utils/videos/video-abuses.ts (100%) rename {server/tests => shared}/utils/videos/video-blacklist.ts (100%) rename {server/tests => shared}/utils/videos/video-captions.ts (100%) rename {server/tests => shared}/utils/videos/video-change-ownership.ts (100%) rename {server/tests => shared}/utils/videos/video-channels.ts (100%) rename {server/tests => shared}/utils/videos/video-comments.ts (100%) rename {server/tests => shared}/utils/videos/video-history.ts (100%) rename {server/tests => shared}/utils/videos/video-imports.ts (100%) rename {server/tests => shared}/utils/videos/videos.ts (100%) diff --git a/server/tests/activitypub.ts b/server/tests/activitypub.ts index 53a04d363..0905c5dec 100644 --- a/server/tests/activitypub.ts +++ b/server/tests/activitypub.ts @@ -2,7 +2,14 @@ import * as chai from 'chai' import 'mocha' -import { flushTests, killallServers, makeActivityPubGetRequest, runServer, ServerInfo, setAccessTokensToServers } from './utils' +import { + flushTests, + killallServers, + makeActivityPubGetRequest, + runServer, + ServerInfo, + setAccessTokensToServers +} from '../../shared/utils' const expect = chai.expect diff --git a/server/tests/api/check-params/accounts.ts b/server/tests/api/check-params/accounts.ts index 9e0b1e35c..567fd072c 100644 --- a/server/tests/api/check-params/accounts.ts +++ b/server/tests/api/check-params/accounts.ts @@ -2,9 +2,13 @@ import 'mocha' -import { flushTests, killallServers, runServer, ServerInfo } from '../../utils' -import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params' -import { getAccount } from '../../utils/users/accounts' +import { flushTests, killallServers, runServer, ServerInfo } from '../../../../shared/utils' +import { + checkBadCountPagination, + checkBadSortPagination, + checkBadStartPagination +} from '../../../../shared/utils/requests/check-api-params' +import { getAccount } from '../../../../shared/utils/users/accounts' describe('Test users API validators', function () { const path = '/api/v1/accounts/' diff --git a/server/tests/api/check-params/blocklist.ts b/server/tests/api/check-params/blocklist.ts index c745ac975..c20453c16 100644 --- a/server/tests/api/check-params/blocklist.ts +++ b/server/tests/api/check-params/blocklist.ts @@ -13,8 +13,12 @@ import { makePostBodyRequest, ServerInfo, setAccessTokensToServers, userLogin -} from '../../utils' -import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params' +} from '../../../../shared/utils' +import { + checkBadCountPagination, + checkBadSortPagination, + checkBadStartPagination +} from '../../../../shared/utils/requests/check-api-params' describe('Test blocklist API validators', function () { let servers: ServerInfo[] diff --git a/server/tests/api/check-params/config.ts b/server/tests/api/check-params/config.ts index d807f910b..ffae380c1 100644 --- a/server/tests/api/check-params/config.ts +++ b/server/tests/api/check-params/config.ts @@ -7,7 +7,7 @@ import { CustomConfig } from '../../../../shared/models/server/custom-config.mod import { createUser, flushTests, killallServers, makeDeleteRequest, makeGetRequest, makePutBodyRequest, runServer, ServerInfo, setAccessTokensToServers, userLogin, immutableAssign -} from '../../utils' +} from '../../../../shared/utils' describe('Test config API validators', function () { const path = '/api/v1/config/custom' diff --git a/server/tests/api/check-params/follows.ts b/server/tests/api/check-params/follows.ts index cdc95c81a..2ad1575a3 100644 --- a/server/tests/api/check-params/follows.ts +++ b/server/tests/api/check-params/follows.ts @@ -5,8 +5,12 @@ import 'mocha' import { createUser, flushTests, killallServers, makeDeleteRequest, makePostBodyRequest, runServer, ServerInfo, setAccessTokensToServers, userLogin -} from '../../utils' -import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params' +} from '../../../../shared/utils' +import { + checkBadCountPagination, + checkBadSortPagination, + checkBadStartPagination +} from '../../../../shared/utils/requests/check-api-params' describe('Test server follows API validators', function () { let server: ServerInfo diff --git a/server/tests/api/check-params/jobs.ts b/server/tests/api/check-params/jobs.ts index ce3ac8809..89760ff98 100644 --- a/server/tests/api/check-params/jobs.ts +++ b/server/tests/api/check-params/jobs.ts @@ -2,9 +2,21 @@ import 'mocha' -import { createUser, flushTests, killallServers, runServer, ServerInfo, setAccessTokensToServers, userLogin } from '../../utils' -import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params' -import { makeGetRequest } from '../../utils/requests/requests' +import { + createUser, + flushTests, + killallServers, + runServer, + ServerInfo, + setAccessTokensToServers, + userLogin +} from '../../../../shared/utils' +import { + checkBadCountPagination, + checkBadSortPagination, + checkBadStartPagination +} from '../../../../shared/utils/requests/check-api-params' +import { makeGetRequest } from '../../../../shared/utils/requests/requests' describe('Test jobs API validators', function () { const path = '/api/v1/jobs/failed' diff --git a/server/tests/api/check-params/redundancy.ts b/server/tests/api/check-params/redundancy.ts index aa588e3dd..ff4726ceb 100644 --- a/server/tests/api/check-params/redundancy.ts +++ b/server/tests/api/check-params/redundancy.ts @@ -12,7 +12,7 @@ import { ServerInfo, setAccessTokensToServers, userLogin -} from '../../utils' +} from '../../../../shared/utils' describe('Test server redundancy API validators', function () { let servers: ServerInfo[] diff --git a/server/tests/api/check-params/search.ts b/server/tests/api/check-params/search.ts index eabf602ac..aa81965f3 100644 --- a/server/tests/api/check-params/search.ts +++ b/server/tests/api/check-params/search.ts @@ -2,8 +2,12 @@ import 'mocha' -import { flushTests, immutableAssign, killallServers, makeGetRequest, runServer, ServerInfo } from '../../utils' -import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params' +import { flushTests, immutableAssign, killallServers, makeGetRequest, runServer, ServerInfo } from '../../../../shared/utils' +import { + checkBadCountPagination, + checkBadSortPagination, + checkBadStartPagination +} from '../../../../shared/utils/requests/check-api-params' describe('Test videos API validator', function () { let server: ServerInfo diff --git a/server/tests/api/check-params/services.ts b/server/tests/api/check-params/services.ts index fcde7e179..28591af9d 100644 --- a/server/tests/api/check-params/services.ts +++ b/server/tests/api/check-params/services.ts @@ -2,7 +2,15 @@ import 'mocha' -import { flushTests, killallServers, makeGetRequest, runServer, ServerInfo, setAccessTokensToServers, uploadVideo } from '../../utils' +import { + flushTests, + killallServers, + makeGetRequest, + runServer, + ServerInfo, + setAccessTokensToServers, + uploadVideo +} from '../../../../shared/utils' describe('Test services API validators', function () { let server: ServerInfo diff --git a/server/tests/api/check-params/user-subscriptions.ts b/server/tests/api/check-params/user-subscriptions.ts index 9fba99ac8..2cf5a2415 100644 --- a/server/tests/api/check-params/user-subscriptions.ts +++ b/server/tests/api/check-params/user-subscriptions.ts @@ -13,8 +13,12 @@ import { ServerInfo, setAccessTokensToServers, userLogin -} from '../../utils' -import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params' +} from '../../../../shared/utils' +import { + checkBadCountPagination, + checkBadSortPagination, + checkBadStartPagination +} from '../../../../shared/utils/requests/check-api-params' describe('Test user subscriptions API validators', function () { const path = '/api/v1/users/me/subscriptions' diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts index ec46609a4..f4c177621 100644 --- a/server/tests/api/check-params/users.ts +++ b/server/tests/api/check-params/users.ts @@ -9,11 +9,15 @@ import { createUser, flushTests, getMyUserInformation, getMyUserVideoRating, getUsersList, immutableAssign, killallServers, makeGetRequest, makePostBodyRequest, makeUploadRequest, makePutBodyRequest, registerUser, removeUser, runServer, ServerInfo, setAccessTokensToServers, updateUser, uploadVideo, userLogin, deleteMe, unblockUser, blockUser -} from '../../utils' -import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params' -import { getMagnetURI, getMyVideoImports, getYoutubeVideoUrl, importVideo } from '../../utils/videos/video-imports' +} from '../../../../shared/utils' +import { + checkBadCountPagination, + checkBadSortPagination, + checkBadStartPagination +} from '../../../../shared/utils/requests/check-api-params' +import { getMagnetURI, getMyVideoImports, getYoutubeVideoUrl, importVideo } from '../../../../shared/utils/videos/video-imports' import { VideoPrivacy } from '../../../../shared/models/videos' -import { waitJobs } from '../../utils/server/jobs' +import { waitJobs } from '../../../../shared/utils/server/jobs' import { expect } from 'chai' describe('Test users API validators', function () { diff --git a/server/tests/api/check-params/video-abuses.ts b/server/tests/api/check-params/video-abuses.ts index d2bed6a2a..a79ab4201 100644 --- a/server/tests/api/check-params/video-abuses.ts +++ b/server/tests/api/check-params/video-abuses.ts @@ -15,8 +15,12 @@ import { updateVideoAbuse, uploadVideo, userLogin -} from '../../utils' -import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params' +} from '../../../../shared/utils' +import { + checkBadCountPagination, + checkBadSortPagination, + checkBadStartPagination +} from '../../../../shared/utils/requests/check-api-params' import { VideoAbuseState } from '../../../../shared/models/videos' describe('Test video abuses API validators', function () { diff --git a/server/tests/api/check-params/video-blacklist.ts b/server/tests/api/check-params/video-blacklist.ts index 473216236..8e1206db3 100644 --- a/server/tests/api/check-params/video-blacklist.ts +++ b/server/tests/api/check-params/video-blacklist.ts @@ -15,8 +15,12 @@ import { setAccessTokensToServers, uploadVideo, userLogin -} from '../../utils' -import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params' +} from '../../../../shared/utils' +import { + checkBadCountPagination, + checkBadSortPagination, + checkBadStartPagination +} from '../../../../shared/utils/requests/check-api-params' import { VideoDetails } from '../../../../shared/models/videos' import { expect } from 'chai' diff --git a/server/tests/api/check-params/video-captions.ts b/server/tests/api/check-params/video-captions.ts index 8d46971a1..e4d36fd4f 100644 --- a/server/tests/api/check-params/video-captions.ts +++ b/server/tests/api/check-params/video-captions.ts @@ -13,9 +13,9 @@ import { setAccessTokensToServers, uploadVideo, userLogin -} from '../../utils' +} from '../../../../shared/utils' import { join } from 'path' -import { createVideoCaption } from '../../utils/videos/video-captions' +import { createVideoCaption } from '../../../../shared/utils/videos/video-captions' describe('Test video captions API validator', function () { const path = '/api/v1/videos/' diff --git a/server/tests/api/check-params/video-channels.ts b/server/tests/api/check-params/video-channels.ts index e5696224d..14e4deaf7 100644 --- a/server/tests/api/check-params/video-channels.ts +++ b/server/tests/api/check-params/video-channels.ts @@ -20,8 +20,12 @@ import { ServerInfo, setAccessTokensToServers, userLogin -} from '../../utils' -import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params' +} from '../../../../shared/utils' +import { + checkBadCountPagination, + checkBadSortPagination, + checkBadStartPagination +} from '../../../../shared/utils/requests/check-api-params' import { User } from '../../../../shared/models/users' import { join } from 'path' diff --git a/server/tests/api/check-params/video-comments.ts b/server/tests/api/check-params/video-comments.ts index 5241832fe..5981780ed 100644 --- a/server/tests/api/check-params/video-comments.ts +++ b/server/tests/api/check-params/video-comments.ts @@ -6,9 +6,13 @@ import { createUser, flushTests, killallServers, makeDeleteRequest, makeGetRequest, makePostBodyRequest, runServer, ServerInfo, setAccessTokensToServers, uploadVideo, userLogin -} from '../../utils' -import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params' -import { addVideoCommentThread } from '../../utils/videos/video-comments' +} from '../../../../shared/utils' +import { + checkBadCountPagination, + checkBadSortPagination, + checkBadStartPagination +} from '../../../../shared/utils/requests/check-api-params' +import { addVideoCommentThread } from '../../../../shared/utils/videos/video-comments' const expect = chai.expect diff --git a/server/tests/api/check-params/video-imports.ts b/server/tests/api/check-params/video-imports.ts index b51f3d2cd..7bf187007 100644 --- a/server/tests/api/check-params/video-imports.ts +++ b/server/tests/api/check-params/video-imports.ts @@ -18,9 +18,13 @@ import { setAccessTokensToServers, updateCustomSubConfig, userLogin -} from '../../utils' -import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params' -import { getMagnetURI, getYoutubeVideoUrl } from '../../utils/videos/video-imports' +} from '../../../../shared/utils' +import { + checkBadCountPagination, + checkBadSortPagination, + checkBadStartPagination +} from '../../../../shared/utils/requests/check-api-params' +import { getMagnetURI, getYoutubeVideoUrl } from '../../../../shared/utils/videos/video-imports' describe('Test video imports API validator', function () { const path = '/api/v1/videos/imports' diff --git a/server/tests/api/check-params/videos-filter.ts b/server/tests/api/check-params/videos-filter.ts index 784cd8ba1..e998c8a3d 100644 --- a/server/tests/api/check-params/videos-filter.ts +++ b/server/tests/api/check-params/videos-filter.ts @@ -11,7 +11,7 @@ import { ServerInfo, setAccessTokensToServers, userLogin -} from '../../utils' +} from '../../../../shared/utils' import { UserRole } from '../../../../shared/models/users' const expect = chai.expect diff --git a/server/tests/api/check-params/videos-history.ts b/server/tests/api/check-params/videos-history.ts index 808c3b616..09c6f7861 100644 --- a/server/tests/api/check-params/videos-history.ts +++ b/server/tests/api/check-params/videos-history.ts @@ -11,7 +11,7 @@ import { ServerInfo, setAccessTokensToServers, uploadVideo -} from '../../utils' +} from '../../../../shared/utils' const expect = chai.expect diff --git a/server/tests/api/check-params/videos.ts b/server/tests/api/check-params/videos.ts index 699f135c7..d94eccf8e 100644 --- a/server/tests/api/check-params/videos.ts +++ b/server/tests/api/check-params/videos.ts @@ -8,9 +8,13 @@ import { VideoPrivacy } from '../../../../shared/models/videos/video-privacy.enu import { createUser, flushTests, getMyUserInformation, getVideo, getVideosList, immutableAssign, killallServers, makeDeleteRequest, makeGetRequest, makeUploadRequest, makePutBodyRequest, removeVideo, runServer, ServerInfo, setAccessTokensToServers, userLogin -} from '../../utils' -import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params' -import { getAccountsList } from '../../utils/users/accounts' +} from '../../../../shared/utils' +import { + checkBadCountPagination, + checkBadSortPagination, + checkBadStartPagination +} from '../../../../shared/utils/requests/check-api-params' +import { getAccountsList } from '../../../../shared/utils/users/accounts' const expect = chai.expect diff --git a/server/tests/api/redundancy/redundancy.ts b/server/tests/api/redundancy/redundancy.ts index 1960854b6..0af52023c 100644 --- a/server/tests/api/redundancy/redundancy.ts +++ b/server/tests/api/redundancy/redundancy.ts @@ -18,15 +18,15 @@ import { wait, waitUntilLog, checkVideoFilesWereRemoved, removeVideo -} from '../../utils' -import { waitJobs } from '../../utils/server/jobs' +} from '../../../../shared/utils' +import { waitJobs } from '../../../../shared/utils/server/jobs' import * as magnetUtil from 'magnet-uri' -import { updateRedundancy } from '../../utils/server/redundancy' +import { updateRedundancy } from '../../../../shared/utils/server/redundancy' import { ActorFollow } from '../../../../shared/models/actors' import { readdir } from 'fs-extra' import { join } from 'path' import { VideoRedundancyStrategy } from '../../../../shared/models/redundancy' -import { getStats } from '../../utils/server/stats' +import { getStats } from '../../../../shared/utils/server/stats' import { ServerStats } from '../../../../shared/models/server/server-stats.model' const expect = chai.expect diff --git a/server/tests/api/search/search-activitypub-video-channels.ts b/server/tests/api/search/search-activitypub-video-channels.ts index a287c5bdf..a411e973b 100644 --- a/server/tests/api/search/search-activitypub-video-channels.ts +++ b/server/tests/api/search/search-activitypub-video-channels.ts @@ -17,10 +17,10 @@ import { uploadVideo, userLogin, wait -} from '../../utils' -import { waitJobs } from '../../utils/server/jobs' +} from '../../../../shared/utils' +import { waitJobs } from '../../../../shared/utils/server/jobs' import { VideoChannel } from '../../../../shared/models/videos' -import { searchVideoChannel } from '../../utils/search/video-channels' +import { searchVideoChannel } from '../../../../shared/utils/search/video-channels' const expect = chai.expect diff --git a/server/tests/api/search/search-activitypub-videos.ts b/server/tests/api/search/search-activitypub-videos.ts index 28f4fac50..f881917e7 100644 --- a/server/tests/api/search/search-activitypub-videos.ts +++ b/server/tests/api/search/search-activitypub-videos.ts @@ -16,8 +16,8 @@ import { uploadVideo, wait, searchVideo -} from '../../utils' -import { waitJobs } from '../../utils/server/jobs' +} from '../../../../shared/utils' +import { waitJobs } from '../../../../shared/utils/server/jobs' import { Video, VideoPrivacy } from '../../../../shared/models/videos' const expect = chai.expect diff --git a/server/tests/api/search/search-videos.ts b/server/tests/api/search/search-videos.ts index f1392ffea..50da837da 100644 --- a/server/tests/api/search/search-videos.ts +++ b/server/tests/api/search/search-videos.ts @@ -13,7 +13,7 @@ import { uploadVideo, wait, immutableAssign -} from '../../utils' +} from '../../../../shared/utils' const expect = chai.expect diff --git a/server/tests/api/server/config.ts b/server/tests/api/server/config.ts index facd1688d..c5c360a17 100644 --- a/server/tests/api/server/config.ts +++ b/server/tests/api/server/config.ts @@ -4,8 +4,11 @@ import 'mocha' import * as chai from 'chai' import { About } from '../../../../shared/models/server/about.model' import { CustomConfig } from '../../../../shared/models/server/custom-config.model' -import { deleteCustomConfig, getAbout, killallServers, reRunServer } from '../../utils' import { + deleteCustomConfig, + getAbout, + killallServers, + reRunServer, flushTests, getConfig, getCustomConfig, @@ -13,7 +16,7 @@ import { runServer, setAccessTokensToServers, updateCustomConfig -} from '../../utils/index' +} from '../../../../shared/utils' const expect = chai.expect diff --git a/server/tests/api/server/email.ts b/server/tests/api/server/email.ts index 713a27143..13df772c6 100644 --- a/server/tests/api/server/email.ts +++ b/server/tests/api/server/email.ts @@ -14,11 +14,14 @@ import { unblockUser, uploadVideo, userLogin, - verifyEmail -} from '../../utils' -import { flushTests, killallServers, ServerInfo, setAccessTokensToServers } from '../../utils/index' -import { mockSmtpServer } from '../../utils/miscs/email' -import { waitJobs } from '../../utils/server/jobs' + verifyEmail, + flushTests, + killallServers, + ServerInfo, + setAccessTokensToServers +} from '../../../../shared/utils' +import { mockSmtpServer } from '../../../../shared/utils/miscs/email' +import { waitJobs } from '../../../../shared/utils/server/jobs' const expect = chai.expect diff --git a/server/tests/api/server/follows.ts b/server/tests/api/server/follows.ts index e80e93e7f..b0fc5d293 100644 --- a/server/tests/api/server/follows.ts +++ b/server/tests/api/server/follows.ts @@ -4,7 +4,7 @@ import * as chai from 'chai' import 'mocha' import { Video, VideoPrivacy } from '../../../../shared/models/videos' import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model' -import { completeVideoCheck } from '../../utils' +import { completeVideoCheck } from '../../../../shared/utils' import { flushAndRunMultipleServers, getVideosList, @@ -12,21 +12,26 @@ import { ServerInfo, setAccessTokensToServers, uploadVideo -} from '../../utils/index' -import { dateIsValid } from '../../utils/miscs/miscs' -import { follow, getFollowersListPaginationAndSort, getFollowingListPaginationAndSort, unfollow } from '../../utils/server/follows' -import { expectAccountFollows } from '../../utils/users/accounts' -import { userLogin } from '../../utils/users/login' -import { createUser } from '../../utils/users/users' +} from '../../../../shared/utils/index' +import { dateIsValid } from '../../../../shared/utils/miscs/miscs' +import { + follow, + getFollowersListPaginationAndSort, + getFollowingListPaginationAndSort, + unfollow +} from '../../../../shared/utils/server/follows' +import { expectAccountFollows } from '../../../../shared/utils/users/accounts' +import { userLogin } from '../../../../shared/utils/users/login' +import { createUser } from '../../../../shared/utils/users/users' import { addVideoCommentReply, addVideoCommentThread, getVideoCommentThreads, getVideoThreadComments -} from '../../utils/videos/video-comments' -import { rateVideo } from '../../utils/videos/videos' -import { waitJobs } from '../../utils/server/jobs' -import { createVideoCaption, listVideoCaptions, testCaptionFile } from '../../utils/videos/video-captions' +} from '../../../../shared/utils/videos/video-comments' +import { rateVideo } from '../../../../shared/utils/videos/videos' +import { waitJobs } from '../../../../shared/utils/server/jobs' +import { createVideoCaption, listVideoCaptions, testCaptionFile } from '../../../../shared/utils/videos/video-captions' import { VideoCaption } from '../../../../shared/models/videos/caption/video-caption.model' const expect = chai.expect diff --git a/server/tests/api/server/handle-down.ts b/server/tests/api/server/handle-down.ts index ed15c8090..e6e0d6c7a 100644 --- a/server/tests/api/server/handle-down.ts +++ b/server/tests/api/server/handle-down.ts @@ -5,8 +5,13 @@ import 'mocha' import { JobState, Video } from '../../../../shared/models' import { VideoPrivacy } from '../../../../shared/models/videos' import { VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model' -import { completeVideoCheck, getVideo, immutableAssign, reRunServer, unfollow, viewVideo } from '../../utils' import { + completeVideoCheck, + getVideo, + immutableAssign, + reRunServer, + unfollow, + viewVideo, flushAndRunMultipleServers, getVideosList, killallServers, @@ -14,15 +19,15 @@ import { setAccessTokensToServers, uploadVideo, wait -} from '../../utils/index' -import { follow, getFollowersListPaginationAndSort } from '../../utils/server/follows' -import { getJobsListPaginationAndSort, waitJobs } from '../../utils/server/jobs' +} from '../../../../shared/utils' +import { follow, getFollowersListPaginationAndSort } from '../../../../shared/utils/server/follows' +import { getJobsListPaginationAndSort, waitJobs } from '../../../../shared/utils/server/jobs' import { addVideoCommentReply, addVideoCommentThread, getVideoCommentThreads, getVideoThreadComments -} from '../../utils/videos/video-comments' +} from '../../../../shared/utils/videos/video-comments' const expect = chai.expect diff --git a/server/tests/api/server/jobs.ts b/server/tests/api/server/jobs.ts index cd59d9a1b..52948b1d6 100644 --- a/server/tests/api/server/jobs.ts +++ b/server/tests/api/server/jobs.ts @@ -2,12 +2,12 @@ import * as chai from 'chai' import 'mocha' -import { killallServers, ServerInfo, setAccessTokensToServers } from '../../utils/index' -import { doubleFollow } from '../../utils/server/follows' -import { getJobsList, getJobsListPaginationAndSort, waitJobs } from '../../utils/server/jobs' -import { flushAndRunMultipleServers } from '../../utils/server/servers' -import { uploadVideo } from '../../utils/videos/videos' -import { dateIsValid } from '../../utils/miscs/miscs' +import { killallServers, ServerInfo, setAccessTokensToServers } from '../../../../shared/utils/index' +import { doubleFollow } from '../../../../shared/utils/server/follows' +import { getJobsList, getJobsListPaginationAndSort, waitJobs } from '../../../../shared/utils/server/jobs' +import { flushAndRunMultipleServers } from '../../../../shared/utils/server/servers' +import { uploadVideo } from '../../../../shared/utils/videos/videos' +import { dateIsValid } from '../../../../shared/utils/miscs/miscs' const expect = chai.expect diff --git a/server/tests/api/server/redundancy.ts b/server/tests/api/server/redundancy.ts index f50d6e3cf..8053d0491 100644 --- a/server/tests/api/server/redundancy.ts +++ b/server/tests/api/server/redundancy.ts @@ -18,15 +18,15 @@ import { wait, waitUntilLog, checkVideoFilesWereRemoved, removeVideo -} from '../../utils' -import { waitJobs } from '../../utils/server/jobs' +} from '../../../../shared/utils' +import { waitJobs } from '../../../../shared/utils/server/jobs' import * as magnetUtil from 'magnet-uri' -import { updateRedundancy } from '../../utils/server/redundancy' +import { updateRedundancy } from '../../../../shared/utils/server/redundancy' import { ActorFollow } from '../../../../shared/models/actors' import { readdir } from 'fs-extra' import { join } from 'path' import { VideoRedundancyStrategy } from '../../../../shared/models/redundancy' -import { getStats } from '../../utils/server/stats' +import { getStats } from '../../../../shared/utils/server/stats' import { ServerStats } from '../../../../shared/models/server/server-stats.model' const expect = chai.expect diff --git a/server/tests/api/server/reverse-proxy.ts b/server/tests/api/server/reverse-proxy.ts index e2c2a293e..d4c08c346 100644 --- a/server/tests/api/server/reverse-proxy.ts +++ b/server/tests/api/server/reverse-proxy.ts @@ -15,7 +15,7 @@ import { userLogin, viewVideo, wait -} from '../../utils' +} from '../../../../shared/utils' const expect = chai.expect import { @@ -23,7 +23,7 @@ import { flushTests, runServer, registerUser, getCustomConfig, setAccessTokensToServers, updateCustomConfig -} from '../../utils/index' +} from '../../../../shared/utils/index' describe('Test application behind a reverse proxy', function () { let server = null diff --git a/server/tests/api/server/stats.ts b/server/tests/api/server/stats.ts index cb229e876..517b4e542 100644 --- a/server/tests/api/server/stats.ts +++ b/server/tests/api/server/stats.ts @@ -13,11 +13,11 @@ import { uploadVideo, viewVideo, wait -} from '../../utils' -import { flushTests, setAccessTokensToServers } from '../../utils/index' -import { getStats } from '../../utils/server/stats' -import { addVideoCommentThread } from '../../utils/videos/video-comments' -import { waitJobs } from '../../utils/server/jobs' +} from '../../../../shared/utils' +import { flushTests, setAccessTokensToServers } from '../../../../shared/utils/index' +import { getStats } from '../../../../shared/utils/server/stats' +import { addVideoCommentThread } from '../../../../shared/utils/videos/video-comments' +import { waitJobs } from '../../../../shared/utils/server/jobs' const expect = chai.expect diff --git a/server/tests/api/server/tracker.ts b/server/tests/api/server/tracker.ts index 856f2f4d1..25ca00029 100644 --- a/server/tests/api/server/tracker.ts +++ b/server/tests/api/server/tracker.ts @@ -2,8 +2,8 @@ import * as magnetUtil from 'magnet-uri' import 'mocha' -import { getVideo, killallServers, runServer, ServerInfo, uploadVideo } from '../../utils' -import { flushTests, setAccessTokensToServers } from '../../utils/index' +import { getVideo, killallServers, runServer, ServerInfo, uploadVideo } from '../../../../shared/utils' +import { flushTests, setAccessTokensToServers } from '../../../../shared/utils/index' import { VideoDetails } from '../../../../shared/models/videos' import * as WebTorrent from 'webtorrent' diff --git a/server/tests/api/users/blocklist.ts b/server/tests/api/users/blocklist.ts index eed4b9f3e..4bca27a94 100644 --- a/server/tests/api/users/blocklist.ts +++ b/server/tests/api/users/blocklist.ts @@ -12,16 +12,16 @@ import { ServerInfo, uploadVideo, userLogin -} from '../../utils/index' -import { setAccessTokensToServers } from '../../utils/users/login' -import { getVideosListWithToken, getVideosList } from '../../utils/videos/videos' +} from '../../../../shared/utils/index' +import { setAccessTokensToServers } from '../../../../shared/utils/users/login' +import { getVideosListWithToken, getVideosList } from '../../../../shared/utils/videos/videos' import { addVideoCommentReply, addVideoCommentThread, getVideoCommentThreads, getVideoThreadComments -} from '../../utils/videos/video-comments' -import { waitJobs } from '../../utils/server/jobs' +} from '../../../../shared/utils/videos/video-comments' +import { waitJobs } from '../../../../shared/utils/server/jobs' import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model' import { addAccountToAccountBlocklist, @@ -36,7 +36,7 @@ import { removeAccountFromServerBlocklist, removeServerFromAccountBlocklist, removeServerFromServerBlocklist -} from '../../utils/users/blocklist' +} from '../../../../shared/utils/users/blocklist' const expect = chai.expect diff --git a/server/tests/api/users/user-subscriptions.ts b/server/tests/api/users/user-subscriptions.ts index 65b80540c..88a7187d6 100644 --- a/server/tests/api/users/user-subscriptions.ts +++ b/server/tests/api/users/user-subscriptions.ts @@ -2,18 +2,27 @@ import * as chai from 'chai' import 'mocha' -import { createUser, doubleFollow, flushAndRunMultipleServers, follow, getVideosList, unfollow, updateVideo, userLogin } from '../../utils' -import { killallServers, ServerInfo, uploadVideo } from '../../utils/index' -import { setAccessTokensToServers } from '../../utils/users/login' +import { + createUser, + doubleFollow, + flushAndRunMultipleServers, + follow, + getVideosList, + unfollow, + updateVideo, + userLogin +} from '../../../../shared/utils' +import { killallServers, ServerInfo, uploadVideo } from '../../../../shared/utils/index' +import { setAccessTokensToServers } from '../../../../shared/utils/users/login' import { Video, VideoChannel } from '../../../../shared/models/videos' -import { waitJobs } from '../../utils/server/jobs' +import { waitJobs } from '../../../../shared/utils/server/jobs' import { addUserSubscription, listUserSubscriptions, listUserSubscriptionVideos, removeUserSubscription, getUserSubscription, areSubscriptionsExist -} from '../../utils/users/user-subscriptions' +} from '../../../../shared/utils/users/user-subscriptions' const expect = chai.expect diff --git a/server/tests/api/users/users-multiple-servers.ts b/server/tests/api/users/users-multiple-servers.ts index d8699db17..006d6cdf0 100644 --- a/server/tests/api/users/users-multiple-servers.ts +++ b/server/tests/api/users/users-multiple-servers.ts @@ -13,13 +13,13 @@ import { removeUser, updateMyUser, userLogin -} from '../../utils' -import { getMyUserInformation, killallServers, ServerInfo, testImage, updateMyAvatar, uploadVideo } from '../../utils/index' -import { checkActorFilesWereRemoved, getAccount, getAccountsList } from '../../utils/users/accounts' -import { setAccessTokensToServers } from '../../utils/users/login' +} from '../../../../shared/utils' +import { getMyUserInformation, killallServers, ServerInfo, testImage, updateMyAvatar, uploadVideo } from '../../../../shared/utils/index' +import { checkActorFilesWereRemoved, getAccount, getAccountsList } from '../../../../shared/utils/users/accounts' +import { setAccessTokensToServers } from '../../../../shared/utils/users/login' import { User } from '../../../../shared/models/users' import { VideoChannel } from '../../../../shared/models/videos' -import { waitJobs } from '../../utils/server/jobs' +import { waitJobs } from '../../../../shared/utils/server/jobs' const expect = chai.expect diff --git a/server/tests/api/users/users-verification.ts b/server/tests/api/users/users-verification.ts index fa5f5e371..b1733e45e 100644 --- a/server/tests/api/users/users-verification.ts +++ b/server/tests/api/users/users-verification.ts @@ -5,10 +5,10 @@ import 'mocha' import { registerUser, flushTests, getUserInformation, getMyUserInformation, killallServers, userLogin, login, runServer, ServerInfo, verifyEmail, updateCustomSubConfig -} from '../../utils' -import { setAccessTokensToServers } from '../../utils/users/login' -import { mockSmtpServer } from '../../utils/miscs/email' -import { waitJobs } from '../../utils/server/jobs' +} from '../../../../shared/utils' +import { setAccessTokensToServers } from '../../../../shared/utils/users/login' +import { mockSmtpServer } from '../../../../shared/utils/miscs/email' +import { waitJobs } from '../../../../shared/utils/server/jobs' const expect = chai.expect diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts index 513bca8a0..7dffbb0b1 100644 --- a/server/tests/api/users/users.ts +++ b/server/tests/api/users/users.ts @@ -32,10 +32,10 @@ import { updateUser, uploadVideo, userLogin -} from '../../utils/index' -import { follow } from '../../utils/server/follows' -import { setAccessTokensToServers } from '../../utils/users/login' -import { getMyVideos } from '../../utils/videos/videos' +} from '../../../../shared/utils/index' +import { follow } from '../../../../shared/utils/server/follows' +import { setAccessTokensToServers } from '../../../../shared/utils/users/login' +import { getMyVideos } from '../../../../shared/utils/videos/videos' const expect = chai.expect diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts index b9ace2885..aa38b6b33 100644 --- a/server/tests/api/videos/multiple-servers.ts +++ b/server/tests/api/videos/multiple-servers.ts @@ -31,15 +31,15 @@ import { viewVideo, wait, webtorrentAdd -} from '../../utils' +} from '../../../../shared/utils' import { addVideoCommentReply, addVideoCommentThread, deleteVideoComment, getVideoCommentThreads, getVideoThreadComments -} from '../../utils/videos/video-comments' -import { waitJobs } from '../../utils/server/jobs' +} from '../../../../shared/utils/videos/video-comments' +import { waitJobs } from '../../../../shared/utils/server/jobs' const expect = chai.expect diff --git a/server/tests/api/videos/services.ts b/server/tests/api/videos/services.ts index 2f1424292..2da86964f 100644 --- a/server/tests/api/videos/services.ts +++ b/server/tests/api/videos/services.ts @@ -2,8 +2,16 @@ import * as chai from 'chai' import 'mocha' -import { flushTests, getOEmbed, getVideosList, killallServers, ServerInfo, setAccessTokensToServers, uploadVideo } from '../../utils/index' -import { runServer } from '../../utils/server/servers' +import { + flushTests, + getOEmbed, + getVideosList, + killallServers, + ServerInfo, + setAccessTokensToServers, + uploadVideo +} from '../../../../shared/utils/index' +import { runServer } from '../../../../shared/utils/server/servers' const expect = chai.expect diff --git a/server/tests/api/videos/single-server.ts b/server/tests/api/videos/single-server.ts index 089c3df25..069dec67c 100644 --- a/server/tests/api/videos/single-server.ts +++ b/server/tests/api/videos/single-server.ts @@ -28,7 +28,7 @@ import { uploadVideo, viewVideo, wait -} from '../../utils' +} from '../../../../shared/utils' const expect = chai.expect diff --git a/server/tests/api/videos/video-abuse.ts b/server/tests/api/videos/video-abuse.ts index a17f3c8de..3a7b623da 100644 --- a/server/tests/api/videos/video-abuse.ts +++ b/server/tests/api/videos/video-abuse.ts @@ -14,9 +14,9 @@ import { setAccessTokensToServers, updateVideoAbuse, uploadVideo -} from '../../utils/index' -import { doubleFollow } from '../../utils/server/follows' -import { waitJobs } from '../../utils/server/jobs' +} from '../../../../shared/utils/index' +import { doubleFollow } from '../../../../shared/utils/server/follows' +import { waitJobs } from '../../../../shared/utils/server/jobs' const expect = chai.expect diff --git a/server/tests/api/videos/video-blacklist-management.ts b/server/tests/api/videos/video-blacklist-management.ts index 7bf39dc99..06d80a270 100644 --- a/server/tests/api/videos/video-blacklist-management.ts +++ b/server/tests/api/videos/video-blacklist-management.ts @@ -16,9 +16,9 @@ import { setAccessTokensToServers, updateVideoBlacklist, uploadVideo -} from '../../utils/index' -import { doubleFollow } from '../../utils/server/follows' -import { waitJobs } from '../../utils/server/jobs' +} from '../../../../shared/utils/index' +import { doubleFollow } from '../../../../shared/utils/server/follows' +import { waitJobs } from '../../../../shared/utils/server/jobs' import { VideoAbuse } from '../../../../shared/models/videos' const expect = chai.expect diff --git a/server/tests/api/videos/video-blacklist.ts b/server/tests/api/videos/video-blacklist.ts index de4c68f1d..1cce82d2a 100644 --- a/server/tests/api/videos/video-blacklist.ts +++ b/server/tests/api/videos/video-blacklist.ts @@ -11,9 +11,9 @@ import { ServerInfo, setAccessTokensToServers, uploadVideo -} from '../../utils/index' -import { doubleFollow } from '../../utils/server/follows' -import { waitJobs } from '../../utils/server/jobs' +} from '../../../../shared/utils/index' +import { doubleFollow } from '../../../../shared/utils/server/follows' +import { waitJobs } from '../../../../shared/utils/server/jobs' const expect = chai.expect diff --git a/server/tests/api/videos/video-captions.ts b/server/tests/api/videos/video-captions.ts index 6e441410d..57bee713f 100644 --- a/server/tests/api/videos/video-captions.ts +++ b/server/tests/api/videos/video-captions.ts @@ -2,10 +2,17 @@ import * as chai from 'chai' import 'mocha' -import { checkVideoFilesWereRemoved, doubleFollow, flushAndRunMultipleServers, removeVideo, uploadVideo, wait } from '../../utils' -import { flushTests, killallServers, ServerInfo, setAccessTokensToServers } from '../../utils/index' -import { waitJobs } from '../../utils/server/jobs' -import { createVideoCaption, deleteVideoCaption, listVideoCaptions, testCaptionFile } from '../../utils/videos/video-captions' +import { + checkVideoFilesWereRemoved, + doubleFollow, + flushAndRunMultipleServers, + removeVideo, + uploadVideo, + wait +} from '../../../../shared/utils' +import { flushTests, killallServers, ServerInfo, setAccessTokensToServers } from '../../../../shared/utils/index' +import { waitJobs } from '../../../../shared/utils/server/jobs' +import { createVideoCaption, deleteVideoCaption, listVideoCaptions, testCaptionFile } from '../../../../shared/utils/videos/video-captions' import { VideoCaption } from '../../../../shared/models/videos/caption/video-caption.model' const expect = chai.expect diff --git a/server/tests/api/videos/video-change-ownership.ts b/server/tests/api/videos/video-change-ownership.ts index 1578a471d..25675a966 100644 --- a/server/tests/api/videos/video-change-ownership.ts +++ b/server/tests/api/videos/video-change-ownership.ts @@ -18,8 +18,8 @@ import { uploadVideo, userLogin, getVideo -} from '../../utils' -import { waitJobs } from '../../utils/server/jobs' +} from '../../../../shared/utils' +import { waitJobs } from '../../../../shared/utils/server/jobs' import { User } from '../../../../shared/models/users' import { VideoDetails } from '../../../../shared/models/videos' diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts index 8138c65d6..5bffffc66 100644 --- a/server/tests/api/videos/video-channels.ts +++ b/server/tests/api/videos/video-channels.ts @@ -11,7 +11,7 @@ import { updateVideo, updateVideoChannelAvatar, uploadVideo, wait, userLogin -} from '../../utils' +} from '../../../../shared/utils' import { addVideoChannel, deleteVideoChannel, @@ -24,8 +24,8 @@ import { ServerInfo, setAccessTokensToServers, updateVideoChannel -} from '../../utils/index' -import { waitJobs } from '../../utils/server/jobs' +} from '../../../../shared/utils/index' +import { waitJobs } from '../../../../shared/utils/server/jobs' const expect = chai.expect diff --git a/server/tests/api/videos/video-comments.ts b/server/tests/api/videos/video-comments.ts index d6e07c5b3..ce1b17e35 100644 --- a/server/tests/api/videos/video-comments.ts +++ b/server/tests/api/videos/video-comments.ts @@ -3,7 +3,7 @@ import * as chai from 'chai' import 'mocha' import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model' -import { testImage } from '../../utils' +import { testImage } from '../../../../shared/utils' import { dateIsValid, flushTests, @@ -13,14 +13,14 @@ import { setAccessTokensToServers, updateMyAvatar, uploadVideo -} from '../../utils/index' +} from '../../../../shared/utils/index' import { addVideoCommentReply, addVideoCommentThread, deleteVideoComment, getVideoCommentThreads, getVideoThreadComments -} from '../../utils/videos/video-comments' +} from '../../../../shared/utils/videos/video-comments' const expect = chai.expect diff --git a/server/tests/api/videos/video-description.ts b/server/tests/api/videos/video-description.ts index dd5cd78c0..cbda0b9a6 100644 --- a/server/tests/api/videos/video-description.ts +++ b/server/tests/api/videos/video-description.ts @@ -12,9 +12,9 @@ import { setAccessTokensToServers, updateVideo, uploadVideo -} from '../../utils/index' -import { doubleFollow } from '../../utils/server/follows' -import { waitJobs } from '../../utils/server/jobs' +} from '../../../../shared/utils/index' +import { doubleFollow } from '../../../../shared/utils/server/follows' +import { waitJobs } from '../../../../shared/utils/server/jobs' const expect = chai.expect diff --git a/server/tests/api/videos/video-imports.ts b/server/tests/api/videos/video-imports.ts index aaee79a4a..cd4988553 100644 --- a/server/tests/api/videos/video-imports.ts +++ b/server/tests/api/videos/video-imports.ts @@ -14,9 +14,9 @@ import { killallServers, ServerInfo, setAccessTokensToServers -} from '../../utils' -import { waitJobs } from '../../utils/server/jobs' -import { getMagnetURI, getYoutubeVideoUrl, importVideo, getMyVideoImports } from '../../utils/videos/video-imports' +} from '../../../../shared/utils' +import { waitJobs } from '../../../../shared/utils/server/jobs' +import { getMagnetURI, getYoutubeVideoUrl, importVideo, getMyVideoImports } from '../../../../shared/utils/videos/video-imports' const expect = chai.expect diff --git a/server/tests/api/videos/video-nsfw.ts b/server/tests/api/videos/video-nsfw.ts index eab7a6991..df1ee2eb9 100644 --- a/server/tests/api/videos/video-nsfw.ts +++ b/server/tests/api/videos/video-nsfw.ts @@ -2,10 +2,17 @@ import * as chai from 'chai' import 'mocha' -import { flushTests, getVideosList, killallServers, ServerInfo, setAccessTokensToServers, uploadVideo } from '../../utils/index' -import { userLogin } from '../../utils/users/login' -import { createUser } from '../../utils/users/users' -import { getMyVideos } from '../../utils/videos/videos' +import { + flushTests, + getVideosList, + killallServers, + ServerInfo, + setAccessTokensToServers, + uploadVideo +} from '../../../../shared/utils/index' +import { userLogin } from '../../../../shared/utils/users/login' +import { createUser } from '../../../../shared/utils/users/users' +import { getMyVideos } from '../../../../shared/utils/videos/videos' import { getAccountVideos, getConfig, @@ -18,7 +25,7 @@ import { searchVideoWithToken, updateCustomConfig, updateMyUser -} from '../../utils' +} from '../../../../shared/utils' import { ServerConfig } from '../../../../shared/models' import { CustomConfig } from '../../../../shared/models/server/custom-config.model' import { User } from '../../../../shared/models/users' diff --git a/server/tests/api/videos/video-privacy.ts b/server/tests/api/videos/video-privacy.ts index 9fefca7e3..0b4e66369 100644 --- a/server/tests/api/videos/video-privacy.ts +++ b/server/tests/api/videos/video-privacy.ts @@ -10,12 +10,12 @@ import { ServerInfo, setAccessTokensToServers, uploadVideo -} from '../../utils/index' -import { doubleFollow } from '../../utils/server/follows' -import { userLogin } from '../../utils/users/login' -import { createUser } from '../../utils/users/users' -import { getMyVideos, getVideo, getVideoWithToken, updateVideo } from '../../utils/videos/videos' -import { waitJobs } from '../../utils/server/jobs' +} from '../../../../shared/utils/index' +import { doubleFollow } from '../../../../shared/utils/server/follows' +import { userLogin } from '../../../../shared/utils/users/login' +import { createUser } from '../../../../shared/utils/users/users' +import { getMyVideos, getVideo, getVideoWithToken, updateVideo } from '../../../../shared/utils/videos/videos' +import { waitJobs } from '../../../../shared/utils/server/jobs' const expect = chai.expect diff --git a/server/tests/api/videos/video-schedule-update.ts b/server/tests/api/videos/video-schedule-update.ts index a260fa4da..ecfc5e034 100644 --- a/server/tests/api/videos/video-schedule-update.ts +++ b/server/tests/api/videos/video-schedule-update.ts @@ -15,9 +15,9 @@ import { updateVideo, uploadVideo, wait -} from '../../utils' +} from '../../../../shared/utils' import { join } from 'path' -import { waitJobs } from '../../utils/server/jobs' +import { waitJobs } from '../../../../shared/utils/server/jobs' const expect = chai.expect diff --git a/server/tests/api/videos/video-transcoder.ts b/server/tests/api/videos/video-transcoder.ts index 85795d2ed..f9458f0ec 100644 --- a/server/tests/api/videos/video-transcoder.ts +++ b/server/tests/api/videos/video-transcoder.ts @@ -20,9 +20,9 @@ import { uploadVideo, webtorrentAdd, generateHighBitrateVideo -} from '../../utils' +} from '../../../../shared/utils' import { join } from 'path' -import { waitJobs } from '../../utils/server/jobs' +import { waitJobs } from '../../../../shared/utils/server/jobs' import { pathExists } from 'fs-extra' import { VIDEO_TRANSCODING_FPS } from '../../../../server/initializers/constants' diff --git a/server/tests/api/videos/videos-filter.ts b/server/tests/api/videos/videos-filter.ts index a7588129f..59e37ad86 100644 --- a/server/tests/api/videos/videos-filter.ts +++ b/server/tests/api/videos/videos-filter.ts @@ -13,7 +13,7 @@ import { setAccessTokensToServers, uploadVideo, userLogin -} from '../../utils' +} from '../../../../shared/utils' import { Video, VideoPrivacy } from '../../../../shared/models/videos' import { UserRole } from '../../../../shared/models/users' diff --git a/server/tests/api/videos/videos-history.ts b/server/tests/api/videos/videos-history.ts index 6d289b288..40ae94f79 100644 --- a/server/tests/api/videos/videos-history.ts +++ b/server/tests/api/videos/videos-history.ts @@ -11,9 +11,9 @@ import { ServerInfo, setAccessTokensToServers, uploadVideo -} from '../../utils' +} from '../../../../shared/utils' import { Video, VideoDetails } from '../../../../shared/models/videos' -import { userWatchVideo } from '../../utils/videos/video-history' +import { userWatchVideo } from '../../../../shared/utils/videos/video-history' const expect = chai.expect diff --git a/server/tests/api/videos/videos-overview.ts b/server/tests/api/videos/videos-overview.ts index 7d1f29c92..7221bcae6 100644 --- a/server/tests/api/videos/videos-overview.ts +++ b/server/tests/api/videos/videos-overview.ts @@ -2,8 +2,8 @@ import * as chai from 'chai' import 'mocha' -import { flushTests, killallServers, runServer, ServerInfo, setAccessTokensToServers, uploadVideo } from '../../utils' -import { getVideosOverview } from '../../utils/overviews/overviews' +import { flushTests, killallServers, runServer, ServerInfo, setAccessTokensToServers, uploadVideo } from '../../../../shared/utils' +import { getVideosOverview } from '../../../../shared/utils/overviews/overviews' import { VideosOverview } from '../../../../shared/models/overviews' const expect = chai.expect diff --git a/server/tests/cli/create-import-video-file-job.ts b/server/tests/cli/create-import-video-file-job.ts index 13bcfd209..4acda47b1 100644 --- a/server/tests/cli/create-import-video-file-job.ts +++ b/server/tests/cli/create-import-video-file-job.ts @@ -15,8 +15,8 @@ import { ServerInfo, setAccessTokensToServers, uploadVideo -} from '../utils' -import { waitJobs } from '../utils/server/jobs' +} from '../../../shared/utils' +import { waitJobs } from '../../../shared/utils/server/jobs' const expect = chai.expect diff --git a/server/tests/cli/create-transcoding-job.ts b/server/tests/cli/create-transcoding-job.ts index c2e3840c5..50be5fa19 100644 --- a/server/tests/cli/create-transcoding-job.ts +++ b/server/tests/cli/create-transcoding-job.ts @@ -15,8 +15,8 @@ import { ServerInfo, setAccessTokensToServers, uploadVideo, wait -} from '../utils' -import { waitJobs } from '../utils/server/jobs' +} from '../../../shared/utils' +import { waitJobs } from '../../../shared/utils/server/jobs' const expect = chai.expect diff --git a/server/tests/cli/optimize-old-videos.ts b/server/tests/cli/optimize-old-videos.ts index 66dd39cce..6f6bc25a6 100644 --- a/server/tests/cli/optimize-old-videos.ts +++ b/server/tests/cli/optimize-old-videos.ts @@ -15,8 +15,8 @@ import { ServerInfo, setAccessTokensToServers, uploadVideo, viewVideo, wait -} from '../utils' -import { waitJobs } from '../utils/server/jobs' +} from '../../../shared/utils' +import { waitJobs } from '../../../shared/utils/server/jobs' import { getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution } from '../../helpers/ffmpeg-utils' import { VIDEO_TRANSCODING_FPS } from '../../initializers' import { join } from 'path' diff --git a/server/tests/cli/peertube.ts b/server/tests/cli/peertube.ts index 65cb05a1a..e5038838e 100644 --- a/server/tests/cli/peertube.ts +++ b/server/tests/cli/peertube.ts @@ -11,7 +11,7 @@ import { runServer, ServerInfo, setAccessTokensToServers -} from '../utils' +} from '../../../shared/utils' describe('Test CLI wrapper', function () { let server: ServerInfo diff --git a/server/tests/cli/reset-password.ts b/server/tests/cli/reset-password.ts index bf937d1c0..1b65f7e39 100644 --- a/server/tests/cli/reset-password.ts +++ b/server/tests/cli/reset-password.ts @@ -10,7 +10,7 @@ import { runServer, ServerInfo, setAccessTokensToServers -} from '../utils' +} from '../../../shared/utils' describe('Test reset password scripts', function () { let server: ServerInfo diff --git a/server/tests/cli/update-host.ts b/server/tests/cli/update-host.ts index b89e72ab7..811ea6a9f 100644 --- a/server/tests/cli/update-host.ts +++ b/server/tests/cli/update-host.ts @@ -3,8 +3,8 @@ import 'mocha' import * as chai from 'chai' import { VideoDetails } from '../../../shared/models/videos' -import { waitJobs } from '../utils/server/jobs' -import { addVideoCommentThread } from '../utils/videos/video-comments' +import { waitJobs } from '../../../shared/utils/server/jobs' +import { addVideoCommentThread } from '../../../shared/utils/videos/video-comments' import { addVideoChannel, createUser, @@ -21,8 +21,8 @@ import { ServerInfo, setAccessTokensToServers, uploadVideo -} from '../utils' -import { getAccountsList } from '../utils/users/accounts' +} from '../../../shared/utils' +import { getAccountsList } from '../../../shared/utils/users/accounts' const expect = chai.expect diff --git a/server/tests/client.ts b/server/tests/client.ts index b33a653b1..06b4a9c5a 100644 --- a/server/tests/client.ts +++ b/server/tests/client.ts @@ -15,7 +15,7 @@ import { updateCustomConfig, updateCustomSubConfig, uploadVideo -} from './utils' +} from '../../shared/utils' const expect = chai.expect diff --git a/server/tests/feeds/feeds.ts b/server/tests/feeds/feeds.ts index 28fe3493b..a771474bc 100644 --- a/server/tests/feeds/feeds.ts +++ b/server/tests/feeds/feeds.ts @@ -13,10 +13,10 @@ import { ServerInfo, setAccessTokensToServers, uploadVideo, userLogin -} from '../utils' +} from '../../../shared/utils' import * as libxmljs from 'libxmljs' -import { addVideoCommentThread } from '../utils/videos/video-comments' -import { waitJobs } from '../utils/server/jobs' +import { addVideoCommentThread } from '../../../shared/utils/videos/video-comments' +import { waitJobs } from '../../../shared/utils/server/jobs' import { User } from '../../../shared/models/users' chai.use(require('chai-xml')) diff --git a/server/tests/misc-endpoints.ts b/server/tests/misc-endpoints.ts index 8fab20971..f948fdfd0 100644 --- a/server/tests/misc-endpoints.ts +++ b/server/tests/misc-endpoints.ts @@ -2,7 +2,7 @@ import 'mocha' import * as chai from 'chai' -import { flushTests, killallServers, makeGetRequest, runServer, ServerInfo } from './utils' +import { flushTests, killallServers, makeGetRequest, runServer, ServerInfo } from '../../shared/utils' const expect = chai.expect diff --git a/server/tests/real-world/populate-database.ts b/server/tests/real-world/populate-database.ts index a7fdbd1dc..016503498 100644 --- a/server/tests/real-world/populate-database.ts +++ b/server/tests/real-world/populate-database.ts @@ -10,7 +10,7 @@ import { ServerInfo, setAccessTokensToServers, uploadVideo -} from '../utils' +} from '../../../shared/utils' import * as Bluebird from 'bluebird' start() diff --git a/server/tests/real-world/real-world.ts b/server/tests/real-world/real-world.ts index a96469b11..ac3baaf9a 100644 --- a/server/tests/real-world/real-world.ts +++ b/server/tests/real-world/real-world.ts @@ -16,8 +16,8 @@ import { updateVideo, uploadVideo, viewVideo, wait -} from '../utils' -import { getJobsListPaginationAndSort } from '../utils/server/jobs' +} from '../../../shared/utils' +import { getJobsListPaginationAndSort } from '../../../shared/utils/server/jobs' interface ServerInfo extends DefaultServerInfo { requestsNumber: number diff --git a/server/tools/peertube-get-access-token.ts b/server/tools/peertube-get-access-token.ts index eb2571a03..a68665f5b 100644 --- a/server/tools/peertube-get-access-token.ts +++ b/server/tools/peertube-get-access-token.ts @@ -6,7 +6,7 @@ import { Server, Client, User -} from '../tests/utils/index' +} from '../../shared/utils' program .option('-u, --url ', 'Server url') diff --git a/server/tools/peertube-import-videos.ts b/server/tools/peertube-import-videos.ts index 21505b79d..1fe0a9348 100644 --- a/server/tools/peertube-import-videos.ts +++ b/server/tools/peertube-import-videos.ts @@ -6,7 +6,7 @@ import { join } from 'path' import { VideoPrivacy } from '../../shared/models/videos' import { doRequestAndSaveToFile } from '../helpers/requests' import { CONSTRAINTS_FIELDS } from '../initializers' -import { getClient, getVideoCategories, login, searchVideoWithSort, uploadVideo } from '../tests/utils' +import { getClient, getVideoCategories, login, searchVideoWithSort, uploadVideo } from '../../shared/utils/index' import { truncate } from 'lodash' import * as prompt from 'prompt' import { remove } from 'fs-extra' diff --git a/server/tools/peertube-upload.ts b/server/tools/peertube-upload.ts index 6248fb47d..cc7bd9b4c 100644 --- a/server/tools/peertube-upload.ts +++ b/server/tools/peertube-upload.ts @@ -1,8 +1,8 @@ import * as program from 'commander' import { access, constants } from 'fs-extra' import { isAbsolute } from 'path' -import { getClient, login } from '../tests/utils' -import { uploadVideo } from '../tests/utils/index' +import { getClient, login } from '../../shared/utils' +import { uploadVideo } from '../../shared/utils/' import { VideoPrivacy } from '../../shared/models/videos' import { netrc, getSettings } from './cli' diff --git a/server/tests/utils/cli/cli.ts b/shared/utils/cli/cli.ts similarity index 100% rename from server/tests/utils/cli/cli.ts rename to shared/utils/cli/cli.ts diff --git a/server/tests/utils/feeds/feeds.ts b/shared/utils/feeds/feeds.ts similarity index 100% rename from server/tests/utils/feeds/feeds.ts rename to shared/utils/feeds/feeds.ts diff --git a/server/tests/utils/index.ts b/shared/utils/index.ts similarity index 100% rename from server/tests/utils/index.ts rename to shared/utils/index.ts diff --git a/server/tests/utils/miscs/email.ts b/shared/utils/miscs/email.ts similarity index 100% rename from server/tests/utils/miscs/email.ts rename to shared/utils/miscs/email.ts diff --git a/server/tests/utils/miscs/miscs.ts b/shared/utils/miscs/miscs.ts similarity index 100% rename from server/tests/utils/miscs/miscs.ts rename to shared/utils/miscs/miscs.ts diff --git a/server/tests/utils/overviews/overviews.ts b/shared/utils/overviews/overviews.ts similarity index 100% rename from server/tests/utils/overviews/overviews.ts rename to shared/utils/overviews/overviews.ts diff --git a/server/tests/utils/requests/check-api-params.ts b/shared/utils/requests/check-api-params.ts similarity index 100% rename from server/tests/utils/requests/check-api-params.ts rename to shared/utils/requests/check-api-params.ts diff --git a/server/tests/utils/requests/requests.ts b/shared/utils/requests/requests.ts similarity index 100% rename from server/tests/utils/requests/requests.ts rename to shared/utils/requests/requests.ts diff --git a/server/tests/utils/search/video-channels.ts b/shared/utils/search/video-channels.ts similarity index 100% rename from server/tests/utils/search/video-channels.ts rename to shared/utils/search/video-channels.ts diff --git a/server/tests/utils/search/videos.ts b/shared/utils/search/videos.ts similarity index 100% rename from server/tests/utils/search/videos.ts rename to shared/utils/search/videos.ts diff --git a/server/tests/utils/server/activitypub.ts b/shared/utils/server/activitypub.ts similarity index 100% rename from server/tests/utils/server/activitypub.ts rename to shared/utils/server/activitypub.ts diff --git a/server/tests/utils/server/clients.ts b/shared/utils/server/clients.ts similarity index 100% rename from server/tests/utils/server/clients.ts rename to shared/utils/server/clients.ts diff --git a/server/tests/utils/server/config.ts b/shared/utils/server/config.ts similarity index 100% rename from server/tests/utils/server/config.ts rename to shared/utils/server/config.ts diff --git a/server/tests/utils/server/follows.ts b/shared/utils/server/follows.ts similarity index 100% rename from server/tests/utils/server/follows.ts rename to shared/utils/server/follows.ts diff --git a/server/tests/utils/server/jobs.ts b/shared/utils/server/jobs.ts similarity index 100% rename from server/tests/utils/server/jobs.ts rename to shared/utils/server/jobs.ts diff --git a/server/tests/utils/server/redundancy.ts b/shared/utils/server/redundancy.ts similarity index 100% rename from server/tests/utils/server/redundancy.ts rename to shared/utils/server/redundancy.ts diff --git a/server/tests/utils/server/servers.ts b/shared/utils/server/servers.ts similarity index 100% rename from server/tests/utils/server/servers.ts rename to shared/utils/server/servers.ts diff --git a/server/tests/utils/server/stats.ts b/shared/utils/server/stats.ts similarity index 100% rename from server/tests/utils/server/stats.ts rename to shared/utils/server/stats.ts diff --git a/server/tests/utils/users/accounts.ts b/shared/utils/users/accounts.ts similarity index 100% rename from server/tests/utils/users/accounts.ts rename to shared/utils/users/accounts.ts diff --git a/server/tests/utils/users/blocklist.ts b/shared/utils/users/blocklist.ts similarity index 100% rename from server/tests/utils/users/blocklist.ts rename to shared/utils/users/blocklist.ts diff --git a/server/tests/utils/users/login.ts b/shared/utils/users/login.ts similarity index 100% rename from server/tests/utils/users/login.ts rename to shared/utils/users/login.ts diff --git a/server/tests/utils/users/user-subscriptions.ts b/shared/utils/users/user-subscriptions.ts similarity index 100% rename from server/tests/utils/users/user-subscriptions.ts rename to shared/utils/users/user-subscriptions.ts diff --git a/server/tests/utils/users/users.ts b/shared/utils/users/users.ts similarity index 98% rename from server/tests/utils/users/users.ts rename to shared/utils/users/users.ts index d77233d62..1b385aaf7 100644 --- a/server/tests/utils/users/users.ts +++ b/shared/utils/users/users.ts @@ -1,8 +1,8 @@ import * as request from 'supertest' import { makePostBodyRequest, makePutBodyRequest, updateAvatarRequest } from '../' -import { UserRole } from '../../../../shared/index' -import { NSFWPolicyType } from '../../../../shared/models/videos/nsfw-policy.type' +import { UserRole } from '../../index' +import { NSFWPolicyType } from '../../models/videos/nsfw-policy.type' function createUser ( url: string, diff --git a/server/tests/utils/videos/services.ts b/shared/utils/videos/services.ts similarity index 100% rename from server/tests/utils/videos/services.ts rename to shared/utils/videos/services.ts diff --git a/server/tests/utils/videos/video-abuses.ts b/shared/utils/videos/video-abuses.ts similarity index 100% rename from server/tests/utils/videos/video-abuses.ts rename to shared/utils/videos/video-abuses.ts diff --git a/server/tests/utils/videos/video-blacklist.ts b/shared/utils/videos/video-blacklist.ts similarity index 100% rename from server/tests/utils/videos/video-blacklist.ts rename to shared/utils/videos/video-blacklist.ts diff --git a/server/tests/utils/videos/video-captions.ts b/shared/utils/videos/video-captions.ts similarity index 100% rename from server/tests/utils/videos/video-captions.ts rename to shared/utils/videos/video-captions.ts diff --git a/server/tests/utils/videos/video-change-ownership.ts b/shared/utils/videos/video-change-ownership.ts similarity index 100% rename from server/tests/utils/videos/video-change-ownership.ts rename to shared/utils/videos/video-change-ownership.ts diff --git a/server/tests/utils/videos/video-channels.ts b/shared/utils/videos/video-channels.ts similarity index 100% rename from server/tests/utils/videos/video-channels.ts rename to shared/utils/videos/video-channels.ts diff --git a/server/tests/utils/videos/video-comments.ts b/shared/utils/videos/video-comments.ts similarity index 100% rename from server/tests/utils/videos/video-comments.ts rename to shared/utils/videos/video-comments.ts diff --git a/server/tests/utils/videos/video-history.ts b/shared/utils/videos/video-history.ts similarity index 100% rename from server/tests/utils/videos/video-history.ts rename to shared/utils/videos/video-history.ts diff --git a/server/tests/utils/videos/video-imports.ts b/shared/utils/videos/video-imports.ts similarity index 100% rename from server/tests/utils/videos/video-imports.ts rename to shared/utils/videos/video-imports.ts diff --git a/server/tests/utils/videos/videos.ts b/shared/utils/videos/videos.ts similarity index 100% rename from server/tests/utils/videos/videos.ts rename to shared/utils/videos/videos.ts From d4681c0074ba51c62a3aeb9fb3f2cd071dd21e32 Mon Sep 17 00:00:00 2001 From: buoyantair Date: Mon, 29 Oct 2018 22:36:09 +0530 Subject: [PATCH 002/137] Fix dependency issues --- shared/utils/search/videos.ts | 2 +- shared/utils/server/config.ts | 2 +- shared/utils/server/jobs.ts | 2 +- shared/utils/users/accounts.ts | 2 +- shared/utils/videos/video-abuses.ts | 2 +- shared/utils/videos/video-channels.ts | 2 +- shared/utils/videos/video-imports.ts | 2 +- shared/utils/videos/videos.ts | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/shared/utils/search/videos.ts b/shared/utils/search/videos.ts index 3a0c10e42..115b3ff9a 100644 --- a/shared/utils/search/videos.ts +++ b/shared/utils/search/videos.ts @@ -1,7 +1,7 @@ /* tslint:disable:no-unused-expression */ import * as request from 'supertest' -import { VideosSearchQuery } from '../../../../shared/models/search' +import { VideosSearchQuery } from '../../models/search' import { immutableAssign } from '..' function searchVideo (url: string, search: string) { diff --git a/shared/utils/server/config.ts b/shared/utils/server/config.ts index b85e02ab7..15a94432b 100644 --- a/shared/utils/server/config.ts +++ b/shared/utils/server/config.ts @@ -1,5 +1,5 @@ import { makeDeleteRequest, makeGetRequest, makePutBodyRequest } from '../' -import { CustomConfig } from '../../../../shared/models/server/custom-config.model' +import { CustomConfig } from '../../models/server/custom-config.model' function getConfig (url: string) { const path = '/api/v1/config' diff --git a/shared/utils/server/jobs.ts b/shared/utils/server/jobs.ts index 4c02cace5..3eec1d7d7 100644 --- a/shared/utils/server/jobs.ts +++ b/shared/utils/server/jobs.ts @@ -1,5 +1,5 @@ import * as request from 'supertest' -import { Job, JobState } from '../../../../shared/models' +import { Job, JobState } from '../../models' import { ServerInfo, wait } from '../index' function getJobsList (url: string, accessToken: string, state: JobState) { diff --git a/shared/utils/users/accounts.ts b/shared/utils/users/accounts.ts index f82b8d906..5601f2a77 100644 --- a/shared/utils/users/accounts.ts +++ b/shared/utils/users/accounts.ts @@ -3,7 +3,7 @@ import { expect } from 'chai' import { existsSync, readdir } from 'fs-extra' import { join } from 'path' -import { Account } from '../../../../shared/models/actors' +import { Account } from '../../models/actors' import { root } from '../index' import { makeGetRequest } from '../requests/requests' diff --git a/shared/utils/videos/video-abuses.ts b/shared/utils/videos/video-abuses.ts index 14907e6a0..8be891a9b 100644 --- a/shared/utils/videos/video-abuses.ts +++ b/shared/utils/videos/video-abuses.ts @@ -1,5 +1,5 @@ import * as request from 'supertest' -import { VideoAbuseUpdate } from '../../../../shared/models/videos/abuse/video-abuse-update.model' +import { VideoAbuseUpdate } from '../../models/videos/abuse/video-abuse-update.model' import { makeDeleteRequest, makePutBodyRequest } from '..' function reportVideoAbuse (url: string, token: string, videoId: number | string, reason: string, specialStatus = 200) { diff --git a/shared/utils/videos/video-channels.ts b/shared/utils/videos/video-channels.ts index 092985777..3d37f0e4c 100644 --- a/shared/utils/videos/video-channels.ts +++ b/shared/utils/videos/video-channels.ts @@ -1,5 +1,5 @@ import * as request from 'supertest' -import { VideoChannelCreate, VideoChannelUpdate } from '../../../../shared/models/videos' +import { VideoChannelCreate, VideoChannelUpdate } from '../../models/videos' import { updateAvatarRequest } from '../index' function getVideoChannelsList (url: string, start: number, count: number, sort?: string) { diff --git a/shared/utils/videos/video-imports.ts b/shared/utils/videos/video-imports.ts index 59dfd481a..bf5062cd1 100644 --- a/shared/utils/videos/video-imports.ts +++ b/shared/utils/videos/video-imports.ts @@ -1,4 +1,4 @@ -import { VideoImportCreate } from '../../../../shared/models/videos' +import { VideoImportCreate } from '../../models/videos' import { makeGetRequest, makeUploadRequest } from '..' function getYoutubeVideoUrl () { diff --git a/shared/utils/videos/videos.ts b/shared/utils/videos/videos.ts index 87c385f38..b3206e566 100644 --- a/shared/utils/videos/videos.ts +++ b/shared/utils/videos/videos.ts @@ -16,8 +16,8 @@ import { ServerInfo, testImage } from '../' -import { VideoDetails, VideoPrivacy } from '../../../../shared/models/videos' -import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../initializers' +import { VideoDetails, VideoPrivacy } from '../../models/videos' +import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../server/initializers' import { dateIsValid, webtorrentAdd } from '../index' type VideoAttributes = { From 92e07c3b5d9dbf2febedb1b5b87ec676eb6d1ac8 Mon Sep 17 00:00:00 2001 From: buoyantair Date: Fri, 16 Nov 2018 02:51:26 +0530 Subject: [PATCH 003/137] Fix dependency errors between modules --- server/lib/activitypub/process/process-create.ts | 2 +- server/lib/activitypub/process/process-like.ts | 2 +- server/tests/api/activitypub/client.ts | 2 +- server/tests/api/activitypub/fetch.ts | 4 ++-- server/tests/api/activitypub/helpers.ts | 2 +- server/tests/api/activitypub/security.ts | 11 ++++++++++- server/tests/api/server/no-client.ts | 4 ++-- shared/utils/index.ts | 2 -- 8 files changed, 18 insertions(+), 11 deletions(-) diff --git a/server/lib/activitypub/process/process-create.ts b/server/lib/activitypub/process/process-create.ts index 214e14546..9a72cb899 100644 --- a/server/lib/activitypub/process/process-create.ts +++ b/server/lib/activitypub/process/process-create.ts @@ -12,7 +12,7 @@ import { getOrCreateVideoAndAccountAndChannel } from '../videos' import { forwardVideoRelatedActivity } from '../send/utils' import { Redis } from '../../redis' import { createOrUpdateCacheFile } from '../cache-file' -import { immutableAssign } from '../../../tests/utils' +import { immutableAssign } from '../../../../shared/utils' import { getVideoDislikeActivityPubUrl } from '../url' import { VideoModel } from '../../../models/video/video' diff --git a/server/lib/activitypub/process/process-like.ts b/server/lib/activitypub/process/process-like.ts index 0dca17551..be86665e9 100644 --- a/server/lib/activitypub/process/process-like.ts +++ b/server/lib/activitypub/process/process-like.ts @@ -5,7 +5,7 @@ import { AccountVideoRateModel } from '../../../models/account/account-video-rat import { ActorModel } from '../../../models/activitypub/actor' import { forwardVideoRelatedActivity } from '../send/utils' import { getOrCreateVideoAndAccountAndChannel } from '../videos' -import { immutableAssign } from '../../../tests/utils' +import { immutableAssign } from '../../../../shared/utils' import { getVideoDislikeActivityPubUrl, getVideoLikeActivityPubUrl } from '../url' async function processLikeActivity (activity: ActivityLike, byActor: ActorModel) { diff --git a/server/tests/api/activitypub/client.ts b/server/tests/api/activitypub/client.ts index 334cd4e5c..d45232c8d 100644 --- a/server/tests/api/activitypub/client.ts +++ b/server/tests/api/activitypub/client.ts @@ -9,7 +9,7 @@ import { runServer, ServerInfo, setAccessTokensToServers -} from '../../shared/utils' +} from '../../../../shared/utils' const expect = chai.expect diff --git a/server/tests/api/activitypub/fetch.ts b/server/tests/api/activitypub/fetch.ts index a42c606c6..e84eb18bb 100644 --- a/server/tests/api/activitypub/fetch.ts +++ b/server/tests/api/activitypub/fetch.ts @@ -13,10 +13,10 @@ import { setAccessTokensToServers, uploadVideo, userLogin -} from '../../utils' +} from '../../../../shared/utils' import * as chai from 'chai' import { setActorField, setVideoField } from '../../utils/miscs/sql' -import { waitJobs } from '../../utils/server/jobs' +import { waitJobs } from '../../../../shared/utils/server/jobs' import { Video } from '../../../../shared/models/videos' const expect = chai.expect diff --git a/server/tests/api/activitypub/helpers.ts b/server/tests/api/activitypub/helpers.ts index 610846247..4c42f3d67 100644 --- a/server/tests/api/activitypub/helpers.ts +++ b/server/tests/api/activitypub/helpers.ts @@ -2,7 +2,7 @@ import 'mocha' import { expect } from 'chai' -import { buildRequestStub } from '../../utils' +import { buildRequestStub } from '../../utils/miscs/stubs' import { isHTTPSignatureVerified, isJsonLDSignatureVerified, parseHTTPSignature } from '../../../helpers/peertube-crypto' import { cloneDeep } from 'lodash' import { buildSignedActivity } from '../../../helpers/activitypub' diff --git a/server/tests/api/activitypub/security.ts b/server/tests/api/activitypub/security.ts index e7899bb14..69b7c0148 100644 --- a/server/tests/api/activitypub/security.ts +++ b/server/tests/api/activitypub/security.ts @@ -2,7 +2,16 @@ import 'mocha' -import { flushAndRunMultipleServers, flushTests, killallServers, makePOSTAPRequest, makeFollowRequest, ServerInfo } from '../../utils' +import { + flushAndRunMultipleServers, + flushTests, + killallServers, + ServerInfo +} from '../../../../shared/utils' +import { + makePOSTAPRequest, + makeFollowRequest, +} from '../../utils/requests/activitypub' import { HTTP_SIGNATURE } from '../../../initializers' import { buildDigest, buildGlobalHeaders } from '../../../lib/job-queue/handlers/utils/activitypub-http-utils' import * as chai from 'chai' diff --git a/server/tests/api/server/no-client.ts b/server/tests/api/server/no-client.ts index 6d6ce8532..3b95ce945 100644 --- a/server/tests/api/server/no-client.ts +++ b/server/tests/api/server/no-client.ts @@ -4,8 +4,8 @@ import { flushTests, killallServers, ServerInfo -} from '../../utils/index' -import { runServer } from '../../utils/server/servers' +} from '../../../../shared/utils' +import { runServer } from '../../../../shared/utils/server/servers' describe('Start and stop server without web client routes', function () { let server: ServerInfo diff --git a/shared/utils/index.ts b/shared/utils/index.ts index 905d93823..897389824 100644 --- a/shared/utils/index.ts +++ b/shared/utils/index.ts @@ -4,10 +4,8 @@ export * from './server/clients' export * from './server/config' export * from './users/login' export * from './miscs/miscs' -export * from './miscs/stubs' export * from './server/follows' export * from './requests/requests' -export * from './requests/activitypub' export * from './server/servers' export * from './videos/services' export * from './users/users' From 35adc403b7eed6d1309bbce901268a76dd01b6ef Mon Sep 17 00:00:00 2001 From: buoyantair Date: Tue, 20 Nov 2018 12:33:52 +0530 Subject: [PATCH 004/137] Fix dependency issues --- server/tests/api/server/follow-constraints.ts | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/server/tests/api/server/follow-constraints.ts b/server/tests/api/server/follow-constraints.ts index 3135fc568..8bb073c41 100644 --- a/server/tests/api/server/follow-constraints.ts +++ b/server/tests/api/server/follow-constraints.ts @@ -2,11 +2,21 @@ import * as chai from 'chai' import 'mocha' -import { doubleFollow, getAccountVideos, getVideo, getVideoChannelVideos, getVideoWithToken } from '../../utils' -import { flushAndRunMultipleServers, killallServers, ServerInfo, setAccessTokensToServers, uploadVideo } from '../../utils/index' -import { unfollow } from '../../utils/server/follows' -import { userLogin } from '../../utils/users/login' -import { createUser } from '../../utils/users/users' +import { + doubleFollow, + getAccountVideos, + getVideo, + getVideoChannelVideos, + getVideoWithToken, + flushAndRunMultipleServers, + killallServers, + ServerInfo, + setAccessTokensToServers, + uploadVideo +} from '../../../../shared/utils' +import { unfollow } from '../../../../shared/utils/server/follows' +import { userLogin } from '../../../../shared/utils/users/login' +import { createUser } from '../../../../shared/utils/users/users' const expect = chai.expect From 75939291703cf18010495f6b85d6d65e01184235 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Thu, 22 Nov 2018 15:40:49 +0100 Subject: [PATCH 005/137] Check free storage before upgrading --- scripts/upgrade.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh index c70b3b42a..0a9ce1dab 100755 --- a/scripts/upgrade.sh +++ b/scripts/upgrade.sh @@ -20,6 +20,14 @@ if [ ! -e "$PEERTUBE_PATH/versions" -o ! -e "$PEERTUBE_PATH/config/production.ya exit 1 fi +REMAINING=$(df -k $PEERTUBE_PATH | awk '{ print $4}' | sed -n 2p) +ONE_GB=$((1024 * 1024)) +if [ "$REMAINING" -lt "$ONE_GB" ]; then + echo "Error - not enough free space for upgrading" + echo "" + echo "Make sure you have at least 1 GB of free space in $PEERTUBE_PATH" + exit 1 +fi # Backup database SQL_BACKUP_PATH="$PEERTUBE_PATH/backup/sql-peertube_prod-$(date +"%Y%m%d-%H%M").bak" From 5c94c38d18a02864b6f384bcd829a0d3f2d86c4a Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Sat, 1 Dec 2018 14:00:07 +0100 Subject: [PATCH 006/137] Check if awk and sed are executable --- scripts/upgrade.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh index 0a9ce1dab..4f7c58edd 100755 --- a/scripts/upgrade.sh +++ b/scripts/upgrade.sh @@ -20,13 +20,15 @@ if [ ! -e "$PEERTUBE_PATH/versions" -o ! -e "$PEERTUBE_PATH/config/production.ya exit 1 fi -REMAINING=$(df -k $PEERTUBE_PATH | awk '{ print $4}' | sed -n 2p) -ONE_GB=$((1024 * 1024)) -if [ "$REMAINING" -lt "$ONE_GB" ]; then - echo "Error - not enough free space for upgrading" - echo "" - echo "Make sure you have at least 1 GB of free space in $PEERTUBE_PATH" - exit 1 +if [ -x "$(command -v awk)" ] && [ -x "$(command -v sed)" ] ; then + REMAINING=$(df -k $PEERTUBE_PATH | awk '{ print $4}' | sed -n 2p) + ONE_GB=$((1024 * 1024)) + if [ "$REMAINING" -lt "$ONE_GB" ]; then + echo "Error - not enough free space for upgrading" + echo "" + echo "Make sure you have at least 1 GB of free space in $PEERTUBE_PATH" + exit 1 + fi fi # Backup database From f9a971c671d5a8b88f420a86656a788575105598 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 4 Dec 2018 09:34:29 +0100 Subject: [PATCH 007/137] Update dependencies --- package.json | 4 +- server/initializers/constants.ts | 2 +- server/lib/job-queue/handlers/video-file.ts | 4 +- yarn.lock | 347 +++++++++++--------- 4 files changed, 196 insertions(+), 161 deletions(-) diff --git a/package.json b/package.json index d4076612e..c5e4c329c 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "cli-table": "^0.3.1", "commander": "^2.13.0", "concurrently": "^4.0.1", - "config": "^2.0.1", + "config": "^3.0.0", "cookie-parser": "^1.4.3", "cors": "^2.8.1", "create-torrent": "^3.24.5", @@ -165,7 +165,7 @@ "@types/bcrypt": "^3.0.0", "@types/bluebird": "3.5.21", "@types/body-parser": "^1.16.3", - "@types/bull": "^3.3.12", + "@types/bull": "3.4.0", "@types/bytes": "^3.0.0", "@types/chai": "^4.0.4", "@types/chai-json-schema": "^1.4.3", diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index aa243859c..8a8bcd126 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -773,7 +773,7 @@ function buildVideosRedundancy (objs: any[]): VideosRedundancy[] { if (!objs) return [] return objs.map(obj => { - return Object.assign(obj, { + return Object.assign({}, obj, { minLifetime: parseDuration(obj.min_lifetime), size: bytes.parse(obj.size), minViews: obj.min_views diff --git a/server/lib/job-queue/handlers/video-file.ts b/server/lib/job-queue/handlers/video-file.ts index adc0a2a15..ddbf6d1c2 100644 --- a/server/lib/job-queue/handlers/video-file.ts +++ b/server/lib/job-queue/handlers/video-file.ts @@ -1,5 +1,5 @@ import * as Bull from 'bull' -import { VideoResolution, VideoState } from '../../../../shared' +import { VideoResolution, VideoState, Job } from '../../../../shared' import { logger } from '../../../helpers/logger' import { VideoModel } from '../../../models/video/video' import { JobQueue } from '../job-queue' @@ -111,7 +111,7 @@ async function onVideoFileOptimizerSuccess (video: VideoModel, isNewVideo: boole ) if (resolutionsEnabled.length !== 0) { - const tasks: Bluebird[] = [] + const tasks: Bluebird>[] = [] for (const resolution of resolutionsEnabled) { const dataInput = { diff --git a/yarn.lock b/yarn.lock index b961fb5cc..1cbe6756d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,20 @@ # yarn lockfile v1 +"@iamstarkov/listr-update-renderer@0.4.1": + version "0.4.1" + resolved "https://registry.yarnpkg.com/@iamstarkov/listr-update-renderer/-/listr-update-renderer-0.4.1.tgz#d7c48092a2dcf90fd672b6c8b458649cb350c77e" + integrity sha512-IJyxQWsYDEkf8C8QthBn5N8tIUR9V9je6j3sMIpAkonaadjbvxmRC6RAhpa3RKxndhNnU2M6iNbtJwd7usQYIA== + dependencies: + chalk "^1.1.3" + cli-truncate "^0.2.1" + elegant-spinner "^1.0.1" + figures "^1.7.0" + indent-string "^3.0.0" + log-symbols "^1.0.2" + log-update "^2.3.0" + strip-ansi "^3.0.1" + "@samverschueren/stream-to-observable@^0.3.0": version "0.3.0" resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f" @@ -44,7 +58,7 @@ "@types/connect" "*" "@types/node" "*" -"@types/bull@^3.3.12": +"@types/bull@3.4.0": version "3.4.0" resolved "https://registry.yarnpkg.com/@types/bull/-/bull-3.4.0.tgz#18ffefefa4dd1cfbdbdc8ca7df56c934459f6b9d" integrity sha512-NVD2X+cUu1qNv6blsOfCr2fVsD3+O13U19dFuy9Du7PWfn1/gjFZEDk220uBuRSH5JyaP4nV6S8BLjsT5/bXUg== @@ -233,9 +247,9 @@ "@types/express" "*" "@types/node@*", "@types/node@^10.0.8": - version "10.12.8" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.8.tgz#d0a3ab5a6e61458c492304e2776ac136b81db927" - integrity sha512-INamyRZG4rW3lDCUmwVd5Xho/bXvQm/v1yP8V0UN1RuInU7RoWoaO570b+yLX4Ia/0szsx1wa8VzcsVlsvbWLA== + version "10.12.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.12.tgz#e15a9d034d9210f00320ef718a50c4a799417c47" + integrity sha512-Pr+6JRiKkfsFvmU/LK68oBRCQeEg36TyAbPhc2xpez24OOZZCuoIhWGTd39VZy6nGafSbxzGouFPTFD/rR1A0A== "@types/node@6.0.41": version "6.0.41" @@ -251,9 +265,9 @@ "@types/node" "*" "@types/oauth2-server@^3.0.8": - version "3.0.9" - resolved "https://registry.yarnpkg.com/@types/oauth2-server/-/oauth2-server-3.0.9.tgz#e3f32011862f03f399635c5916d5a383bca26fe2" - integrity sha512-NixZjyKS4TCM1mMr6QViK0rxR8iMHiE1utYje+ZGne1SgJQzLT3OOAjCrnRp70G+L8W1BXnzIPPaIxj1kYJHNg== + version "3.0.10" + resolved "https://registry.yarnpkg.com/@types/oauth2-server/-/oauth2-server-3.0.10.tgz#ea671a6ad3d02062aac5f7c1ba1fb9c468314db0" + integrity sha512-1XYQdBrBuGimRhGLk9XavjGY2h5IYmT0rTi3pDAWzq6xRWZp+LCAwNm8YNYdDwQxBp//eogtZePe8mS7QPDiNg== dependencies: "@types/express" "*" @@ -284,9 +298,9 @@ integrity sha512-HtKGu+qG1NPvYe1z7ezLsyIaXYyi8SoAVqWDZgDQ8dLrsZvSzUNCwZyfX33uhWxL/SU0ZDQZ3nwZ0nimt507Kw== "@types/redis@^2.8.5": - version "2.8.7" - resolved "https://registry.yarnpkg.com/@types/redis/-/redis-2.8.7.tgz#e0825093fb1af9d5b4a7246c6d7d1163cc842c35" - integrity sha512-ZMW8M5LRxU0D4u2GhnCEqJ1/mUJKSudlCWxeP1FRxfZQqr0Pb4tonPLzDEyRpC50uvEfAP3xOLjDuUOWi0QHCQ== + version "2.8.8" + resolved "https://registry.yarnpkg.com/@types/redis/-/redis-2.8.8.tgz#70855e79a6020080cca3cb5f1f5ee7f11b49a979" + integrity sha512-o/1ufNVPA92uum9HFbEiXXIHBuLywSwHQtAZoACMc1FhPXS5YftybBC1EI0zjdbUb273VVWF0Ivll/bq4g+gyw== dependencies: "@types/node" "*" @@ -341,9 +355,9 @@ "@types/node" "*" "@types/supertest@^2.0.3": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@types/supertest/-/supertest-2.0.6.tgz#a0665350c0e36315e1bccdf4785f2b76fcb71b6b" - integrity sha512-qRvPP8dO7IBqJz8LaQ7/Lw2oo/geiDUPAMx/L+CQCkR9sN622O30XCH7RSyUmilyCSyjxyhJ7cEtd3hmwPwvhw== + version "2.0.7" + resolved "https://registry.yarnpkg.com/@types/supertest/-/supertest-2.0.7.tgz#46ff6508075cd4519736be060f0d6331a5c8ca7b" + integrity sha512-GibTh4OTkal71btYe2fpZP/rVHIPnnUsYphEaoywVHo+mo2a/LhlOFkIm5wdN0H0DA0Hx8x+tKgCYMD9elHu5w== dependencies: "@types/superagent" "*" @@ -477,9 +491,9 @@ ajv@^4.7.0: json-stable-stringify "^1.0.1" ajv@^6.5.5: - version "6.5.5" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.5.tgz#cf97cdade71c6399a92c6d6c4177381291b781a1" - integrity sha512-7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg== + version "6.6.1" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.1.tgz#6360f5ed0d80f232cc2b294c362d5dc2e538dd61" + integrity sha512-ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww== dependencies: fast-deep-equal "^2.0.1" fast-json-stable-stringify "^2.0.0" @@ -844,9 +858,9 @@ binary-search@^1.3.4: integrity sha512-dPxU/vZLnH0tEVjVPgi015oSwqu6oLfCeHywuFRhBE0yM0mYocvleTl8qsdM1YFhRzTRhM1+VzS8XLDVrHPopg== bindings@^1.3.0, bindings@~1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.3.0.tgz#b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7" - integrity sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw== + version "1.3.1" + resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.3.1.tgz#21fc7c6d67c18516ec5aaa2815b145ff77b26ea5" + integrity sha512-i47mqjF9UbjxJhxGf+pZ6kSxrnI3wBLlnGI2ArWJ4r0VrvDS7ZYXkprq/pLaBWYq4GM0r4zdHY+NNRqEMU7uew== bindings@~1.2.1: version "1.2.1" @@ -1143,9 +1157,9 @@ builtins@^1.0.3: integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og= bull@^3.4.2: - version "3.5.1" - resolved "https://registry.yarnpkg.com/bull/-/bull-3.5.1.tgz#b936a1306cb7e9dc1ac9c23a0dcaf41a1370effc" - integrity sha512-stbptND5+uRmzd6gIUJlC93fikXKyrJl53HGxzyqD0ahCMeyFRlaD5kN1i+PqfZSkcHKx/kK3HOJ8knum/Yi7A== + version "3.5.2" + resolved "https://registry.yarnpkg.com/bull/-/bull-3.5.2.tgz#9c85f205b17686efab2ee28aaa4388887360de32" + integrity sha512-tuL4Uj0kUeaQ7Cow3POkca20fk+VSsR8AiTFeNkyMmuicBnE1ZMwvF1NRDY7vIH43pD9PiMCSEP4Li/934Pw1w== dependencies: bluebird "^3.5.3" cron-parser "^2.5.0" @@ -1283,6 +1297,11 @@ camelcase@^4.0.0, camelcase@^4.1.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= +camelcase@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42" + integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA== + camelize@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b" @@ -1447,14 +1466,14 @@ cli-columns@^3.1.2: string-width "^2.0.0" strip-ansi "^3.0.1" -cli-cursor@^1.0.1, cli-cursor@^1.0.2: +cli-cursor@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987" integrity sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc= dependencies: restore-cursor "^1.0.1" -cli-cursor@^2.0.0: +cli-cursor@^2.0.0, cli-cursor@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= @@ -1701,15 +1720,15 @@ concat-stream@^1.4.6, concat-stream@^1.5.0, concat-stream@^1.5.2: typedarray "^0.0.6" concurrently@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-4.0.1.tgz#f6310fbadf2f476dd95df952edb5c0ab789f672c" - integrity sha512-D8UI+mlI/bfvrA57SeKOht6sEpb01dKk+8Yee4fbnkk1Ue8r3S+JXoEdFZIpzQlXJGtnxo47Wvvg/kG4ba3U6Q== + version "4.1.0" + resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-4.1.0.tgz#17fdf067da71210685d9ea554423ef239da30d33" + integrity sha512-pwzXCE7qtOB346LyO9eFWpkFJVO3JQZ/qU/feGeaAHiX1M3Rw3zgXKc5cZ8vSH5DGygkjzLFDzA/pwoQDkRNGg== dependencies: chalk "^2.4.1" date-fns "^1.23.0" lodash "^4.17.10" read-pkg "^4.0.1" - rxjs "6.2.2" + rxjs "^6.3.3" spawn-command "^0.0.2-1" supports-color "^4.5.0" tree-kill "^1.1.0" @@ -1723,10 +1742,10 @@ config-chain@~1.1.11: ini "^1.3.4" proto-list "~1.2.1" -config@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/config/-/config-2.0.1.tgz#995ccc8175460578d646ac0a2e4018ffa44ca046" - integrity sha512-aTaviJnC8ZjQYx8kQf4u6tWqIxWolyQQ3LqXgnCLAsIb78JrUshHG0YuzIarzTaVVe1Pazms3TXImfYra8UsyQ== +config@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/config/-/config-3.0.0.tgz#a71cdbb22d225df9eff20b95178d65a63c452367" + integrity sha512-QMr3BCOcHdgXx8t8cLfBhWtHcIAAMikaxUc2XASuH2A93g9kOIRch7sXFQdSvdMxhQobnctWm2y68YJYRttJlw== dependencies: json5 "^1.0.1" @@ -1830,7 +1849,16 @@ cors@^2.8.1: object-assign "^4" vary "^1" -cosmiconfig@^5.0.2, cosmiconfig@^5.0.6: +cosmiconfig@5.0.6: + version "5.0.6" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz#dca6cf680a0bd03589aff684700858c81abeeb39" + integrity sha512-6DWfizHriCrFWURP1/qyhsiFvYdlJzbCzmtFWh744+KyWsJo5+kPzUZZaMRSSItoYc0pxFX7gEO7ZC1/gN/7AQ== + dependencies: + is-directory "^0.3.1" + js-yaml "^3.9.0" + parse-json "^4.0.0" + +cosmiconfig@^5.0.6: version "5.0.7" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04" integrity sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA== @@ -1867,9 +1895,9 @@ create-torrent@^3.24.5, create-torrent@^3.33.0: simple-sha1 "^2.0.0" cron-parser@^2.5.0: - version "2.7.1" - resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-2.7.1.tgz#d08c00b1e220db564fd1cecb5019c8dd450f84d1" - integrity sha512-gupE4KsGEVtp5X4YbUlQx6NiFt3e+VOhREPI4ZXS9FT5JcOjfw2ey1EUv3J6XWrxHR1aKYrk4uJDmdRjG39bgA== + version "2.7.3" + resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-2.7.3.tgz#12603f89f5375af353a9357be2543d3172eac651" + integrity sha512-t9Kc7HWBWPndBzvbdQ1YG9rpPRB37Tb/tTviziUOh1qs3TARGh3b1p+tnkOHNe1K5iI3oheBPgLqwotMM7+lpg== dependencies: is-nan "^1.2.1" moment-timezone "^0.5.23" @@ -1993,18 +2021,11 @@ debuglog@^1.0.0, debuglog@^1.0.1: resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= -decamelize@^1.1.1: +decamelize@^1.1.1, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= -decamelize@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7" - integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg== - dependencies: - xregexp "4.0.0" - decode-uri-component@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" @@ -2644,10 +2665,10 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" -expand-template@^1.0.2: - version "1.1.1" - resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-1.1.1.tgz#981f188c0c3a87d2e28f559bc541426ff94f21dd" - integrity sha512-cebqLtV8KOZfw0UI8TEFWxtczxxC1jvyUvx6H4fyp1K1FN7A4Q+uggVUlOsI1K8AGU0rwOGqP8nCapdrw8CYQg== +expand-template@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" + integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== expect-ct@0.1.1: version "0.1.1" @@ -2837,6 +2858,13 @@ figures@^1.3.5, figures@^1.7.0: escape-string-regexp "^1.0.5" object-assign "^4.1.0" +figures@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" + integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= + dependencies: + escape-string-regexp "^1.0.5" + file-entry-cache@^1.1.1: version "1.3.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-1.3.1.tgz#44c61ea607ae4be9c1402f41f44270cbfe334ff8" @@ -3420,9 +3448,9 @@ has-values@^1.0.0: kind-of "^4.0.0" hash.js@^1.0.0: - version "1.1.5" - resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.5.tgz#e38ab4b85dfb1e0c40fe9265c0e9b54854c23812" - integrity sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA== + version "1.1.7" + resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42" + integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA== dependencies: inherits "^2.0.3" minimalistic-assert "^1.0.1" @@ -3557,9 +3585,9 @@ humanize-ms@^1.2.1: ms "^2.0.0" husky@^1.0.0-rc.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/husky/-/husky-1.1.4.tgz#92f61383527d2571e9586234e5864356bfaceaa9" - integrity sha512-cZjGpS7qsaBSo3fOMUuR7erQloX3l5XzL1v/RkIqU6zrQImDdU70z5Re9fGDp7+kbYlM2EtS4aYMlahBeiCUGw== + version "1.2.0" + resolved "https://registry.yarnpkg.com/husky/-/husky-1.2.0.tgz#d631dda1e4a9ee8ba69a10b0c51a0e2c66e711e5" + integrity sha512-/ib3+iycykXC0tYIxsyqierikVa9DA2DrT32UEirqNEFVqOj1bFMTgP3jAz8HM7FgC/C8pc/BTUa9MV2GEkZaA== dependencies: cosmiconfig "^5.0.6" execa "^1.0.0" @@ -4483,13 +4511,14 @@ libxmljs@0.19.5: node-pre-gyp "~0.11.0" lint-staged@^8.0.4: - version "8.0.4" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.0.4.tgz#d3c909fcf7897152cdce2d6e42500cd9b5b41a0d" - integrity sha512-Rs0VxXoyFqHMrPQgKAMy+O907+m5Po71UVPhBi7BUBwU7ZZ2aoc+mZmpOX3DVPCoTcy6+hqJa9yIZfacNpJHdg== + version "8.1.0" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.1.0.tgz#dbc3ae2565366d8f20efb9f9799d076da64863f2" + integrity sha512-yfSkyJy7EuVsaoxtUSEhrD81spdJOe/gMTGea3XaV7HyoRhTb9Gdlp6/JppRZERvKSEYXP9bjcmq6CA5oL2lYQ== dependencies: + "@iamstarkov/listr-update-renderer" "0.4.1" chalk "^2.3.1" commander "^2.14.1" - cosmiconfig "^5.0.2" + cosmiconfig "5.0.6" debug "^3.1.0" dedent "^0.7.0" del "^3.0.0" @@ -4500,7 +4529,6 @@ lint-staged@^8.0.4: is-windows "^1.0.2" jest-validate "^23.5.0" listr "^0.14.2" - listr-update-renderer "https://github.com/okonet/listr-update-renderer/tarball/upgrade-log-update" lodash "^4.17.5" log-symbols "^2.2.0" micromatch "^3.1.8" @@ -4518,9 +4546,10 @@ listr-silent-renderer@^1.1.1: resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e" integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4= -listr-update-renderer@^0.4.0, "listr-update-renderer@https://github.com/okonet/listr-update-renderer/tarball/upgrade-log-update": - version "0.4.0" - resolved "https://github.com/okonet/listr-update-renderer/tarball/upgrade-log-update#06073fa93166277607a7814f4e1f83960081414c" +listr-update-renderer@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz#4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2" + integrity sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA== dependencies: chalk "^1.1.3" cli-truncate "^0.2.1" @@ -4531,30 +4560,30 @@ listr-update-renderer@^0.4.0, "listr-update-renderer@https://github.com/okonet/l log-update "^2.3.0" strip-ansi "^3.0.1" -listr-verbose-renderer@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz#8206f4cf6d52ddc5827e5fd14989e0e965933a35" - integrity sha1-ggb0z21S3cWCfl/RSYng6WWTOjU= +listr-verbose-renderer@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz#f1132167535ea4c1261102b9f28dac7cba1e03db" + integrity sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw== dependencies: - chalk "^1.1.3" - cli-cursor "^1.0.2" + chalk "^2.4.1" + cli-cursor "^2.1.0" date-fns "^1.27.2" - figures "^1.7.0" + figures "^2.0.0" listr@^0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.2.tgz#cbe44b021100a15376addfc2d79349ee430bfe14" - integrity sha512-vmaNJ1KlGuGWShHI35X/F8r9xxS0VTHh9GejVXwSN20fG5xpq3Jh4bJbnumoT6q5EDM/8/YP1z3YMtQbFmhuXw== + version "0.14.3" + resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz#2fea909604e434be464c50bddba0d496928fa586" + integrity sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA== dependencies: "@samverschueren/stream-to-observable" "^0.3.0" is-observable "^1.1.0" is-promise "^2.1.0" is-stream "^1.1.0" listr-silent-renderer "^1.1.1" - listr-update-renderer "^0.4.0" - listr-verbose-renderer "^0.4.0" - p-map "^1.1.1" - rxjs "^6.1.0" + listr-update-renderer "^0.5.0" + listr-verbose-renderer "^0.5.0" + p-map "^2.0.0" + rxjs "^6.3.3" load-ip-set@^2.1.0: version "2.1.0" @@ -4791,9 +4820,9 @@ lowercase-keys@^1.0.0: integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c" - integrity sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA== + version "4.1.5" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" + integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== dependencies: pseudomap "^1.0.2" yallist "^2.1.2" @@ -5054,9 +5083,9 @@ mime@^1.3.4, mime@^1.4.1: integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== mime@^2.2.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369" - integrity sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg== + version "2.4.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6" + integrity sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w== mimelib@^0.3.0: version "0.3.1" @@ -5386,9 +5415,9 @@ node-abi@^2.2.0: semver "^5.4.1" node-addon-api@^1.6.0: - version "1.6.1" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.6.1.tgz#a9881c8dbc6400bac6ddedcb96eccf8051678536" - integrity sha512-GcLOYrG5/enbqH4SMsqXt6GQUQGGnDnE3FLDZzXYkCgQHuZV5UDFR+EboeY8kpG0avroyOjpFQ2qLEBosFcRIA== + version "1.6.2" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.6.2.tgz#d8aad9781a5cfc4132cc2fecdbdd982534265217" + integrity sha512-479Bjw9nTE5DdBSZZWprFryHGjUaQC31y1wHo19We/k0BZlrmhqQitWoUL0cD8+scljCbIUL+E58oRDEakdGGA== node-fetch-npm@^2.0.2: version "2.0.2" @@ -5484,20 +5513,20 @@ nodemailer-shared@^1.1.0: nodemailer-fetch "1.6.0" nodemailer@^4.4.2: - version "4.6.8" - resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-4.6.8.tgz#f82fb407828bf2e76d92acc34b823d83e774f89c" - integrity sha512-A3s7EM/426OBIZbLHXq2KkgvmKbn2Xga4m4G+ZUA4IaZvG8PcZXrFh+2E4VaS2o+emhuUVRnzKN2YmpkXQ9qwA== + version "4.7.0" + resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-4.7.0.tgz#4420e06abfffd77d0618f184ea49047db84f4ad8" + integrity sha512-IludxDypFpYw4xpzKdMAozBSkzKHmNBvGanUREjJItgJ2NYcK/s8+PggVhj7c2yGFQykKsnnmv1+Aqo0ZfjHmw== nodemon@^1.18.6: - version "1.18.6" - resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.6.tgz#89b1136634d6c0afc7de24cc932a760e999e2c76" - integrity sha512-4pHQNYEZun+IkIC2jCaXEhkZnfA7rQe73i8RkdRyDJls/K+WxR7IpI5uNUsAvQ0zWvYcCDNGD+XVtw2ZG86/uQ== + version "1.18.7" + resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.7.tgz#716b66bf3e89ac4fcfb38a9e61887a03fc82efbb" + integrity sha512-xuC1V0F5EcEyKQ1VhHYD13owznQbUw29JKvZ8bVH7TmuvVNHvvbp9pLgE4PjTMRJVe0pJ8fGRvwR2nMiosIsPQ== dependencies: chokidar "^2.0.4" debug "^3.1.0" ignore-by-default "^1.0.1" minimatch "^3.0.4" - pstree.remy "^1.1.0" + pstree.remy "^1.1.2" semver "^5.5.0" supports-color "^5.2.0" touch "^3.1.0" @@ -6051,6 +6080,11 @@ p-map@^1.1.1: resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b" integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA== +p-map@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.0.0.tgz#be18c5a5adeb8e156460651421aceca56c213a50" + integrity sha512-GO107XdrSUmtHxVoi60qc9tUl/KkNKm+X2CF4P9amalpGxv5YqVPJNfSb0wcA+syCopkZvYYIzW8OVTQW59x/w== + p-try@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" @@ -6270,7 +6304,7 @@ pg-hstore@^2.3.2: dependencies: underscore "^1.7.0" -pg-pool@~2.0.3: +pg-pool@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.4.tgz#05ad0f2d9437d89c94ccc4f4d0a44ac65ade865b" integrity sha512-Mi2AsmlFkVMpI28NreaDkz5DkfxLOG16C/HNwi091LDlOiDiQACtAroLxSd1vIS2imBqxdjjO9cQZg2CwsOPbw== @@ -6286,14 +6320,14 @@ pg-types@~1.12.1: postgres-interval "^1.1.0" pg@^7.4.1: - version "7.6.1" - resolved "https://registry.yarnpkg.com/pg/-/pg-7.6.1.tgz#42c68aed37bf38b813616e3d21f4338f350c1b79" - integrity sha512-rAItIkYrRaNGinZN/Hs8F9R5mQjQSPlnzxPF+eCimSl92qnuNGR42gkpOQKP1bnvTwkSjRTBL+VNC5EcFhtCuQ== + version "7.7.1" + resolved "https://registry.yarnpkg.com/pg/-/pg-7.7.1.tgz#546b192ff484322b69689391f885de3ba91a30d4" + integrity sha512-p3I0mXOmUvCoVlCMFW6iYSrnguPol6q8He15NGgSIdM3sPGjFc+8JGCeKclw8ZR4ETd+Jxy2KNiaPUcocHZeMw== dependencies: buffer-writer "2.0.0" packet-reader "0.3.1" pg-connection-string "0.1.3" - pg-pool "~2.0.3" + pg-pool "^2.0.4" pg-types "~1.12.1" pgpass "1.x" semver "4.3.2" @@ -6396,12 +6430,12 @@ postgres-interval@^1.1.0: xtend "^4.0.0" prebuild-install@^5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-5.2.1.tgz#87ba8cf17c65360a75eefeb3519e87973bf9791d" - integrity sha512-9DAccsInWHB48TBQi2eJkLPE049JuAI6FjIH0oIrij4bpDVEbX6JvlWRAcAAlUqBHhjgq0jNqA3m3bBXWm9v6w== + version "5.2.2" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-5.2.2.tgz#237888f21bfda441d0ee5f5612484390bccd4046" + integrity sha512-4e8VJnP3zJdZv/uP0eNWmr2r9urp4NECw7Mt1OSAi3rcLrbBRxGiAkfUFtre2MhQ5wfREAjRV+K1gubvs/GPsA== dependencies: detect-libc "^1.0.3" - expand-template "^1.0.2" + expand-template "^2.0.3" github-from-package "0.0.0" minimist "^1.2.0" mkdirp "^0.5.1" @@ -6529,7 +6563,7 @@ psl@^1.1.24: resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67" integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ== -pstree.remy@^1.1.0: +pstree.remy@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.2.tgz#4448bbeb4b2af1fed242afc8dc7416a6f504951a" integrity sha512-vL6NLxNHzkNTjGJUpMm5PLC+94/0tTlC1vkP9bdU0pOHih+EujMjgMTwfZopZvHWRFbqJ5Y73OMoau50PewDDA== @@ -6587,11 +6621,16 @@ qs@4.0.0: resolved "https://registry.yarnpkg.com/qs/-/qs-4.0.0.tgz#c31d9b74ec27df75e543a86c78728ed8d4623607" integrity sha1-wx2bdOwn33XlQ6hseHKO2NRiNgc= -qs@6.5.2, qs@^6.5.1, qs@~6.5.2: +qs@6.5.2, qs@~6.5.2: version "6.5.2" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== +qs@^6.5.1: + version "6.6.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.6.0.tgz#a99c0f69a8d26bf7ef012f871cdabb0aee4424c2" + integrity sha512-KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA== + query-string@^6.1.0: version "6.2.0" resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.2.0.tgz#468edeb542b7e0538f9f9b1aeb26f034f19c86e1" @@ -7077,14 +7116,7 @@ rx-lite@^3.1.2: resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102" integrity sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI= -rxjs@6.2.2: - version "6.2.2" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.2.tgz#eb75fa3c186ff5289907d06483a77884586e1cf9" - integrity sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ== - dependencies: - tslib "^1.9.0" - -rxjs@^6.1.0: +rxjs@^6.3.3: version "6.3.3" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55" integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw== @@ -7869,10 +7901,10 @@ string2compact@^1.1.1, string2compact@^1.2.5: addr-to-ip-port "^1.0.1" ipaddr.js "^1.0.1" -string_decoder@^1.1.1, string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== +string_decoder@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d" + integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w== dependencies: safe-buffer "~5.1.0" @@ -7881,6 +7913,13 @@ string_decoder@~0.10.x: resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + stringify-object@^3.2.2: version "3.3.0" resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" @@ -8342,9 +8381,9 @@ tsutils@^2.27.2: tslib "^1.8.1" tsutils@^3.0.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.5.0.tgz#42602f7df241e753a2105cc3627a664abf11f745" - integrity sha512-/FZ+pEJQixWruFejFxNPRSwg+iF6aw7PYZVRqUscJ7EnzV3zieI8byfZziUR7QjCuJFulq8SEe9JcGflO4ze4Q== + version "3.5.2" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.5.2.tgz#6fd3c2d5a731e83bb21b070a173ec0faf3a8f6d3" + integrity sha512-qIlklNuI/1Dzfm+G+kJV5gg3gimZIX5haYtIVQe7qGyKd7eu8T1t1DY6pz4Sc2CGXAj9s1izycctm9Zfl9sRuQ== dependencies: tslib "^1.8.1" @@ -8411,9 +8450,9 @@ typedarray@^0.0.6: integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= typescript@^3.1.6: - version "3.1.6" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68" - integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA== + version "3.2.1" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.1.tgz#0b7a04b8cf3868188de914d9568bd030f0c56192" + integrity sha512-jw7P2z/h6aPT4AENXDGjcfHTu5CSqzsbZc6YlUIebTyBAq8XaKp78x7VcSh30xwSCcsu5irZkYZUSFP1MrAMbg== uid-number@0.0.6: version "0.0.6" @@ -8720,9 +8759,9 @@ wcwidth@^1.0.0: defaults "^1.0.3" webfinger.js@^2.6.6: - version "2.6.6" - resolved "https://registry.yarnpkg.com/webfinger.js/-/webfinger.js-2.6.6.tgz#52ebdc85da8c8fb6beb690e8e32594c99d2ff4ae" - integrity sha512-dQpuL01XtluQ9Ndgu62o3pEmIe/ssDoIE0CQsOyavGl04xyHal+Ge4gFerw5V0BFoLTQpD8ZZqaDzb43hG9atw== + version "2.7.0" + resolved "https://registry.yarnpkg.com/webfinger.js/-/webfinger.js-2.7.0.tgz#403354a14a65aeeba64c1408c18a387487cea106" + integrity sha512-l+UtsuV4zrBKyVAj9VCtwWgscTgadCsdGgL1OvbV102cvydWwJCGXlFIXauzWLzfheIDHfPNRWfgMuwyC6ZfIA== dependencies: xhr2 "^0.1.4" @@ -8909,9 +8948,9 @@ ws@1.1.2: ultron "1.0.x" ws@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.0.tgz#119a9dbf92c54e190ec18d10e871d55c95cf9373" - integrity sha512-H3dGVdGvW2H8bnYpIDc3u3LH8Wue3Qh+Zto6aXXFzvESkTVT6rAfKR6tR/+coaUvxs8yHtmNV0uioBF62ZGSTg== + version "6.1.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.2.tgz#3cc7462e98792f0ac679424148903ded3b9c3ad8" + integrity sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw== dependencies: async-limiter "~1.0.0" @@ -8936,16 +8975,16 @@ xhr2@^0.1.4: integrity sha1-f4dliEdxbbUCYyOBL4GMras4el8= xliff@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/xliff/-/xliff-4.1.0.tgz#32ea268a6442c122e132e6abf874539b1fc9c6b3" - integrity sha512-BlqCVTd16GLNx4TAll1Ebs1Gswh6g/Mx/9z6cXmbNTVqy7iqXAAwZjmhE2G1fX+++xoXy0IufPp+DOv8tJC/pA== + version "4.1.2" + resolved "https://registry.yarnpkg.com/xliff/-/xliff-4.1.2.tgz#eb6fae21346d82653febd44d478f5748ad79fbd2" + integrity sha512-ru+ya+rz2cb+D3Or9sf5xrj0MCL+q+vZmWOJlqZehIWlG3hqeIXhbfLMDAW9A5BsnRfL+BdMBHaogaTUGHyMyA== dependencies: - xml-js "1.6.7" + xml-js "1.6.8" -xml-js@1.6.7: - version "1.6.7" - resolved "https://registry.yarnpkg.com/xml-js/-/xml-js-1.6.7.tgz#a99b40c18a16d3e06537b3ae026a27bd60ffe8ab" - integrity sha512-1hn0xwwfMcWywnJxqiOXiv+pZaOJyf/YWcUeqJICF0BFb+IOkRFSkKyeA0V62WqTHXNdBxNuCFHhS/w2DtYpoA== +xml-js@1.6.8: + version "1.6.8" + resolved "https://registry.yarnpkg.com/xml-js/-/xml-js-1.6.8.tgz#e06419c54235f18f4c2cdda824cbd65a782330de" + integrity sha512-kUv/geyN80d+s1T68uBfjoz+PjNUjwwf5AWWRwKRqqQaGozpMVsFsKYnenPsxlbN/VL7f0ia8NfLLPCDwX+95Q== dependencies: sax "^1.2.4" @@ -8977,11 +9016,6 @@ xmlhttprequest-ssl@1.5.3: resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d" integrity sha1-GFqIjATspGw+QHDZn3tJ3jUomS0= -xregexp@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020" - integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg== - "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" @@ -9003,16 +9037,17 @@ yallist@^2.1.2: integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= yallist@^3.0.0, yallist@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9" - integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k= + version "3.0.3" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" + integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A== -yargs-parser@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8" - integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ== +yargs-parser@^11.1.1: + version "11.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4" + integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ== dependencies: - camelcase "^4.1.0" + camelcase "^5.0.0" + decamelize "^1.2.0" yargs-parser@^8.0.0: version "8.1.0" @@ -9047,12 +9082,12 @@ yargs@^11.0.0: yargs-parser "^9.0.2" yargs@^12.0.1, yargs@^12.0.2: - version "12.0.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc" - integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ== + version "12.0.5" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" + integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw== dependencies: cliui "^4.0.0" - decamelize "^2.0.0" + decamelize "^1.2.0" find-up "^3.0.0" get-caller-file "^1.0.1" os-locale "^3.0.0" @@ -9062,7 +9097,7 @@ yargs@^12.0.1, yargs@^12.0.2: string-width "^2.0.0" which-module "^2.0.0" y18n "^3.2.1 || ^4.0.0" - yargs-parser "^10.1.0" + yargs-parser "^11.1.1" yeast@0.1.2: version "0.1.2" @@ -9085,9 +9120,9 @@ youtube-dl@^1.12.2: streamify "^0.2.9" z-schema@^3.24.1: - version "3.24.1" - resolved "https://registry.yarnpkg.com/z-schema/-/z-schema-3.24.1.tgz#07a3643c8e061ec1af32e823c9f9e5e5e56e3c8d" - integrity sha512-2eR8eq/v1coNqyBc5HzswEcoLbw+S33RMnR326uiuOIr97ve5vwPNMDrKS1IRCB12bZ3a8BrfGxrRwuSXUyPvw== + version "3.24.2" + resolved "https://registry.yarnpkg.com/z-schema/-/z-schema-3.24.2.tgz#193560e718812d98fdc190c38871b634b92f2386" + integrity sha512-Zb2YLJ9g72MexBXKPRzoypd4OZfVkFghdy10eVbcMNLl9YQsPXtyMpiK7a3sG7IIERg1lEDjEMrG9Km9DPbWLw== dependencies: core-js "^2.5.7" lodash.get "^4.0.0" From d639c3bf14bd490ab99b41b2feee5a3b91267436 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 4 Dec 2018 10:07:43 +0100 Subject: [PATCH 008/137] Improve tools doc --- support/doc/tools.md | 80 ++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/support/doc/tools.md b/support/doc/tools.md index 1c7739525..5a1f212b1 100644 --- a/support/doc/tools.md +++ b/support/doc/tools.md @@ -4,13 +4,13 @@ **Table of Contents** -- [CLI wrapper](#cli-wrapper) - [Remote Tools](#remote-tools) - [Dependencies](#dependencies) - [Installation](#installation) - - [peertube-import-videos.js](#peertube-import-videosjs) - - [peertube-upload.js](#peertube-uploadjs) - - [peertube-watch.js](#peertube-watchjs) + - [CLI wrapper](#cli-wrapper) + - [peertube-import-videos.js](#peertube-import-videosjs) + - [peertube-upload.js](#peertube-uploadjs) + - [peertube-watch.js](#peertube-watchjs) - [Server tools](#server-tools) - [parse-log](#parse-log) - [create-transcoding-job.js](#create-transcoding-jobjs) @@ -26,9 +26,40 @@ -## CLI wrapper +## Remote Tools -The wrapper provides a convenient interface to most scripts, and requires the [same dependencies](#dependencies). You can access it as `peertube` via an alias in your `.bashrc` like `alias peertube="node ${PEERTUBE_PATH}/dist/server/tools/peertube.js"`: +You need at least 512MB RAM to run the script. +Scripts can be launched directly from a PeerTube server, or from a separate server, even a desktop PC. +You need to follow all the following steps even if you are on a PeerTube server (including cloning the git repository in a different directory than your production installation because the scripts utilize non-production dependencies). + +### Dependencies + +Install the [PeerTube dependencies](dependencies.md). + +### Installation + +Clone the PeerTube repo to get the latest version (even if you are on your PeerTube server): + +``` +$ git clone https://github.com/Chocobozzz/PeerTube.git +$ CLONE="$(pwd)/PeerTube" +``` + +Run ``yarn install --pure-lockfile`` +``` +$ cd ${CLONE} +$ yarn install --pure-lockfile +``` + +Build server tools: +``` +$ cd ${CLONE} +$ npm run build:server +``` + +### CLI wrapper + +The wrapper provides a convenient interface to the following scripts. You can access it as `peertube` via an alias in your `.bashrc` like `alias peertube="node /your/peertube/directory/dist/server/tools/peertube.js"`: ``` Usage: peertube [command] [options] @@ -72,38 +103,7 @@ And now that your video is online, you can watch it from the confort of your ter $ peertube watch https://peertube.cpy.re/videos/watch/e8a1af4e-414a-4d58-bfe6-2146eed06d10 ``` -## Remote Tools - -You need at least 512MB RAM to run the script. -Scripts can be launched directly from a PeerTube server, or from a separate server, even a desktop PC. -You need to follow all the following steps even if you are on a PeerTube server (including cloning the git repository in a different directory than your production installation because the scripts utilize non-production dependencies). - -### Dependencies - -Install the [PeerTube dependencies](dependencies.md). - -### Installation - -Clone the PeerTube repo to get the latest version (even if you are on your PeerTube server): - -``` -$ git clone https://github.com/Chocobozzz/PeerTube.git -$ CLONE="$(pwd)/PeerTube" -``` - -Run ``yarn install`` -``` -$ cd ${CLONE} -$ yarn install -``` - -Build server tools: -``` -$ cd ${CLONE} -$ npm run build:server -``` - -### peertube-import-videos.js +#### peertube-import-videos.js You can use this script to import videos from all [supported sites of youtube-dl](https://rg3.github.io/youtube-dl/supportedsites.html) into PeerTube. Be sure you own the videos or have the author's authorization to do so. @@ -133,7 +133,7 @@ Already downloaded videos will not be uploaded twice, so you can run and re-run Videos will be publicly available after transcoding (you can see them before that in your account on the web interface). -### peertube-upload.js +#### peertube-upload.js You can use this script to import videos directly from the CLI. @@ -144,7 +144,7 @@ $ cd ${CLONE} $ node dist/server/tools/peertube-upload.js --help ``` -### peertube-watch.js +#### peertube-watch.js You can use this script to play videos directly from the CLI. From 06471769fc29a82446ed5da6c65d2e9219bec73b Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 4 Dec 2018 10:29:28 +0100 Subject: [PATCH 009/137] Upgrade client dependencies --- client/package.json | 36 +- client/src/app/core/core.module.ts | 2 +- client/yarn.lock | 1369 +++++++++++++++------------- 3 files changed, 772 insertions(+), 635 deletions(-) diff --git a/client/package.json b/client/package.json index 3761a641a..62ae47184 100644 --- a/client/package.json +++ b/client/package.json @@ -63,26 +63,26 @@ "setupTestFrameworkScriptFile": "/src/setupJest.ts" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.10.0", - "@angular/animations": "~7.0.2", - "@angular/cli": "~7.0.4", - "@angular/common": "~7.0.2", - "@angular/compiler": "~7.0.2", - "@angular/compiler-cli": "~7.0.2", - "@angular/core": "~7.0.2", - "@angular/forms": "~7.0.2", - "@angular/http": "~7.0.2", - "@angular/language-service": "~7.0.2", - "@angular/platform-browser": "~7.0.2", - "@angular/platform-browser-dynamic": "~7.0.2", - "@angular/router": "~7.0.2", - "@angular/service-worker": "~7.0.2", + "@angular-devkit/build-angular": "~0.11.1", + "@angular/animations": "~7.1.1", + "@angular/cli": "~7.1.1", + "@angular/common": "~7.1.1", + "@angular/compiler": "~7.1.1", + "@angular/compiler-cli": "~7.1.1", + "@angular/core": "~7.1.1", + "@angular/forms": "~7.1.1", + "@angular/http": "~7.1.1", + "@angular/language-service": "~7.1.1", + "@angular/platform-browser": "~7.1.1", + "@angular/platform-browser-dynamic": "~7.1.1", + "@angular/router": "~7.1.1", + "@angular/service-worker": "~7.1.1", "@angularclass/hmr": "^2.1.3", "@neos21/bootstrap3-glyphicons": "^1.0.1", "@ng-bootstrap/ng-bootstrap": "^4.0.0", - "@ngx-loading-bar/core": "^2.2.0", - "@ngx-loading-bar/http-client": "^2.2.0", - "@ngx-loading-bar/router": "^2.2.0", + "@ngx-loading-bar/core": "^3.0.0", + "@ngx-loading-bar/http-client": "^3.0.0", + "@ngx-loading-bar/router": "^3.0.0", "@ngx-meta/core": "^6.0.0-rc.1", "@ngx-translate/i18n-polyfill": "^1.0.0", "@types/core-js": "^2.5.0", @@ -132,7 +132,7 @@ "node-sass": "^4.9.3", "npm-font-source-sans-pro": "^1.0.2", "path-browserify": "^1.0.0", - "primeng": "^6.1.2", + "primeng": "^7.0.0", "process": "^0.11.10", "protractor": "^5.3.2", "purify-css": "^1.2.5", diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts index df2ec696d..8a6654aa1 100644 --- a/client/src/app/core/core.module.ts +++ b/client/src/app/core/core.module.ts @@ -29,7 +29,7 @@ import { CheatSheetComponent } from '@app/core/hotkeys' LoadingBarHttpClientModule, LoadingBarRouterModule, - LoadingBarModule.forRoot(), + LoadingBarModule, HotkeyModule.forRoot({ cheatSheetCloseEsc: true diff --git a/client/yarn.lock b/client/yarn.lock index 928dec01e..98a30941e 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -2,26 +2,26 @@ # yarn lockfile v1 -"@angular-devkit/architect@0.10.6": - version "0.10.6" - resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.10.6.tgz#7007e7591be21eeb478951106c84c83802ca21a4" - integrity sha512-IygpkXNn946vVUFFWKWEDxRqRy888vOAUWcmkZzqPEBYkuwWt7WnLfe8Sjw4fH/+HLWEMS8RXbdSTHiiaP9qOg== +"@angular-devkit/architect@0.11.1": + version "0.11.1" + resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.11.1.tgz#fb8429b583d4d7efafe5ff551ffdd30a705b9ab0" + integrity sha512-MdcZ5KclwL2SBXCQSn8uI2hakBX58EyuAwFWsM/pKrNt9j8RqIk93l4amd2OkaMtZRFP5zWodyf/3qOwacjuQg== dependencies: - "@angular-devkit/core" "7.0.6" + "@angular-devkit/core" "7.1.1" rxjs "6.3.3" -"@angular-devkit/build-angular@~0.10.0": - version "0.10.6" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.10.6.tgz#9c713a786de89a68063bd9e86516eb450f2dac72" - integrity sha512-Lbx6rjIGB2mMmkTCaolrQ86OfPxO/qfb4l2RvPiSyx06MEZfmFWKGeJzqCYKBRQajziX3Yc3AFzAPecoCkbIGA== +"@angular-devkit/build-angular@~0.11.1": + version "0.11.1" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.11.1.tgz#a828797d9177227aee70a65bb06d4b189b1404cd" + integrity sha512-hA/3GVMmRwOPXWhImrBG9gZTdERr937NMuedKhTXuNj6TNMNjk9XQ+q2erd0LZVbgfhL/nC0wHnpy0dUWXu8jA== dependencies: - "@angular-devkit/architect" "0.10.6" - "@angular-devkit/build-optimizer" "0.10.6" - "@angular-devkit/build-webpack" "0.10.6" - "@angular-devkit/core" "7.0.6" - "@ngtools/webpack" "7.0.6" + "@angular-devkit/architect" "0.11.1" + "@angular-devkit/build-optimizer" "0.11.1" + "@angular-devkit/build-webpack" "0.11.1" + "@angular-devkit/core" "7.1.1" + "@ngtools/webpack" "7.1.1" ajv "6.5.3" - autoprefixer "9.1.5" + autoprefixer "9.3.1" circular-dependency-plugin "5.0.2" clean-css "4.2.1" copy-webpack-plugin "4.5.4" @@ -34,7 +34,7 @@ less-loader "4.1.0" license-webpack-plugin "2.0.2" loader-utils "1.1.0" - mini-css-extract-plugin "0.4.3" + mini-css-extract-plugin "0.4.4" minimatch "3.0.4" opn "5.3.0" parse5 "4.0.0" @@ -48,45 +48,45 @@ semver "5.5.1" source-map-loader "0.2.4" source-map-support "0.5.9" - speed-measure-webpack-plugin "^1.2.3" + speed-measure-webpack-plugin "1.2.3" stats-webpack-plugin "0.7.0" - style-loader "0.23.0" + style-loader "0.23.1" stylus "0.54.5" stylus-loader "3.0.2" terser-webpack-plugin "1.1.0" tree-kill "1.2.0" - webpack "4.19.1" - webpack-dev-middleware "3.3.0" - webpack-dev-server "3.1.8" + webpack "4.23.1" + webpack-dev-middleware "3.4.0" + webpack-dev-server "3.1.10" webpack-merge "4.1.4" - webpack-sources "1.2.0" + webpack-sources "1.3.0" webpack-subresource-integrity "1.1.0-rc.6" optionalDependencies: - node-sass "4.9.3" + node-sass "4.10.0" -"@angular-devkit/build-optimizer@0.10.6": - version "0.10.6" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.10.6.tgz#ca7db9b3d5378b2759509692f02a5fb5af273dd0" - integrity sha512-oedg8F++8zZTmoTt141k3nlyPtrSSsQUZI9TFbSdfR1D5WDflwOlkLyRb5WoC53HSoQnagKxY2qzd7khVah//Q== +"@angular-devkit/build-optimizer@0.11.1": + version "0.11.1" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.11.1.tgz#1079737a44b26b39e35cea7f966a39cd11bbbf48" + integrity sha512-pyFP6ykZf8Iq8nRkgP2XKq8knpIG6ye0qYklnBC9815AC5RAO126Y4fmtd6tnH+5p1mQxnt5HegG0j5xOCgDRw== dependencies: loader-utils "1.1.0" source-map "0.5.6" typescript "3.1.6" webpack-sources "1.2.0" -"@angular-devkit/build-webpack@0.10.6": - version "0.10.6" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.10.6.tgz#d3acb781f97406a49a3e3adfcc49a8518d33e291" - integrity sha512-tPv23KKw3iAGCTF6noD7zdHbufny4A3d+mlX1VoJDiAa6jqmuFxhY2fALymc11MRY4HVtMF5J1kQy9BLGCDbQg== +"@angular-devkit/build-webpack@0.11.1": + version "0.11.1" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.11.1.tgz#bd98ff3dea633c5b77671b471e72cf6c91f6c679" + integrity sha512-p7fPHOi2Wfq2VPtnRVowg3n99MujghpOp6zW0gBJQD1TQhGVzPK6AX42S0NA4d05ahNBCDU2n7Y+5TjNJRIGJw== dependencies: - "@angular-devkit/architect" "0.10.6" - "@angular-devkit/core" "7.0.6" + "@angular-devkit/architect" "0.11.1" + "@angular-devkit/core" "7.1.1" rxjs "6.3.3" -"@angular-devkit/core@7.0.6": - version "7.0.6" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.0.6.tgz#26c4cd4d271e8cd03f6e50b4ec30cbc606f3346e" - integrity sha512-RPSXUtLrpYDTqAEL0rCyDKxES76EomsPBvUUZTD6UkE2pihoh9ZIxkzhzlE+HU/xdqm28+smQYFhvvEAXFWwSQ== +"@angular-devkit/core@7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.1.1.tgz#ce0a674f16188072988502cc3f073b15efcfe194" + integrity sha512-rODqECpOiV6vX+L1qd63GLiF3SG+V1O+d8WYtnKPOxnsMM9yWpWmqmroHtXfisjucu/zwoqj8HoO/noJZCfynw== dependencies: ajv "6.5.3" chokidar "2.0.4" @@ -94,48 +94,47 @@ rxjs "6.3.3" source-map "0.7.3" -"@angular-devkit/schematics@7.0.6": - version "7.0.6" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.0.6.tgz#97fca028bd937e2319d9d34c12b82e8d1d99de23" - integrity sha512-S/3CrBDoh/BD4mBq8RNGQ8sgNFDsveCuFHDkOyct8+NDg2wcRkEGigyq8eZwVN/iVKCwjxc0I/bC336edoNMIQ== +"@angular-devkit/schematics@7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.1.1.tgz#328ec6071c5ef3b1588a9f4bc97f5edfc3620b09" + integrity sha512-yjzTw8ZWMPg0Fc9VQCHNpUCAH7aiNxrUDs0IbhdC0CyKTBoqH+cx2xP4Z6ECf4uNwceLKJlE0l3ot42Ypnlziw== dependencies: - "@angular-devkit/core" "7.0.6" + "@angular-devkit/core" "7.1.1" rxjs "6.3.3" -"@angular/animations@~7.0.2": - version "7.0.4" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.0.4.tgz#f53fc9f1bce3bf1afe60dcbc08b6863472f519e4" - integrity sha512-QfFikT0FzYNMjdVg0LWTBijdu9JDJyzejnhCFlXxv+KR4zolpRK98/rU7CFW1Fg2jjL3/yL9PT1sf5I0fTJZYA== +"@angular/animations@~7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.1.1.tgz#8fecbd19417364946a9ea40c8fdf32462110232f" + integrity sha512-iTNxhPPraCZsE4rgM23lguT1kDV4mfYAr+Bsi5J0+v9ZJA+VaKvi6eRW8ZGrx4/rDz6hzTnBn1jgPppHFbsOcw== dependencies: tslib "^1.9.0" -"@angular/cli@~7.0.4": - version "7.0.6" - resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.0.6.tgz#f97bc9ca92785c7ce2e5f20819c48265a1da5b53" - integrity sha512-f76kq8AQMkloeojIffeT7DYLXT/J4DRhYoAPQR4E09V7lkigFCILiYzQs5RtCAX6EjlPxlrZKkdfnBn0OUPnig== +"@angular/cli@~7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.1.1.tgz#c5dd2b92c5c3391f20262b5e530813e4e2d31777" + integrity sha512-lPVKsk035T5Ls0Mf83OngrNoLZu/ucZSjRLN/GWZK1O/YYVmb/dTgVl/a7HC+G480tWQ34nlqnCRbrP7sE9v7g== dependencies: - "@angular-devkit/architect" "0.10.6" - "@angular-devkit/core" "7.0.6" - "@angular-devkit/schematics" "7.0.6" - "@schematics/angular" "7.0.6" - "@schematics/update" "0.10.6" + "@angular-devkit/architect" "0.11.1" + "@angular-devkit/core" "7.1.1" + "@angular-devkit/schematics" "7.1.1" + "@schematics/angular" "7.1.1" + "@schematics/update" "0.11.1" inquirer "6.2.0" opn "5.3.0" - rxjs "6.3.3" semver "5.5.1" symbol-observable "1.2.0" -"@angular/common@~7.0.2": - version "7.0.4" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.0.4.tgz#aafb26ce59c967daa5b122393e1933208a247f72" - integrity sha512-akQojdqY/RBlItkDWAPI3k0Llk1wnbAp+f47yySi3cgQz9SaZ1/RLNWZV84I/cKrksb4ehorT/lTqRBojsAD1A== +"@angular/common@~7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.1.1.tgz#f78f884614ef81ab2fd648f1aa3e83aae370a6c8" + integrity sha512-SngekFx9v39sjgi9pON0Wehxpu+NdUk7OEebw4Fa8dKqTgydTkuhmnNH+9WQe264asoeCt51oufPRjIqMLNohA== dependencies: tslib "^1.9.0" -"@angular/compiler-cli@~7.0.2": - version "7.0.4" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.0.4.tgz#f96fc1c0aec27ee97ec5f13a8eb72bc8b964db97" - integrity sha512-kvhWt6OTb1Uduns9Vm+Dwd/UUBNSEU6Jgu+QOPeHr7lg+4NTyr9uQLU0DtfBP0ljOlds8esmfii5IIFTeUQw1Q== +"@angular/compiler-cli@~7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.1.1.tgz#c5f6225fb72b56f42fa78c332fdee9755c64604e" + integrity sha512-4NXlkDhOEQgaP3Agigqw93CvXJvsfnXa0xiglq9e/wjL+6XbtM9WcDb5lfRQz41N9RSkO3pEHGvKMweKZGgogA== dependencies: canonical-path "1.0.0" chokidar "^1.4.2" @@ -149,64 +148,64 @@ tslib "^1.9.0" yargs "9.0.1" -"@angular/compiler@~7.0.2": - version "7.0.4" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.0.4.tgz#df91dab990c46b464705b0901d70d1cfdfd190e1" - integrity sha512-ExDhH1cJkuJkUsgNRZyZBse0a7wWkQyG5O8HONi3Rzig9dalFEuve9jD04zfA1Jx1GTXhovqtGnF72x4kw0V8Q== +"@angular/compiler@~7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.1.1.tgz#4efbcad27ab43d4cd36d936a8df2e073f6d02d0a" + integrity sha512-oJvBe8XZ+DXF/W/DxWBTbBcixJTuPeZWdkcZIGWhJoQP7K5GnGnj8ffP9Lp6Dh4TKv85awtC6OfIKhbHxa650Q== dependencies: tslib "^1.9.0" -"@angular/core@~7.0.2": - version "7.0.4" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.0.4.tgz#98340a1bdb53f0bbecfcfc9831a7a22a1540d79b" - integrity sha512-17SSmCz1wQoZKnVHF/T8UkWYPpDm5kPyoc1okkTTv8ZA2EAMMuZFFnRSAxEL5i7mNB9z5CvRqF2tRx/DbgbIRA== +"@angular/core@~7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.1.1.tgz#9748b0103cd86226554e1ccbd0f43dd8c46f1ed1" + integrity sha512-Osig5SRgDRQ+Hec/liN7nq/BCJieB+4/pqRh9rFbOXezb2ptgRZqdXOXN8P17i4AwPVf308Mh55V0niJ5Eu3Rw== dependencies: tslib "^1.9.0" -"@angular/forms@~7.0.2": - version "7.0.4" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.0.4.tgz#5f2328d297f5c7f9f3af81e1f76a13e1546c743f" - integrity sha512-W3nN9n1VY9On9+9f7PDRbzJUg+mMq1bjkhWsk/b7DfaYdmlzpG+Wd6OfArob2edsqGqH1dvTM8q8aGbWiFZ7dA== +"@angular/forms@~7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.1.1.tgz#d16ef10a901c007062fd19144cd77917ef55ee24" + integrity sha512-yCWuPjpu23Wc3XUw7v/ACNn/e249oT0bYlM8aaMQ1F5OwrmmC4NJC12Rpl9Ihza61RIHIKzNcHVEgzc7WhcSag== dependencies: tslib "^1.9.0" -"@angular/http@~7.0.2": - version "7.0.4" - resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.0.4.tgz#445d6a812d25ea1656fc3e3381ef82b3f98fccb4" - integrity sha512-oUGT7xS7FZYajuHq0DP6MgahacB5sJTRgxiUU4uhQ/mqV7aREODVJJgw7oHDhM7Cnyzzo0B9D0zpEljKmeCLWQ== +"@angular/http@~7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.1.1.tgz#f19f17ad42e7f3cdabcf1250ca757640d0f02219" + integrity sha512-pRk+c/kz9aJ8te5xzCxlPLpFnwB0d/E9YkOo3/ydaXF9vZw13RTzk00YyzJ41PDzJf8oPDdXtueTQ+vtJ7Srtw== dependencies: tslib "^1.9.0" -"@angular/language-service@~7.0.2": - version "7.0.4" - resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.0.4.tgz#db221f183725ff54c1188aec7acb2948e29f4c50" - integrity sha512-CuJ2Ii97sNoN1HOZOLxG1lEHsQFi8K/RSB/k2suWPKzdM53ldSkKoYRac38zW/uqNABYItgvxb7w0Vi7HhxLsg== +"@angular/language-service@~7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.1.1.tgz#6bbe35b2430ad54618a1803f881efb5894b296c9" + integrity sha512-X+5g20PMtNRGZIa3svMv4PLJdJehn4wqrS8nwOtzH5XkSn5vA3IxjsJVdSzAy2AN0/sKKJK5jmQorPtKO4saJg== -"@angular/platform-browser-dynamic@~7.0.2": - version "7.0.4" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.0.4.tgz#69abb8c784bb71a660a0c824ca4a1a4960811a33" - integrity sha512-k1I53zIg8YWhtQizLfq/tWrUUdY5vHV8pGHyt0/UTGDqat5TORd6LDFfzCSux0r3qZujCOGNi9f4/AbyV8B9lw== +"@angular/platform-browser-dynamic@~7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.1.1.tgz#6945298446173338782f437a996226110cda0d3e" + integrity sha512-ZIu48Vn4S6gjD7CMbGlKGaPQ8v9rYkWzlNYi4vTYzgiqKKNC3hqLsVESU3mSvr5oeQBxSIBidTdHSyafHFrA2w== dependencies: tslib "^1.9.0" -"@angular/platform-browser@~7.0.2": - version "7.0.4" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.0.4.tgz#57dfaa23f8a3d678bad6ca110051e3ac6622ff3d" - integrity sha512-4brYZZgsCJk1/a6JoSwaiVWO9+/T4iyE27dAgstao1nOf/jrBNKW2HnZtkWZmCCBK0WIk15wlB0Xr87OZbjNVA== +"@angular/platform-browser@~7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.1.1.tgz#a6bd408f656dc43ee5a2d8af3dfaa786c7c1dfca" + integrity sha512-I6OPjecynGJSbPtzu0gvEgSmIR6X6/xEAhg4L9PycW1ryjzptTC9klWRTWIqsIBqMxhVnY44uKLeRNrDwMOwyA== dependencies: tslib "^1.9.0" -"@angular/router@~7.0.2": - version "7.0.4" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.0.4.tgz#ae2c32cc6a29bfe6eb909b9c63257d187075f4ff" - integrity sha512-nt1jJsxN+JmYZ6URamMdULUpH4aHdnNVKjWtjDI0OpdZvPx7PMFD8cfc92q0tavy2KqqexcceIb4BIC965gtpA== +"@angular/router@~7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.1.1.tgz#80a4cdffc03a529b73485c2ad63a30ec435364ea" + integrity sha512-jbnqEq/1iDBkeH8Vn13hauGPTzhwllWM+MLfmdNGTiMzGRx4pmkWa57seDOeBF/GNYBL9JjkWTCrkKFAc2FJKw== dependencies: tslib "^1.9.0" -"@angular/service-worker@~7.0.2": - version "7.0.4" - resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.0.4.tgz#be274843ae29cb69ac969c078edd8ae5b25e3e61" - integrity sha512-vBA9T1xeCP6QesOYhMyVpXTUVdXU4eMYdoZItHncyom8AxS2a26FB8zLW72VXdEfZ7xnJgcDtsYzYzVi+3DXsQ== +"@angular/service-worker@~7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.1.1.tgz#c9e6f0265d7e102d8271483519cf09a180f0e08b" + integrity sha512-xX00x0XMW47jEfYTZLwdJCqkmPE7+mdtlSeOGpjaKv6Y2hqZodz80RYgH5JltM4RKEzOvQolR6KmdKcw1ANs9Q== dependencies: tslib "^1.9.0" @@ -223,11 +222,11 @@ "@babel/highlight" "^7.0.0" "@babel/generator@^7.0.0", "@babel/generator@^7.1.6": - version "7.1.6" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.1.6.tgz#001303cf87a5b9d093494a4bf251d7b5d03d3999" - integrity sha512-brwPBtVvdYdGxtenbQgfCdDPmtkmUBZPjUoK5SXJEBuHaA5BCubh9ly65fzXz7R6o5rA76Rs22ES8Z+HCc0YIQ== + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.2.0.tgz#eaf3821fa0301d9d4aef88e63d4bcc19b73ba16c" + integrity sha512-BA75MVfRlFQG2EZgFYIwyT1r6xSkwfP2bdkY/kLZusEYWiJs4xCowab/alaEaT0wSvmVuXGqiefeBlP+7V1yKg== dependencies: - "@babel/types" "^7.1.6" + "@babel/types" "^7.2.0" jsesc "^2.5.1" lodash "^4.17.10" source-map "^0.5.0" @@ -266,14 +265,14 @@ js-tokens "^4.0.0" "@babel/parser@^7.0.0", "@babel/parser@^7.1.2", "@babel/parser@^7.1.6": - version "7.1.6" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.6.tgz#16e97aca1ec1062324a01c5a6a7d0df8dd189854" - integrity sha512-dWP6LJm9nKT6ALaa+bnL247GHHMWir3vSlZ2+IHgHgktZQx0L3Uvq2uAWcuzIe+fujRsYWBW2q622C5UvGK9iQ== + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.2.0.tgz#02d01dbc330b6cbf36b76ac93c50752c69027065" + integrity sha512-M74+GvK4hn1eejD9lZ7967qAwvqTZayQa3g10ag4s9uewgR7TKjeaT0YMyoq+gVfKYABiWZ4MQD701/t5e1Jhg== "@babel/runtime@^7.0.0": - version "7.1.5" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.1.5.tgz#4170907641cf1f61508f563ece3725150cc6fe39" - integrity sha512-xKnPpXG/pvK1B90JkwwxSGii90rQGKtzcMt2gI5G6+M0REXaq6rOHsGC2ay6/d0Uje7zzvSzjEzfR3ENhFlrfA== + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.2.0.tgz#b03e42eeddf5898e00646e4c840fa07ba8dcad7f" + integrity sha512-oouEibCbHMVdZSDlJBO6bZmID/zA/G/Qx3H1d3rSNPTD+L8UNKvCat7aKWSJ74zYbm5zWGh0GQN0hKj8zYFTCg== dependencies: regenerator-runtime "^0.12.0" @@ -301,10 +300,10 @@ globals "^11.1.0" lodash "^4.17.10" -"@babel/types@^7.0.0", "@babel/types@^7.1.2", "@babel/types@^7.1.6": - version "7.1.6" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.1.6.tgz#0adb330c3a281348a190263aceb540e10f04bcce" - integrity sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w== +"@babel/types@^7.0.0", "@babel/types@^7.1.2", "@babel/types@^7.1.6", "@babel/types@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.2.0.tgz#7941c5b2d8060e06f9601d6be7c223eef906d5d8" + integrity sha512-b4v7dyfApuKDvmPb+O488UlGuR1WbwMXFsO/cyqMrnfvRAChZKJAYeeglWTjUO1b9UghKKgepAQM5tsvBJca6A== dependencies: esutils "^2.0.2" lodash "^4.17.10" @@ -322,38 +321,38 @@ dependencies: tslib "^1.9.0" -"@ngtools/webpack@7.0.6": - version "7.0.6" - resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.0.6.tgz#cc4f4189765f6743417b4eee946fb69590f93ce1" - integrity sha512-lOHpVqr30QXPuaOxSRasHv6ybDj4a1jVwSOk+W4aGqVlLi0bsngt9HrvgR+FALEoG9P520bytz16wma81Y2Aeg== +"@ngtools/webpack@7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.1.1.tgz#c418e1cb0d70a77d06e8c32500fe2e92e606ea52" + integrity sha512-XW/YDjiDZlwOYK4YvGAIKIVEkqtdwPLwTWAmDbnfpEHQc8UALsBrzGdjze0jSfXQdQxkbmXo0aolZgNc7uL/wQ== dependencies: - "@angular-devkit/core" "7.0.6" + "@angular-devkit/core" "7.1.1" enhanced-resolve "4.1.0" rxjs "6.3.3" tree-kill "1.2.0" webpack-sources "1.2.0" -"@ngx-loading-bar/core@2.2.0", "@ngx-loading-bar/core@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@ngx-loading-bar/core/-/core-2.2.0.tgz#ad313bbbd69e4c52cc2d6f0a8b5911272371d16a" - integrity sha512-0jcnEzuhqE/c+4iAumJ/0D4GBWm4RRVas0+qXpX4Wm225SJoE5KupUOlMrvLnJNK2bn8NW31dEj80kJ+UzhE5A== +"@ngx-loading-bar/core@3.0.0", "@ngx-loading-bar/core@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@ngx-loading-bar/core/-/core-3.0.0.tgz#86c6d036b5ad50950b5ea526db585f39d44f396a" + integrity sha512-DBH+bKf8M9uSk2791HbtN/JvcEmBxEbUCiOJ6PYrjbginH6dUn2NsSxnv3myu0lpx+7K3MusXLNImkB5JUh2QA== dependencies: tslib "^1.7.1" -"@ngx-loading-bar/http-client@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@ngx-loading-bar/http-client/-/http-client-2.2.0.tgz#4b5443feed5c53bc5b5f06119f771edbe89799f4" - integrity sha512-+eilxs10KncQWg7DQJLK2AoWnmTPidhVHNxfTOPHJVnmcyAFmTtk+lQbf5Ke3aC4d/KXZklkRyBizqDfvRvc9w== +"@ngx-loading-bar/http-client@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@ngx-loading-bar/http-client/-/http-client-3.0.0.tgz#2fce2f60da37a48f2173ef4f08189eecf98d9215" + integrity sha512-7AHM3tmA2FDFXsKbL09vnRqqxdztpjilkP3U9zXB5Lkv3XtlJnZoQKFCSbmEusw30k3oAmY5id/ZE9X83uekZg== dependencies: - "@ngx-loading-bar/core" "2.2.0" + "@ngx-loading-bar/core" "3.0.0" tslib "^1.7.1" -"@ngx-loading-bar/router@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@ngx-loading-bar/router/-/router-2.2.0.tgz#c13c1a05c620a9da102102322685b671d3c9a1ba" - integrity sha512-/lrWc0ZwGcpmuoa26/h0rC7SRVKgCtsikhy0mVXwrb1VVJ+sRU8vNKbq7aidcvEY5vdi3l0Z7DcVq9+JV/i/BQ== +"@ngx-loading-bar/router@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@ngx-loading-bar/router/-/router-3.0.0.tgz#627e73be406dfdff48175f75c110bebd4f6fa588" + integrity sha512-UL3GaFyFfHwgGeAdSEG800Rl3GuBfKydPp21lD/paqdsrUT2Z1cBLAiVFw7U4QdnSLaPzngYr9bzgDFdy4GqYQ== dependencies: - "@ngx-loading-bar/core" "2.2.0" + "@ngx-loading-bar/core" "3.0.0" tslib "^1.7.1" "@ngx-meta/core@^6.0.0-rc.1": @@ -372,23 +371,25 @@ tslib "^1.9.0" yargs "10.0.3" -"@schematics/angular@7.0.6": - version "7.0.6" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.0.6.tgz#1173c201d118cf38d1afdb382e9a916e4b540a17" - integrity sha512-jOHL+vSu1cqAo3kRNDmgkq/GR2EDkJx5/h0VXGlbtdEpq892LipKHtyPgXa269AABgPKb3TSNBwZls6g2L9FCw== +"@schematics/angular@7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.1.1.tgz#4ee17a17d221eaf48009db0b991766d1074d0b4f" + integrity sha512-jMaj8y3rNTQQXuH38uoWfAOmwYjtzqo1RelNfACnT54mfO/Dat+k7WasBLHWuvzvnN4/Ga3kXL7sJpkeMciiIg== dependencies: - "@angular-devkit/core" "7.0.6" - "@angular-devkit/schematics" "7.0.6" + "@angular-devkit/core" "7.1.1" + "@angular-devkit/schematics" "7.1.1" typescript "3.1.6" -"@schematics/update@0.10.6": - version "0.10.6" - resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.10.6.tgz#616e6c321cd51468eacda7fc8a0306b37f8b4ca2" - integrity sha512-Yy/M4JosrVDb5tbpmi+v1uTHSmBYISOiuFVuxtpMN5DWdDNq/JTBEw2jy3quelGWHCU06rbGo578Ml3azGZ+9g== +"@schematics/update@0.11.1": + version "0.11.1" + resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.11.1.tgz#5129a800043dc38ee1f1c879865e0df82ddac7ed" + integrity sha512-IzPXamoMpDb2eY2zSW4fPuuH+7RfJLte9XVzQM2y3ZTBhlJQFLqx7qJtOXdcXUboonC6o61KCayNDERFnDUdPg== dependencies: - "@angular-devkit/core" "7.0.6" - "@angular-devkit/schematics" "7.0.6" - npm-registry-client "8.6.0" + "@angular-devkit/core" "7.1.1" + "@angular-devkit/schematics" "7.1.1" + "@yarnpkg/lockfile" "1.1.0" + ini "1.3.5" + pacote "9.1.1" rxjs "6.3.3" semver "5.5.1" semver-intersect "1.4.0" @@ -405,10 +406,15 @@ resolved "https://registry.yarnpkg.com/@types/core-js/-/core-js-2.5.0.tgz#35cc282488de6f10af1d92902899a3b8ca3fbc47" integrity sha512-qjkHL3wF0JMHMqgm/kmL8Pf8rIiqvueEiZ0g6NVTcBX1WN46GWDr+V5z+gsHUeL0n8TfAmXnYmF7ajsxmBp4PQ== -"@types/jasmine@*", "@types/jasmine@^2.8.7": - version "2.8.11" - resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.11.tgz#0b5eba9e02616736b1a189112eacc163c3773b7b" - integrity sha512-ITPYT5rkV9S0BcucyBwXIUzqzSODVhvAzhOGV0bwZMuqWJeU0Kfdd6IJeJjGI8Gob+lDyAtKaWUfhG6QXJIPRg== +"@types/jasmine@*": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.3.1.tgz#b6c4f356013364e98b583647c7b3b6de6fccd2cc" + integrity sha512-JnKB+cEIFuQZXizZP6N0zxma+JlvowkjefWuL61otVmXN7Ebbs4ka3IbDVIz1pc+TCiT00q925jANz3gQJ9qXw== + +"@types/jasmine@^2.8.7": + version "2.8.12" + resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.12.tgz#dfe606b07686c977f54d17cb8ebe6cae2e26f8ff" + integrity sha512-eE+xeiGBPgQsNcyg61JBqQS6NtxC+s2yfOikMCnc0Z4NqKujzmSahmtjLCKVQU/AyrTEQ76TOwQBnr8wGP2bmA== "@types/jasminewd2@^2.0.3": version "2.0.6" @@ -418,9 +424,9 @@ "@types/jasmine" "*" "@types/jest@^23.3.1": - version "23.3.9" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-23.3.9.tgz#c16b55186ee73ae65e001fbee69d392c51337ad1" - integrity sha512-wNMwXSUcwyYajtbayfPp55tSayuDVU6PfY5gzvRSj80UvxdXEJOVPnUVajaOp7NgXLm+1e2ZDLULmpsU9vDvQw== + version "23.3.10" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-23.3.10.tgz#4897974cc317bf99d4fe6af1efa15957fa9c94de" + integrity sha512-DC8xTuW/6TYgvEg3HEXS7cu9OijFqprVDXXiOcdOKZCU/5PJNLZU37VVvmZHdtMiGOa8wAA/We+JzbdxFzQTRQ== "@types/jschannel@^1.0.0": version "1.0.1" @@ -457,9 +463,9 @@ integrity sha512-Jn2cF8X6RAMiSmJaATGjf2r3GzIfpZQpvnQhKprQ5sAbMaNXc7hc9sA2XHdMl3bEMEQhTV79JVW7n4Pgg7sjtg== "@types/node@*", "@types/node@^10.9.2": - version "10.12.8" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.8.tgz#d0a3ab5a6e61458c492304e2776ac136b81db927" - integrity sha512-INamyRZG4rW3lDCUmwVd5Xho/bXvQm/v1yP8V0UN1RuInU7RoWoaO570b+yLX4Ia/0szsx1wa8VzcsVlsvbWLA== + version "10.12.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.12.tgz#e15a9d034d9210f00320ef718a50c4a799417c47" + integrity sha512-Pr+6JRiKkfsFvmU/LK68oBRCQeEg36TyAbPhc2xpez24OOZZCuoIhWGTd39VZy6nGafSbxzGouFPTFD/rR1A0A== "@types/node@^6.0.46": version "6.14.2" @@ -532,6 +538,15 @@ url-toolkit "^2.1.3" video.js "^6.8.0 || ^7.0.0" +"@webassemblyjs/ast@1.7.10": + version "1.7.10" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.10.tgz#0cfc61d61286240b72fc522cb755613699eea40a" + integrity sha512-wTUeaByYN2EA6qVqhbgavtGc7fLTOx0glG2IBsFlrFG51uXIGlYBTyIZMf4SPLo3v1bgV/7lBN3l7Z0R6Hswew== + dependencies: + "@webassemblyjs/helper-module-context" "1.7.10" + "@webassemblyjs/helper-wasm-bytecode" "1.7.10" + "@webassemblyjs/wast-parser" "1.7.10" + "@webassemblyjs/ast@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace" @@ -541,45 +556,42 @@ "@webassemblyjs/helper-wasm-bytecode" "1.7.11" "@webassemblyjs/wast-parser" "1.7.11" -"@webassemblyjs/ast@1.7.6": - version "1.7.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.6.tgz#3ef8c45b3e5e943a153a05281317474fef63e21e" - integrity sha512-8nkZS48EVsMUU0v6F1LCIOw4RYWLm2plMtbhFTjNgeXmsTNLuU3xTRtnljt9BFQB+iPbLRobkNrCWftWnNC7wQ== - dependencies: - "@webassemblyjs/helper-module-context" "1.7.6" - "@webassemblyjs/helper-wasm-bytecode" "1.7.6" - "@webassemblyjs/wast-parser" "1.7.6" - mamacro "^0.0.3" +"@webassemblyjs/floating-point-hex-parser@1.7.10": + version "1.7.10" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.10.tgz#ee63d729c6311a85863e369a473f9983f984e4d9" + integrity sha512-gMsGbI6I3p/P1xL2UxqhNh1ga2HCsx5VBB2i5VvJFAaqAjd2PBTRULc3BpTydabUQEGlaZCzEUQhLoLG7TvEYQ== "@webassemblyjs/floating-point-hex-parser@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313" integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg== -"@webassemblyjs/floating-point-hex-parser@1.7.6": - version "1.7.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.6.tgz#7cb37d51a05c3fe09b464ae7e711d1ab3837801f" - integrity sha512-VBOZvaOyBSkPZdIt5VBMg3vPWxouuM13dPXGWI1cBh3oFLNcFJ8s9YA7S9l4mPI7+Q950QqOmqj06oa83hNWBA== +"@webassemblyjs/helper-api-error@1.7.10": + version "1.7.10" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.10.tgz#bfcb3bbe59775357475790a2ad7b289f09b2f198" + integrity sha512-DoYRlPWtuw3yd5BOr9XhtrmB6X1enYF0/54yNvQWGXZEPDF5PJVNI7zQ7gkcKfTESzp8bIBWailaFXEK/jjCsw== "@webassemblyjs/helper-api-error@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a" integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg== -"@webassemblyjs/helper-api-error@1.7.6": - version "1.7.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.6.tgz#99b7e30e66f550a2638299a109dda84a622070ef" - integrity sha512-SCzhcQWHXfrfMSKcj8zHg1/kL9kb3aa5TN4plc/EREOs5Xop0ci5bdVBApbk2yfVi8aL+Ly4Qpp3/TRAUInjrg== +"@webassemblyjs/helper-buffer@1.7.10": + version "1.7.10" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.10.tgz#0a8c624c67ad0b214d2e003859921a1988cb151b" + integrity sha512-+RMU3dt/dPh4EpVX4u5jxsOlw22tp3zjqE0m3ftU2tsYxnPULb4cyHlgaNd2KoWuwasCQqn8Mhr+TTdbtj3LlA== "@webassemblyjs/helper-buffer@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b" integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w== -"@webassemblyjs/helper-buffer@1.7.6": - version "1.7.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.6.tgz#ba0648be12bbe560c25c997e175c2018df39ca3e" - integrity sha512-1/gW5NaGsEOZ02fjnFiU8/OEEXU1uVbv2um0pQ9YVL3IHSkyk6xOwokzyqqO1qDZQUAllb+V8irtClPWntbVqw== +"@webassemblyjs/helper-code-frame@1.7.10": + version "1.7.10" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.10.tgz#0ab7e22fad0241a173178c73976fc0edf50832ce" + integrity sha512-UiytbpKAULOEab2hUZK2ywXen4gWJVrgxtwY3Kn+eZaaSWaRM8z/7dAXRSoamhKFiBh1uaqxzE/XD9BLlug3gw== + dependencies: + "@webassemblyjs/wast-printer" "1.7.10" "@webassemblyjs/helper-code-frame@1.7.11": version "1.7.11" @@ -588,44 +600,45 @@ dependencies: "@webassemblyjs/wast-printer" "1.7.11" -"@webassemblyjs/helper-code-frame@1.7.6": - version "1.7.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.6.tgz#5a94d21b0057b69a7403fca0c253c3aaca95b1a5" - integrity sha512-+suMJOkSn9+vEvDvgyWyrJo5vJsWSDXZmJAjtoUq4zS4eqHyXImpktvHOZwXp1XQjO5H+YQwsBgqTQEc0J/5zg== - dependencies: - "@webassemblyjs/wast-printer" "1.7.6" +"@webassemblyjs/helper-fsm@1.7.10": + version "1.7.10" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.10.tgz#0915e7713fbbb735620a9d3e4fa3d7951f97ac64" + integrity sha512-w2vDtUK9xeSRtt5+RnnlRCI7wHEvLjF0XdnxJpgx+LJOvklTZPqWkuy/NhwHSLP19sm9H8dWxKeReMR7sCkGZA== "@webassemblyjs/helper-fsm@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181" integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A== -"@webassemblyjs/helper-fsm@1.7.6": - version "1.7.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.6.tgz#ae1741c6f6121213c7a0b587fb964fac492d3e49" - integrity sha512-HCS6KN3wgxUihGBW7WFzEC/o8Eyvk0d56uazusnxXthDPnkWiMv+kGi9xXswL2cvfYfeK5yiM17z2K5BVlwypw== +"@webassemblyjs/helper-module-context@1.7.10": + version "1.7.10" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.10.tgz#9beb83f72740f5ac8075313b5cac5e796510f755" + integrity sha512-yE5x/LzZ3XdPdREmJijxzfrf+BDRewvO0zl8kvORgSWmxpRrkqY39KZSq6TSgIWBxkK4SrzlS3BsMCv2s1FpsQ== "@webassemblyjs/helper-module-context@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209" integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg== -"@webassemblyjs/helper-module-context@1.7.6": - version "1.7.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.6.tgz#116d19a51a6cebc8900ad53ca34ff8269c668c23" - integrity sha512-e8/6GbY7OjLM+6OsN7f2krC2qYVNaSr0B0oe4lWdmq5sL++8dYDD1TFbD1TdAdWMRTYNr/Qq7ovXWzia2EbSjw== - dependencies: - mamacro "^0.0.3" +"@webassemblyjs/helper-wasm-bytecode@1.7.10": + version "1.7.10" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.10.tgz#797b1e734bbcfdea8399669cdc58308ef1c7ffc0" + integrity sha512-u5qy4SJ/OrxKxZqJ9N3qH4ZQgHaAzsopsYwLvoWJY6Q33r8PhT3VPyNMaJ7ZFoqzBnZlCcS/0f4Sp8WBxylXfg== "@webassemblyjs/helper-wasm-bytecode@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06" integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ== -"@webassemblyjs/helper-wasm-bytecode@1.7.6": - version "1.7.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.6.tgz#98e515eaee611aa6834eb5f6a7f8f5b29fefb6f1" - integrity sha512-PzYFCb7RjjSdAOljyvLWVqd6adAOabJW+8yRT+NWhXuf1nNZWH+igFZCUK9k7Cx7CsBbzIfXjJc7u56zZgFj9Q== +"@webassemblyjs/helper-wasm-section@1.7.10": + version "1.7.10" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.10.tgz#c0ea3703c615d7bc3e3507c3b7991c8767b2f20e" + integrity sha512-Ecvww6sCkcjatcyctUrn22neSJHLN/TTzolMGG/N7S9rpbsTZ8c6Bl98GpSpV77EvzNijiNRHBG0+JO99qKz6g== + dependencies: + "@webassemblyjs/ast" "1.7.10" + "@webassemblyjs/helper-buffer" "1.7.10" + "@webassemblyjs/helper-wasm-bytecode" "1.7.10" + "@webassemblyjs/wasm-gen" "1.7.10" "@webassemblyjs/helper-wasm-section@1.7.11": version "1.7.11" @@ -637,15 +650,12 @@ "@webassemblyjs/helper-wasm-bytecode" "1.7.11" "@webassemblyjs/wasm-gen" "1.7.11" -"@webassemblyjs/helper-wasm-section@1.7.6": - version "1.7.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.6.tgz#783835867bdd686df7a95377ab64f51a275e8333" - integrity sha512-3GS628ppDPSuwcYlQ7cDCGr4W2n9c4hLzvnRKeuz+lGsJSmc/ADVoYpm1ts2vlB1tGHkjtQMni+yu8mHoMlKlA== +"@webassemblyjs/ieee754@1.7.10": + version "1.7.10" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.10.tgz#62c1728b7ef0f66ef8221e2966a0afd75db430df" + integrity sha512-HRcWcY+YWt4+s/CvQn+vnSPfRaD4KkuzQFt5MNaELXXHSjelHlSEA8ZcqT69q0GTIuLWZ6JaoKar4yWHVpZHsQ== dependencies: - "@webassemblyjs/ast" "1.7.6" - "@webassemblyjs/helper-buffer" "1.7.6" - "@webassemblyjs/helper-wasm-bytecode" "1.7.6" - "@webassemblyjs/wasm-gen" "1.7.6" + "@xtuc/ieee754" "^1.2.0" "@webassemblyjs/ieee754@1.7.11": version "1.7.11" @@ -654,12 +664,12 @@ dependencies: "@xtuc/ieee754" "^1.2.0" -"@webassemblyjs/ieee754@1.7.6": - version "1.7.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.6.tgz#c34fc058f2f831fae0632a8bb9803cf2d3462eb1" - integrity sha512-V4cIp0ruyw+hawUHwQLn6o2mFEw4t50tk530oKsYXQhEzKR+xNGDxs/SFFuyTO7X3NzEu4usA3w5jzhl2RYyzQ== +"@webassemblyjs/leb128@1.7.10": + version "1.7.10" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.10.tgz#167e0bb4b06d7701585772a73fba9f4df85439f6" + integrity sha512-og8MciYlA8hvzCLR71hCuZKPbVBfLQeHv7ImKZ4nlyxrYbG7uJHYtHiHu6OV9SqrGuD03H/HtXC4Bgdjfm9FHw== dependencies: - "@xtuc/ieee754" "^1.2.0" + "@xtuc/long" "4.2.1" "@webassemblyjs/leb128@1.7.11": version "1.7.11" @@ -668,22 +678,29 @@ dependencies: "@xtuc/long" "4.2.1" -"@webassemblyjs/leb128@1.7.6": - version "1.7.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.6.tgz#197f75376a29f6ed6ace15898a310d871d92f03b" - integrity sha512-ojdlG8WpM394lBow4ncTGJoIVZ4aAtNOWHhfAM7m7zprmkVcKK+2kK5YJ9Bmj6/ketTtOn7wGSHCtMt+LzqgYQ== - dependencies: - "@xtuc/long" "4.2.1" +"@webassemblyjs/utf8@1.7.10": + version "1.7.10" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.10.tgz#b6728f5b6f50364abc155be029f9670e6685605a" + integrity sha512-Ng6Pxv6siyZp635xCSnH3mKmIFgqWPCcGdoo0GBYgyGdxu7cUj4agV7Uu1a8REP66UYUFXJLudeGgd4RvuJAnQ== "@webassemblyjs/utf8@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82" integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA== -"@webassemblyjs/utf8@1.7.6": - version "1.7.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.6.tgz#eb62c66f906af2be70de0302e29055d25188797d" - integrity sha512-oId+tLxQ+AeDC34ELRYNSqJRaScB0TClUU6KQfpB8rNT6oelYlz8axsPhf6yPTg7PBJ/Z5WcXmUYiHEWgbbHJw== +"@webassemblyjs/wasm-edit@1.7.10": + version "1.7.10" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.10.tgz#83fe3140f5a58f5a30b914702be9f0e59a399092" + integrity sha512-e9RZFQlb+ZuYcKRcW9yl+mqX/Ycj9+3/+ppDI8nEE/NCY6FoK8f3dKBcfubYV/HZn44b+ND4hjh+4BYBt+sDnA== + dependencies: + "@webassemblyjs/ast" "1.7.10" + "@webassemblyjs/helper-buffer" "1.7.10" + "@webassemblyjs/helper-wasm-bytecode" "1.7.10" + "@webassemblyjs/helper-wasm-section" "1.7.10" + "@webassemblyjs/wasm-gen" "1.7.10" + "@webassemblyjs/wasm-opt" "1.7.10" + "@webassemblyjs/wasm-parser" "1.7.10" + "@webassemblyjs/wast-printer" "1.7.10" "@webassemblyjs/wasm-edit@1.7.11": version "1.7.11" @@ -699,19 +716,16 @@ "@webassemblyjs/wasm-parser" "1.7.11" "@webassemblyjs/wast-printer" "1.7.11" -"@webassemblyjs/wasm-edit@1.7.6": - version "1.7.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.6.tgz#fa41929160cd7d676d4c28ecef420eed5b3733c5" - integrity sha512-pTNjLO3o41v/Vz9VFLl+I3YLImpCSpodFW77pNoH4agn5I6GgSxXHXtvWDTvYJFty0jSeXZWLEmbaSIRUDlekg== +"@webassemblyjs/wasm-gen@1.7.10": + version "1.7.10" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.10.tgz#4de003806ae29c97ab3707782469b53299570174" + integrity sha512-M0lb6cO2Y0PzDye/L39PqwV+jvO+2YxEG5ax+7dgq7EwXdAlpOMx1jxyXJTScQoeTpzOPIb+fLgX/IkLF8h2yw== dependencies: - "@webassemblyjs/ast" "1.7.6" - "@webassemblyjs/helper-buffer" "1.7.6" - "@webassemblyjs/helper-wasm-bytecode" "1.7.6" - "@webassemblyjs/helper-wasm-section" "1.7.6" - "@webassemblyjs/wasm-gen" "1.7.6" - "@webassemblyjs/wasm-opt" "1.7.6" - "@webassemblyjs/wasm-parser" "1.7.6" - "@webassemblyjs/wast-printer" "1.7.6" + "@webassemblyjs/ast" "1.7.10" + "@webassemblyjs/helper-wasm-bytecode" "1.7.10" + "@webassemblyjs/ieee754" "1.7.10" + "@webassemblyjs/leb128" "1.7.10" + "@webassemblyjs/utf8" "1.7.10" "@webassemblyjs/wasm-gen@1.7.11": version "1.7.11" @@ -724,16 +738,15 @@ "@webassemblyjs/leb128" "1.7.11" "@webassemblyjs/utf8" "1.7.11" -"@webassemblyjs/wasm-gen@1.7.6": - version "1.7.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.6.tgz#695ac38861ab3d72bf763c8c75e5f087ffabc322" - integrity sha512-mQvFJVumtmRKEUXMohwn8nSrtjJJl6oXwF3FotC5t6e2hlKMh8sIaW03Sck2MDzw9xPogZD7tdP5kjPlbH9EcQ== +"@webassemblyjs/wasm-opt@1.7.10": + version "1.7.10" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.10.tgz#d151e31611934a556c82789fdeec41a814993c2a" + integrity sha512-R66IHGCdicgF5ZliN10yn5HaC7vwYAqrSVJGjtJJQp5+QNPBye6heWdVH/at40uh0uoaDN/UVUfXK0gvuUqtVg== dependencies: - "@webassemblyjs/ast" "1.7.6" - "@webassemblyjs/helper-wasm-bytecode" "1.7.6" - "@webassemblyjs/ieee754" "1.7.6" - "@webassemblyjs/leb128" "1.7.6" - "@webassemblyjs/utf8" "1.7.6" + "@webassemblyjs/ast" "1.7.10" + "@webassemblyjs/helper-buffer" "1.7.10" + "@webassemblyjs/wasm-gen" "1.7.10" + "@webassemblyjs/wasm-parser" "1.7.10" "@webassemblyjs/wasm-opt@1.7.11": version "1.7.11" @@ -745,15 +758,17 @@ "@webassemblyjs/wasm-gen" "1.7.11" "@webassemblyjs/wasm-parser" "1.7.11" -"@webassemblyjs/wasm-opt@1.7.6": - version "1.7.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.6.tgz#fbafa78e27e1a75ab759a4b658ff3d50b4636c21" - integrity sha512-go44K90fSIsDwRgtHhX14VtbdDPdK2sZQtZqUcMRvTojdozj5tLI0VVJAzLCfz51NOkFXezPeVTAYFqrZ6rI8Q== +"@webassemblyjs/wasm-parser@1.7.10": + version "1.7.10" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.10.tgz#0367be7bf8f09e3e6abc95f8e483b9206487ec65" + integrity sha512-AEv8mkXVK63n/iDR3T693EzoGPnNAwKwT3iHmKJNBrrALAhhEjuPzo/lTE4U7LquEwyvg5nneSNdTdgrBaGJcA== dependencies: - "@webassemblyjs/ast" "1.7.6" - "@webassemblyjs/helper-buffer" "1.7.6" - "@webassemblyjs/wasm-gen" "1.7.6" - "@webassemblyjs/wasm-parser" "1.7.6" + "@webassemblyjs/ast" "1.7.10" + "@webassemblyjs/helper-api-error" "1.7.10" + "@webassemblyjs/helper-wasm-bytecode" "1.7.10" + "@webassemblyjs/ieee754" "1.7.10" + "@webassemblyjs/leb128" "1.7.10" + "@webassemblyjs/utf8" "1.7.10" "@webassemblyjs/wasm-parser@1.7.11": version "1.7.11" @@ -767,17 +782,17 @@ "@webassemblyjs/leb128" "1.7.11" "@webassemblyjs/utf8" "1.7.11" -"@webassemblyjs/wasm-parser@1.7.6": - version "1.7.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.6.tgz#84eafeeff405ad6f4c4b5777d6a28ae54eed51fe" - integrity sha512-t1T6TfwNY85pDA/HWPA8kB9xA4sp9ajlRg5W7EKikqrynTyFo+/qDzIpvdkOkOGjlS6d4n4SX59SPuIayR22Yg== +"@webassemblyjs/wast-parser@1.7.10": + version "1.7.10" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.10.tgz#058f598b52f730b23fc874d4775b6286b6247264" + integrity sha512-YTPEtOBljkCL0VjDp4sHe22dAYSm3ZwdJ9+2NTGdtC7ayNvuip1wAhaAS8Zt9Q6SW9E5Jf5PX7YE3XWlrzR9cw== dependencies: - "@webassemblyjs/ast" "1.7.6" - "@webassemblyjs/helper-api-error" "1.7.6" - "@webassemblyjs/helper-wasm-bytecode" "1.7.6" - "@webassemblyjs/ieee754" "1.7.6" - "@webassemblyjs/leb128" "1.7.6" - "@webassemblyjs/utf8" "1.7.6" + "@webassemblyjs/ast" "1.7.10" + "@webassemblyjs/floating-point-hex-parser" "1.7.10" + "@webassemblyjs/helper-api-error" "1.7.10" + "@webassemblyjs/helper-code-frame" "1.7.10" + "@webassemblyjs/helper-fsm" "1.7.10" + "@xtuc/long" "4.2.1" "@webassemblyjs/wast-parser@1.7.11": version "1.7.11" @@ -791,18 +806,14 @@ "@webassemblyjs/helper-fsm" "1.7.11" "@xtuc/long" "4.2.1" -"@webassemblyjs/wast-parser@1.7.6": - version "1.7.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.6.tgz#ca4d20b1516e017c91981773bd7e819d6bd9c6a7" - integrity sha512-1MaWTErN0ziOsNUlLdvwS+NS1QWuI/kgJaAGAMHX8+fMJFgOJDmN/xsG4h/A1Gtf/tz5VyXQciaqHZqp2q0vfg== +"@webassemblyjs/wast-printer@1.7.10": + version "1.7.10" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.10.tgz#d817909d2450ae96c66b7607624d98a33b84223b" + integrity sha512-mJ3QKWtCchL1vhU/kZlJnLPuQZnlDOdZsyP0bbLWPGdYsQDnSBvyTLhzwBA3QAMlzEL9V4JHygEmK6/OTEyytA== dependencies: - "@webassemblyjs/ast" "1.7.6" - "@webassemblyjs/floating-point-hex-parser" "1.7.6" - "@webassemblyjs/helper-api-error" "1.7.6" - "@webassemblyjs/helper-code-frame" "1.7.6" - "@webassemblyjs/helper-fsm" "1.7.6" + "@webassemblyjs/ast" "1.7.10" + "@webassemblyjs/wast-parser" "1.7.10" "@xtuc/long" "4.2.1" - mamacro "^0.0.3" "@webassemblyjs/wast-printer@1.7.11": version "1.7.11" @@ -813,15 +824,6 @@ "@webassemblyjs/wast-parser" "1.7.11" "@xtuc/long" "4.2.1" -"@webassemblyjs/wast-printer@1.7.6": - version "1.7.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.6.tgz#a6002c526ac5fa230fe2c6d2f1bdbf4aead43a5e" - integrity sha512-vHdHSK1tOetvDcl1IV1OdDeGNe/NDDQ+KzuZHMtqTVP1xO/tZ/IKNpj5BaGk1OYFdsDWQqb31PIwdEyPntOWRQ== - dependencies: - "@webassemblyjs/ast" "1.7.6" - "@webassemblyjs/wast-parser" "1.7.6" - "@xtuc/long" "4.2.1" - "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -832,6 +834,19 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8" integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g== +"@yarnpkg/lockfile@1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" + integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== + +JSONStream@^1.3.4: + version "1.3.5" + resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" + integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== + dependencies: + jsonparse "^1.2.0" + through ">=2.2.7 <3" + abab@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f" @@ -909,13 +924,20 @@ after@0.8.2: resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= -agent-base@^4.1.0: +agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0: version "4.2.1" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9" integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg== dependencies: es6-promisify "^5.0.0" +agentkeepalive@^3.4.1: + version "3.5.2" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67" + integrity sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ== + dependencies: + humanize-ms "^1.2.1" + ajv-errors@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59" @@ -944,7 +966,7 @@ ajv@^4.11.2: co "^4.6.0" json-stable-stringify "^1.0.1" -ajv@^5.0.0, ajv@^5.1.0: +ajv@^5.0.0: version "5.5.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU= @@ -955,9 +977,9 @@ ajv@^5.0.0, ajv@^5.1.0: json-schema-traverse "^0.3.0" ajv@^6.1.0, ajv@^6.5.5: - version "6.5.5" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.5.tgz#cf97cdade71c6399a92c6d6c4177381291b781a1" - integrity sha512-7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg== + version "6.6.1" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.1.tgz#6360f5ed0d80f232cc2b294c362d5dc2e538dd61" + integrity sha512-ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww== dependencies: fast-deep-equal "^2.0.1" fast-json-stable-stringify "^2.0.0" @@ -983,9 +1005,9 @@ angular2-notifications@^1.0.2: integrity sha512-DjazfwXtLY8BNXKIEw1oEEMy7G6fmldpzP1FYwyVGUwEtZPLQyYGu9MQYCjtVlZMljxpa3qvnv8l9ZUfXAarNA== ansi-colors@^3.0.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.1.tgz#9638047e4213f3428a11944a7d4b31cba0a3ff95" - integrity sha512-Xt+zb6nqgvV9SWAVp0EG3lRsHcbq5DDgqjPPz6pwgtj6RKz65zGXMNa82oJfOSBA/to6GmRP7Dr+6o+kbApTzQ== + version "3.2.2" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.2.tgz#e49349137dbeb6d381b91e607c189915e53265ba" + integrity sha512-kJmcp4PrviBBEx95fC3dYRiC/QSN3EBd0GU1XoNEk/IuUa92rsB6o90zP3w5VAyNznR38Vkc9i8vk5zK6T7TxA== ansi-escapes@^3.0.0: version "3.1.0" @@ -1112,9 +1134,9 @@ array-flatten@1.1.1: integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= array-flatten@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296" - integrity sha1-Qmu52oQJDBg42BLIFQryCoMx4pY= + version "2.1.2" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" + integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== array-slice@^0.2.3: version "0.2.3" @@ -1238,17 +1260,17 @@ atob@^2.1.1: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autoprefixer@9.1.5: - version "9.1.5" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.1.5.tgz#8675fd8d1c0d43069f3b19a2c316f3524e4f6671" - integrity sha512-kk4Zb6RUc58ld7gdosERHMF3DzIYJc2fp5sX46qEsGXQQy5bXsu8qyLjoxuY1NuQ/cJuCYnx99BfjwnRggrYIw== +autoprefixer@9.3.1: + version "9.3.1" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.3.1.tgz#71b622174de2b783d5fd99f9ad617b7a3c78443e" + integrity sha512-DY9gOh8z3tnCbJ13JIWaeQsoYncTGdsrgCceBaQSIL4nvdrLxgbRSBPevg2XbX7u4QCSfLheSJEEIUUSlkbx6Q== dependencies: - browserslist "^4.1.0" - caniuse-lite "^1.0.30000884" + browserslist "^4.3.3" + caniuse-lite "^1.0.30000898" normalize-range "^0.1.2" num2fraction "^1.2.2" - postcss "^7.0.2" - postcss-value-parser "^3.2.3" + postcss "^7.0.5" + postcss-value-parser "^3.3.1" awesome-typescript-loader@5.2.1: version "5.2.1" @@ -1269,7 +1291,7 @@ aws-sign2@~0.7.0: resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= -aws4@^1.6.0, aws4@^1.8.0: +aws4@^1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== @@ -1631,7 +1653,7 @@ blocking-proxy@^1.0.0: dependencies: minimist "^1.2.0" -bluebird@^3.3.0, bluebird@^3.5.1: +bluebird@^3.3.0, bluebird@^3.5.1, bluebird@^3.5.2: version "3.5.3" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7" integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw== @@ -1800,14 +1822,14 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.1.0: - version "4.3.4" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.4.tgz#4477b737db6a1b07077275b24791e680d4300425" - integrity sha512-u5iz+ijIMUlmV8blX82VGFrB9ecnUg5qEt55CMZ/YJEhha+d8qpBfOFuutJ6F/VKRXjZoD33b6uvarpPxcl3RA== +browserslist@^4.3.3: + version "4.3.5" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.5.tgz#1a917678acc07b55606748ea1adf9846ea8920f7" + integrity sha512-z9ZhGc3d9e/sJ9dIx5NFXkKoaiQTnrvrMsN3R1fGb1tkWWNSz12UewJn9TNxGo1l7J23h0MRaPmk7jfeTZYs1w== dependencies: - caniuse-lite "^1.0.30000899" - electron-to-chromium "^1.3.82" - node-releases "^1.0.1" + caniuse-lite "^1.0.30000912" + electron-to-chromium "^1.3.86" + node-releases "^1.0.5" browserstack@^1.5.1: version "1.5.1" @@ -1931,7 +1953,7 @@ cacache@^10.0.4: unique-filename "^1.1.0" y18n "^4.0.0" -cacache@^11.0.2: +cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0: version "11.3.1" resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.1.tgz#d09d25f6c4aca7a6d305d141ae332613aa1d515f" integrity sha512-2PEw4cRRDu+iQvBTTuttQifacYjLPhET+SYO/gEFMy8uhi+jlJREDAjSF5FWSdV/Aw5h18caHA7vMTw2c+wDzA== @@ -2014,10 +2036,15 @@ camelcase@^4.1.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= -caniuse-lite@^1.0.30000884, caniuse-lite@^1.0.30000899: - version "1.0.30000907" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000907.tgz#0b9899bde53fb1c30e214fb12402361e02ff5c42" - integrity sha512-No5sQ/OB2Nmka8MNOOM6nJx+Hxt6MQ6h7t7kgJFu9oTuwjykyKRSBP/+i/QAyFHxeHB+ddE0Da1CG5ihx9oehQ== +camelcase@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42" + integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA== + +caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000912: + version "1.0.30000914" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000914.tgz#f802b4667c24d0255f54a95818dcf8e1aa41f624" + integrity sha512-qqj0CL1xANgg6iDOybiPTIxtsmAnfIky9mBC35qgWrnK4WwmhqfpmkDYMYgwXJ8LRZ3/2jXlCntulO8mBaAgSg== canonical-path@1.0.0: version "1.0.0" @@ -2276,7 +2303,7 @@ combine-lists@^1.0.0: dependencies: lodash "^4.5.0" -combined-stream@^1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6: +combined-stream@^1.0.6, combined-stream@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828" integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w== @@ -2355,7 +2382,7 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -concat-stream@^1.5.0, concat-stream@^1.5.2: +concat-stream@^1.5.0: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== @@ -2622,6 +2649,14 @@ css-selector-tokenizer@^0.7.0: fastparse "^1.1.1" regexpu-core "^1.0.0" +css-tree@^1.0.0-alpha.29: + version "1.0.0-alpha.29" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.29.tgz#3fa9d4ef3142cbd1c301e7664c1f352bd82f5a39" + integrity sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg== + dependencies: + mdn-data "~1.1.0" + source-map "^0.5.3" + css-what@2.1: version "2.1.2" resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.2.tgz#c0876d9d0480927d7d4920dcd72af3595649554d" @@ -2718,28 +2753,28 @@ debug@*, debug@^4.0.1, debug@^4.1.0: dependencies: ms "^2.1.1" -debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9: +debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" -debug@=3.1.0, debug@~3.1.0: +debug@3.1.0, debug@=3.1.0, debug@~3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== dependencies: ms "2.0.0" -debug@^3.1.0: +debug@^3.1.0, debug@^3.2.5: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== dependencies: ms "^2.1.1" -decamelize@^1.1.1, decamelize@^1.1.2: +decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= @@ -3106,10 +3141,10 @@ ejs@^2.6.1: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0" integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ== -electron-to-chromium@^1.3.82: - version "1.3.84" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.84.tgz#2e55df59e818f150a9f61b53471ebf4f0feecc65" - integrity sha512-IYhbzJYOopiTaNWMBp7RjbecUBsbnbDneOP86f3qvS0G0xfzwNSvMJpTrvi5/Y1gU7tg2NAgeg8a8rCYvW9Whw== +electron-to-chromium@^1.3.86: + version "1.3.88" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.88.tgz#f36ab32634f49ef2b0fdc1e82e2d1cc17feb29e7" + integrity sha512-UPV4NuQMKeUh1S0OWRvwg0PI8ASHN9kBC8yDTk1ROXLC85W5GnhTRu/MZu3Teqx3JjlQYuckuHYXSUSgtb3J+A== elliptic@^6.0.0: version "6.4.1" @@ -3134,6 +3169,13 @@ encodeurl@~1.0.1, encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= +encoding@^0.1.11: + version "0.1.12" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb" + integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s= + dependencies: + iconv-lite "~0.4.13" + end-of-stream@^1.0.0, end-of-stream@^1.1.0: version "1.4.1" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" @@ -3200,6 +3242,11 @@ entities@^1.1.1, entities@~1.1.1: resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== +err-code@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960" + integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA= + errno@^0.1.1, errno@^0.1.3, errno@~0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" @@ -3384,12 +3431,12 @@ events@^1.0.0: resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ= -eventsource@0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232" - integrity sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI= +eventsource@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0" + integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ== dependencies: - original ">=0.0.5" + original "^1.0.0" evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: version "1.0.3" @@ -3544,7 +3591,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2: assign-symbols "^1.0.0" is-extendable "^1.0.1" -extend@^3.0.0, extend@~3.0.1, extend@~3.0.2: +extend@^3.0.0, extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== @@ -3631,7 +3678,7 @@ faye-websocket@^0.10.0: dependencies: websocket-driver ">=0.5.1" -faye-websocket@~0.11.0: +faye-websocket@~0.11.1: version "0.11.1" resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38" integrity sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg= @@ -3645,7 +3692,7 @@ fb-watchman@^2.0.0: dependencies: bser "^2.0.0" -figgy-pudding@^3.1.0, figgy-pudding@^3.5.1: +figgy-pudding@^3.1.0, figgy-pudding@^3.4.1, figgy-pudding@^3.5.1: version "3.5.1" resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790" integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w== @@ -3780,6 +3827,11 @@ find-up@^3.0.0: dependencies: locate-path "^3.0.0" +flatted@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916" + integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg== + flatten@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" @@ -3799,9 +3851,9 @@ focus-visible@^4.1.5: integrity sha512-yo/njtk/BB4Z2euzaZe3CZrg4u5s5uEi7ZwbHBJS2quHx51N0mmcx9nTIiImUGlgy+vf26d0CcQluahBBBL/Fw== follow-redirects@^1.0.0: - version "1.5.9" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.9.tgz#c9ed9d748b814a39535716e531b9196a845d89c6" - integrity sha512-Bh65EZI/RU8nx0wbYF9shkFZlqLP+6WT/5FnA3cE/djNSuKNHJEinGGZgu/cQEkeeb2GdFOgenAmn8qaqYke2w== + version "1.5.10" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a" + integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ== dependencies: debug "=3.1.0" @@ -3841,7 +3893,7 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= -form-data@~2.3.1, form-data@~2.3.2: +form-data@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== @@ -3969,6 +4021,11 @@ gaze@^1.0.0: dependencies: globule "^1.0.0" +genfun@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537" + integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA== + get-browser-rtc@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/get-browser-rtc/-/get-browser-rtc-1.0.2.tgz#bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9" @@ -3994,6 +4051,13 @@ get-stream@^3.0.0: resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= +get-stream@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" + integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== + dependencies: + pump "^3.0.0" + get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" @@ -4053,7 +4117,7 @@ glob@7.1.2: once "^1.3.0" path-is-absolute "^1.0.0" -glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1: +glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1: version "7.1.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ== @@ -4077,9 +4141,9 @@ glob@^5.0.15: path-is-absolute "^1.0.0" global-modules-path@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/global-modules-path/-/global-modules-path-2.3.0.tgz#b0e2bac6beac39745f7db5c59d26a36a0b94f7dc" - integrity sha512-HchvMJNYh9dGSCy8pOQ2O8u/hoXaL+0XhnrwH0RyLiSXMMTl9W3N6KUU73+JFOg5PGjtzl6VZzUQsnrpm7Szag== + version "2.3.1" + resolved "https://registry.yarnpkg.com/global-modules-path/-/global-modules-path-2.3.1.tgz#e541f4c800a1a8514a990477b267ac67525b9931" + integrity sha512-y+shkf4InI7mPRHSo2b/k6ix6+NLDtyccYv86whhxrSGX9wjPX1VMITmrDbE1eh7zkzhiWtW2sHklJYoQ62Cxg== global@4.3.2, global@^4.3.0, global@^4.3.1, global@^4.3.2, global@~4.3.0: version "4.3.2" @@ -4182,14 +4246,6 @@ har-schema@^2.0.0: resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= -har-validator@~5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd" - integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0= - dependencies: - ajv "^5.1.0" - har-schema "^2.0.0" - har-validator@~5.1.0: version "5.1.3" resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" @@ -4284,9 +4340,9 @@ hash-base@^3.0.0: safe-buffer "^5.0.1" hash.js@^1.0.0, hash.js@^1.0.3: - version "1.1.5" - resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.5.tgz#e38ab4b85dfb1e0c40fe9265c0e9b54854c23812" - integrity sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA== + version "1.1.7" + resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42" + integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA== dependencies: inherits "^2.0.3" minimalistic-assert "^1.0.1" @@ -4382,7 +4438,7 @@ html-webpack-plugin@^3.2.0: toposort "^1.0.0" util.promisify "1.0.0" -htmlparser2@^3.9.0: +htmlparser2@^3.10.0: version "3.10.0" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.0.tgz#5f5e422dcf6119c0d983ed36260ce9ded0bee464" integrity sha512-J1nEUGv+MkXS0weHNWVKJJ+UrLfePxRWpN3C9bEi9fLxL2+ggW94DQvgYVXsaT30PGwYRIZKNZXuyMhp3Di4bQ== @@ -4404,6 +4460,11 @@ htmlparser2@~3.3.0: domutils "1.1" readable-stream "1.0" +http-cache-semantics@^3.8.1: + version "3.8.1" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2" + integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w== + http-deceiver@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" @@ -4424,6 +4485,14 @@ http-parser-js@>=0.4.0: resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8" integrity sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w== +http-proxy-agent@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405" + integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg== + dependencies: + agent-base "4" + debug "3.1.0" + http-proxy-middleware@~0.18.0: version "0.18.0" resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab" @@ -4465,6 +4534,13 @@ https-proxy-agent@^2.2.1: agent-base "^4.1.0" debug "^3.1.0" +humanize-ms@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" + integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0= + dependencies: + ms "^2.0.0" + iconv-lite@0.4.23: version "0.4.23" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63" @@ -4472,7 +4548,7 @@ iconv-lite@0.4.23: dependencies: safer-buffer ">= 2.1.2 < 3" -iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: +iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -4603,7 +4679,7 @@ inherits@2.0.1: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= -ini@^1.3.4, ini@~1.3.0: +ini@1.3.5, ini@^1.3.4, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== @@ -5640,7 +5716,7 @@ jsesc@~0.5.0: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= -json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: +json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== @@ -5701,6 +5777,11 @@ jsonify@~0.0.0: resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM= +jsonparse@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" + integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= + jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" @@ -5796,9 +5877,9 @@ karma-source-map-support@1.3.0: source-map-support "^0.5.5" karma@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/karma/-/karma-3.1.1.tgz#94c8edd20fb9597ccde343326da009737fb0423a" - integrity sha512-NetT3wPCQMNB36uiL9LLyhrOt8SQwrEKt0xD3+KpTCfm0VxVyUJdPL5oTq2Ic5ouemgL/Iz4wqXEbF3zea9kQQ== + version "3.1.3" + resolved "https://registry.yarnpkg.com/karma/-/karma-3.1.3.tgz#6e251648e3aff900927bc1126dbcbcb92d3edd61" + integrity sha512-JU4FYUtFEGsLZd6ZJzLrivcPj0TkteBiIRDcXWFsltPMGgZMDtby/MIzNOzgyZv/9dahs9vHpSxerC/ZfeX9Qw== dependencies: bluebird "^3.3.0" body-parser "^1.16.1" @@ -5810,11 +5891,12 @@ karma@^3.0.0: di "^0.0.1" dom-serialize "^2.2.0" expand-braces "^0.1.1" + flatted "^2.0.0" glob "^7.1.1" graceful-fs "^4.1.2" http-proxy "^1.13.0" isbinaryfile "^3.0.0" - lodash "^4.17.4" + lodash "^4.17.5" log4js "^3.0.0" mime "^2.3.1" minimatch "^3.0.2" @@ -5826,7 +5908,7 @@ karma@^3.0.0: socket.io "2.1.1" source-map "^0.6.1" tmp "0.0.33" - useragent "2.2.1" + useragent "2.3.0" killable@^1.0.0: version "1.0.1" @@ -5939,9 +6021,9 @@ lie@~3.1.0: immediate "~3.0.5" linkify-it@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.0.3.tgz#d94a4648f9b1c179d64fa97291268bdb6ce9434f" - integrity sha1-2UpGSPmxwXnWT6lykSaL22zpQ08= + version "2.1.0" + resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.1.0.tgz#c4caf38a6cd7ac2212ef3c7d2bde30a91561f9db" + integrity sha512-4REs8/062kV2DSHxNfq5183zrqXMl7WP0WzABH9IeJI+NLm429FgE1PDecltYfnOoFDFlZGh2T8PfZn0r+GTRg== dependencies: uc.micro "^1.0.1" @@ -6061,7 +6143,7 @@ lodash.isstring@^4.0.1: resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE= -lodash.mergewith@^4.6.0: +lodash.mergewith@^4.6.0, lodash.mergewith@^4.6.1: version "4.6.1" resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927" integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ== @@ -6119,7 +6201,7 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1: dependencies: js-tokens "^3.0.0 || ^4.0.0" -loud-rejection@^1.0.0, loud-rejection@^1.6.0: +loud-rejection@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= @@ -6132,15 +6214,10 @@ lower-case@^1.1.1: resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw= -lru-cache@2.2.x: - version "2.2.4" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d" - integrity sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0= - -lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c" - integrity sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA== +lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3: + version "4.1.5" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" + integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== dependencies: pseudomap "^1.0.2" yallist "^2.1.2" @@ -6184,6 +6261,23 @@ make-error@1.x: resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8" integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g== +make-fetch-happen@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz#141497cb878f243ba93136c83d8aba12c216c083" + integrity sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ== + dependencies: + agentkeepalive "^3.4.1" + cacache "^11.0.1" + http-cache-semantics "^3.8.1" + http-proxy-agent "^2.1.0" + https-proxy-agent "^2.2.1" + lru-cache "^4.1.2" + mississippi "^3.0.0" + node-fetch-npm "^2.0.2" + promise-retry "^1.1.1" + socks-proxy-agent "^4.0.0" + ssri "^6.0.0" + makeerror@1.0.x: version "1.0.11" resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" @@ -6191,11 +6285,6 @@ makeerror@1.0.x: dependencies: tmpl "1.0.x" -mamacro@^0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4" - integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA== - map-age-cleaner@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" @@ -6245,6 +6334,11 @@ md5.js@^1.3.4: inherits "^2.0.1" safe-buffer "^5.1.2" +mdn-data@~1.1.0: + version "1.1.4" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz#50b5d4ffc4575276573c4eedb8780812a8419f01" + integrity sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA== + mdurl@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" @@ -6400,9 +6494,9 @@ mime@^1.4.1: integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== mime@^2.2.0, mime@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369" - integrity sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg== + version "2.4.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6" + integrity sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w== mimic-fn@^1.0.0: version "1.2.0" @@ -6421,10 +6515,10 @@ min-document@^2.19.0: dependencies: dom-walk "^0.1.0" -mini-css-extract-plugin@0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.3.tgz#98d60fcc5d228c3e36a9bd15a1d6816d6580beb8" - integrity sha512-Mxs0nxzF1kxPv4TRi2NimewgXlJqh0rGE30vviCU2WHrpbta6wklnUV9dr9FUtoAHmB3p3LeXEC+ZjgHvB0Dzg== +mini-css-extract-plugin@0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.4.tgz#c10410a004951bd3cedac1da69053940fccb625d" + integrity sha512-o+Jm+ocb0asEngdM6FsZWtZsRzA8koFUudIDwYUfl94M3PejPHG7Vopw5hN9V8WsMkSFpm3tZP3Fesz89EyrfQ== dependencies: loader-utils "^1.1.0" schema-utils "^1.0.0" @@ -6462,7 +6556,7 @@ minimist@~0.0.1: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= -minipass@^2.2.1, minipass@^2.3.4: +minipass@^2.2.1, minipass@^2.3.4, minipass@^2.3.5: version "2.3.5" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848" integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA== @@ -6582,7 +6676,7 @@ ms@2.0.0: resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= -ms@^2.1.1: +ms@^2.0.0, ms@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== @@ -6735,6 +6829,15 @@ no-case@^2.2.0: dependencies: lower-case "^1.1.1" +node-fetch-npm@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7" + integrity sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw== + dependencies: + encoding "^0.1.11" + json-parse-better-errors "^1.0.0" + safe-buffer "^5.1.1" + node-forge@0.7.5: version "0.7.5" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df" @@ -6823,39 +6926,14 @@ node-pre-gyp@^0.10.0: semver "^5.3.0" tar "^4" -node-releases@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.3.tgz#3414ed84595096459c251699bfcb47d88324a9e4" - integrity sha512-ZaZWMsbuDcetpHmYeKWPO6e63pSXLb50M7lJgCbcM2nC/nQC3daNifmtp5a2kp7EWwYfhuvH6zLPWkrF8IiDdw== +node-releases@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.5.tgz#a641adcc968b039a27345d92ef10b093e5cbd41d" + integrity sha512-Ky7q0BO1BBkG/rQz6PkEZ59rwo+aSfhczHP1wwq8IowoVdN/FpiP7qp0XW0P2+BVCWe5fQUBozdbVd54q1RbCQ== dependencies: semver "^5.3.0" -node-sass@4.9.3: - version "4.9.3" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.3.tgz#f407cf3d66f78308bb1e346b24fa428703196224" - integrity sha512-XzXyGjO+84wxyH7fV6IwBOTrEBe2f0a6SBze9QWWYR/cL74AcQUks2AsqcCZenl/Fp/JVbuEaLpgrLtocwBUww== - dependencies: - async-foreach "^0.1.3" - chalk "^1.1.1" - cross-spawn "^3.0.0" - gaze "^1.0.0" - get-stdin "^4.0.1" - glob "^7.0.3" - in-publish "^2.0.0" - lodash.assign "^4.2.0" - lodash.clonedeep "^4.3.2" - lodash.mergewith "^4.6.0" - meow "^3.7.0" - mkdirp "^0.5.1" - nan "^2.10.0" - node-gyp "^3.8.0" - npmlog "^4.0.0" - request "2.87.0" - sass-graph "^2.2.4" - stdout-stream "^1.4.0" - "true-case-path" "^1.0.2" - -node-sass@^4.9.3: +node-sass@4.10.0, node-sass@^4.9.3: version "4.10.0" resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.10.0.tgz#dcc2b364c0913630945ccbf7a2bbf1f926effca4" integrity sha512-fDQJfXszw6vek63Fe/ldkYXmRYK/QS6NbvM3i5oEo9ntPDy4XX7BcKZyTKv+/kSSxRtXXc7l+MSwEmYc0CSy6Q== @@ -6895,7 +6973,7 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" -normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, "normalize-package-data@~1.0.1 || ^2.0.0": +normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw== @@ -6927,7 +7005,7 @@ npm-font-source-sans-pro@^1.0.2: resolved "https://registry.yarnpkg.com/npm-font-source-sans-pro/-/npm-font-source-sans-pro-1.0.2.tgz#c55c8ae368eebdbcaca65425a0d7e1f9a192a03e" integrity sha1-xVyK42juvbysplQloNfh+aGSoD4= -"npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0": +npm-package-arg@^6.0.0, npm-package-arg@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1" integrity sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA== @@ -6937,7 +7015,7 @@ npm-font-source-sans-pro@^1.0.2: semver "^5.5.0" validate-npm-package-name "^3.0.0" -npm-packlist@^1.1.6: +npm-packlist@^1.1.12, npm-packlist@^1.1.6: version "1.1.12" resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a" integrity sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g== @@ -6945,24 +7023,26 @@ npm-packlist@^1.1.6: ignore-walk "^3.0.1" npm-bundled "^1.0.1" -npm-registry-client@8.6.0: - version "8.6.0" - resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-8.6.0.tgz#7f1529f91450732e89f8518e0f21459deea3e4c4" - integrity sha512-Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg== +npm-pick-manifest@^2.1.0: + version "2.2.3" + resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40" + integrity sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA== dependencies: - concat-stream "^1.5.2" - graceful-fs "^4.1.6" - normalize-package-data "~1.0.1 || ^2.0.0" - npm-package-arg "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0" - once "^1.3.3" - request "^2.74.0" - retry "^0.10.0" - safe-buffer "^5.1.1" - semver "2 >=2.2.1 || 3.x || 4 || 5" - slide "^1.1.3" - ssri "^5.2.4" - optionalDependencies: - npmlog "2 || ^3.1.0 || ^4.0.0" + figgy-pudding "^3.5.1" + npm-package-arg "^6.0.0" + semver "^5.4.1" + +npm-registry-fetch@^3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-3.8.0.tgz#aa7d9a7c92aff94f48dba0984bdef4bd131c88cc" + integrity sha512-hrw8UMD+Nob3Kl3h8Z/YjmKamb1gf7D1ZZch2otrIXM3uFLB5vjEY6DhMlq80z/zZet6eETLbOXcuQudCB3Zpw== + dependencies: + JSONStream "^1.3.4" + bluebird "^3.5.1" + figgy-pudding "^3.4.1" + lru-cache "^4.1.3" + make-fetch-happen "^4.0.1" + npm-package-arg "^6.1.0" npm-run-path@^2.0.0: version "2.0.2" @@ -6971,7 +7051,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@^4.0.2: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -7008,11 +7088,6 @@ nwsapi@^2.0.7: resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.9.tgz#77ac0cdfdcad52b6a1151a84e73254edc33ed016" integrity sha512-nlWFSCTYQcHk/6A9FFnfhKc14c3aFhfdNBXgo8Qgi9QTBu/qg3Ww+Uiz9wMzXd1T8GFxPc2QIHB6Qtf2XFryFQ== -oauth-sign@~0.8.2: - version "0.8.2" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" - integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM= - oauth-sign@~0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" @@ -7152,7 +7227,7 @@ optionator@^0.8.1: type-check "~0.3.2" wordwrap "~1.0.0" -original@>=0.0.5: +original@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f" integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg== @@ -7272,10 +7347,43 @@ package-json-versionify@^1.0.2: dependencies: browserify-package-json "^1.0.0" +pacote@9.1.1: + version "9.1.1" + resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.1.1.tgz#25091f75a25021de8be8d34cc6408728fca3579b" + integrity sha512-f28Rq5ozzKAA9YwIKw61/ipwAatUZseYmVssDbHHaexF0wRIVotapVEZPAjOT7Eu3LYVqEp0NVpNizoAnYBUaA== + dependencies: + bluebird "^3.5.2" + cacache "^11.2.0" + figgy-pudding "^3.5.1" + get-stream "^4.1.0" + glob "^7.1.3" + lru-cache "^4.1.3" + make-fetch-happen "^4.0.1" + minimatch "^3.0.4" + minipass "^2.3.5" + mississippi "^3.0.0" + mkdirp "^0.5.1" + normalize-package-data "^2.4.0" + npm-package-arg "^6.1.0" + npm-packlist "^1.1.12" + npm-pick-manifest "^2.1.0" + npm-registry-fetch "^3.8.0" + osenv "^0.1.5" + promise-inflight "^1.0.1" + promise-retry "^1.1.1" + protoduck "^5.0.1" + rimraf "^2.6.2" + safe-buffer "^5.1.2" + semver "^5.6.0" + ssri "^6.0.1" + tar "^4.4.6" + unique-filename "^1.1.1" + which "^1.3.1" + pako@~1.0.2, pako@~1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258" - integrity sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg== + version "1.0.7" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.7.tgz#2473439021b57f1516c82f58be7275ad8ef1bb27" + integrity sha512-3HNK5tW4x8o5mO8RuHZp3Ydw9icZXx0RANAOMzlMzx7LVXhMJ4mo3MOBpzyd7r/+RUu8BmndP47LXT+vzjtWcQ== parallel-transform@^1.1.0: version "1.1.0" @@ -7543,9 +7651,9 @@ portfinder@1.0.17: mkdirp "0.5.x" portfinder@^1.0.9: - version "1.0.19" - resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.19.tgz#07e87914a55242dcda5b833d42f018d6875b595f" - integrity sha512-23aeQKW9KgHe6citUrG3r9HjeX6vls0h713TAa+CwTKZwNIr/pD2ApaxYF4Um3ZZyq4ar+Siv3+fhoHaIwSOSw== + version "1.0.20" + resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a" + integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw== dependencies: async "^1.5.2" debug "^2.2.0" @@ -7615,12 +7723,12 @@ postcss-modules-values@^1.3.0: icss-replace-symbols "^1.1.0" postcss "^6.0.1" -postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0: +postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== -postcss@7.0.5, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2: +postcss@7.0.5: version "7.0.5" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.5.tgz#70e6443e36a6d520b0fd4e7593fcca3635ee9f55" integrity sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ== @@ -7629,7 +7737,7 @@ postcss@7.0.5, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2: source-map "^0.6.1" supports-color "^5.5.0" -postcss@^6.0.1, postcss@^6.0.14, postcss@^6.0.23: +postcss@^6.0.1, postcss@^6.0.23: version "6.0.23" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag== @@ -7638,6 +7746,15 @@ postcss@^6.0.1, postcss@^6.0.14, postcss@^6.0.23: source-map "^0.6.1" supports-color "^5.4.0" +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.5: + version "7.0.6" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.6.tgz#6dcaa1e999cdd4a255dcd7d4d9547f4ca010cdc2" + integrity sha512-Nq/rNjnHFcKgCDDZYO0lNsl6YWe6U7tTy+ESN+PnLxebL8uBtYX59HZqvrj7YLK5UCyll2hqDsJOo3ndzEW8Ug== + dependencies: + chalk "^2.4.1" + source-map "^0.6.1" + supports-color "^5.5.0" + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -7664,10 +7781,10 @@ pretty-format@^23.6.0: ansi-regex "^3.0.0" ansi-styles "^3.2.0" -primeng@^6.1.2: - version "6.1.6" - resolved "https://registry.yarnpkg.com/primeng/-/primeng-6.1.6.tgz#3a699a02507fcd5befb2fb9fe18fcc5d385f810e" - integrity sha512-9QYkXfBuSwx5zZej5QiEWhdAFJPc+f9h6PXuFtw4PzUfOhPmnoUxR5K04xeFreCNP13WwP3Uh/U3o7mY0PZtQA== +primeng@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/primeng/-/primeng-7.0.0.tgz#3a189568069a31544c9ed952328e221daad9b9b1" + integrity sha512-PrEEnp0VPbzsUQdpB/4KtUdRxaWwpprHy+IpUi09C42OAI2zqdTVIC0AaW81gDAGQyW7XraCP9EFI8KT4nC9GA== private@^0.1.8, private@~0.1.5: version "0.1.8" @@ -7699,6 +7816,14 @@ promise-inflight@^1.0.1: resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= +promise-retry@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d" + integrity sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0= + dependencies: + err-code "^1.0.0" + retry "^0.10.0" + promise@^7.1.1: version "7.3.1" resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" @@ -7722,6 +7847,13 @@ prop-types@^15.6.2: loose-envify "^1.3.1" object-assign "^4.1.1" +protoduck@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f" + integrity sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg== + dependencies: + genfun "^5.0.0" + protractor@^5.3.2: version "5.4.1" resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.1.tgz#011a99e38df7aa45d22455b889ffbb13a6ce0bd9" @@ -7762,7 +7894,7 @@ pseudomap@^1.0.2: resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= -psl@^1.1.24: +psl@^1.1.24, psl@^1.1.28: version "1.1.29" resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67" integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ== @@ -7814,7 +7946,7 @@ punycode@^1.2.4, punycode@^1.4.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= -punycode@^2.1.0: +punycode@^2.1.0, punycode@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== @@ -7863,7 +7995,7 @@ qrcode@^0.8.2: isarray "^2.0.1" pngjs "^2.3.1" -qs@6.5.2, qs@~6.5.1, qs@~6.5.2: +qs@6.5.2, qs@~6.5.2: version "6.5.2" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== @@ -8241,33 +8373,7 @@ request-promise-native@^1.0.5: stealthy-require "^1.1.0" tough-cookie ">=2.3.3" -request@2.87.0: - version "2.87.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e" - integrity sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw== - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.6.0" - caseless "~0.12.0" - combined-stream "~1.0.5" - extend "~3.0.1" - forever-agent "~0.6.1" - form-data "~2.3.1" - har-validator "~5.0.3" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.17" - oauth-sign "~0.8.2" - performance-now "^2.1.0" - qs "~6.5.1" - safe-buffer "^5.1.1" - tough-cookie "~2.3.3" - tunnel-agent "^0.6.0" - uuid "^3.1.0" - -request@^2.74.0, request@^2.83.0, request@^2.87.0, request@^2.88.0: +request@^2.83.0, request@^2.87.0, request@^2.88.0: version "2.88.0" resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg== @@ -8335,7 +8441,7 @@ resolve@1.1.7, resolve@1.1.x: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2: +resolve@1.x, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2: version "1.8.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26" integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA== @@ -8482,20 +8588,20 @@ sane@^2.0.0: fsevents "^1.2.3" sanitize-html@^1.18.4: - version "1.19.1" - resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.19.1.tgz#e8b33c69578054d6ee4f57ea152d6497f3f6fb7d" - integrity sha512-zNYr6FvBn4bZukr9x2uny6od/9YdjCLwF+FqxivqI0YOt/m9GIxfX+tWhm52tBAPUXiTTb4bJTGVagRz5b06bw== + version "1.19.2" + resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.19.2.tgz#c03fffe2bf96cd582968ece9792cbca32e64dde0" + integrity sha512-7fNb3/N0sZ/nkshMRBoxLz6K1dlMSVF/eQHX1Bof9sRT7cZJvmrDGfXEn544MXJnpY29vux1A599g9UrcHTBXA== dependencies: - chalk "^2.3.0" - htmlparser2 "^3.9.0" + chalk "^2.4.1" + css-tree "^1.0.0-alpha.29" + htmlparser2 "^3.10.0" lodash.clonedeep "^4.5.0" lodash.escaperegexp "^4.1.2" lodash.isplainobject "^4.0.6" lodash.isstring "^4.0.1" - lodash.mergewith "^4.6.0" - postcss "^6.0.14" + lodash.mergewith "^4.6.1" srcset "^1.0.0" - xtend "^4.0.0" + xtend "^4.0.1" sass-graph@^2.2.4: version "2.2.4" @@ -8547,9 +8653,9 @@ sax@>=0.6.0, sax@^1.2.4: integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== scheduler@^0.11.2: - version "0.11.2" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.11.2.tgz#a8db5399d06eba5abac51b705b7151d2319d33d3" - integrity sha512-+WCP3s3wOaW4S7C1tl3TEXp4l9lJn0ZK8G3W3WKRWmw77Z2cIFUW2MiNTMHn5sCjxN+t7N43HAOOgMjyAg5hlg== + version "0.11.3" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.11.3.tgz#b5769b90cf8b1464f3f3cfcafe8e3cd7555a2d6b" + integrity sha512-i9X9VRRVZDd3xZw10NY5Z2cVMbdYg6gqFecfj79USv1CFN+YrJ3gIPRKf1qlY+Sxly4djoKdfx1T+m9dnRB8kQ== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -8622,7 +8728,7 @@ semver-intersect@1.4.0: dependencies: semver "^5.0.0" -"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.3.0, semver@^5.5, semver@^5.5.0: +"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.6.0: version "5.6.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== @@ -8820,10 +8926,10 @@ slash@^1.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU= -slide@^1.1.3: - version "1.1.6" - resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" - integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc= +smart-buffer@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.1.tgz#07ea1ca8d4db24eb4cac86537d7d18995221ace3" + integrity sha512-RFqinRVJVcCAL9Uh1oVqE6FZkqsyLiVOYEZ20TqIOjuX7iFVJ+zsbs4RIghnw/pTs7mZvt8ZHhvm1ZUrR4fykg== snapdragon-node@^2.0.1: version "2.1.1" @@ -8901,17 +9007,17 @@ socket.io@2.1.1: socket.io-client "2.1.1" socket.io-parser "~3.2.0" -sockjs-client@1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.5.tgz#1bb7c0f7222c40f42adf14f4442cbd1269771a83" - integrity sha1-G7fA9yIsQPQq3xT0RCy9Eml3GoM= +sockjs-client@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz#12fc9d6cb663da5739d3dc5fb6e8687da95cb177" + integrity sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg== dependencies: - debug "^2.6.6" - eventsource "0.1.6" - faye-websocket "~0.11.0" - inherits "^2.0.1" + debug "^3.2.5" + eventsource "^1.0.7" + faye-websocket "~0.11.1" + inherits "^2.0.3" json3 "^3.3.2" - url-parse "^1.1.8" + url-parse "^1.4.3" sockjs@0.3.19: version "0.3.19" @@ -8921,6 +9027,22 @@ sockjs@0.3.19: faye-websocket "^0.10.0" uuid "^3.0.1" +socks-proxy-agent@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz#5936bf8b707a993079c6f37db2091821bffa6473" + integrity sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw== + dependencies: + agent-base "~4.2.0" + socks "~2.2.0" + +socks@~2.2.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.2.tgz#f061219fc2d4d332afb4af93e865c84d3fa26e2b" + integrity sha512-g6wjBnnMOZpE0ym6e0uHSddz9p3a+WsBaaYQaBaSCJYvrC4IXykQR9MNGjLQf38e9iIIhp3b1/Zk8YZI3KGJ0Q== + dependencies: + ip "^1.1.5" + smart-buffer "^4.0.1" + source-list-map@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" @@ -9012,9 +9134,9 @@ source-map@~0.2.0: amdefine ">=0.0.4" sourcemap-codec@^1.4.1: - version "1.4.3" - resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.3.tgz#0ba615b73ec35112f63c2f2d9e7c3f87282b0e33" - integrity sha512-vFrY/x/NdsD7Yc8mpTJXuao9S8lq08Z/kOITHz6b7YbfI9xL8Spe5EvSQUHOI7SbpY8bRPr0U3kKSsPuqEGSfA== + version "1.4.4" + resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f" + integrity sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg== spdx-correct@^3.0.0: version "3.0.2" @@ -9067,7 +9189,7 @@ spdy@^3.4.1: select-hose "^2.0.0" spdy-transport "^2.0.18" -speed-measure-webpack-plugin@^1.2.3: +speed-measure-webpack-plugin@1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.2.3.tgz#de170b5cefbfa1c039d95e639edd3ad50cfc7c48" integrity sha512-p+taQ69VkRUXYMoZOx2nxV/Tz8tt79ahctoZJyJDHWP7fEYvwFNf5Pd73k5kZ6auu0pTsPNLEUwWpM8mCk85Zw== @@ -9133,7 +9255,7 @@ ssri@^5.2.4: dependencies: safe-buffer "^5.1.1" -ssri@^6.0.0: +ssri@^6.0.0, ssri@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8" integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA== @@ -9293,10 +9415,10 @@ string2compact@^1.1.1, string2compact@^1.2.5: addr-to-ip-port "^1.0.1" ipaddr.js "^1.0.1" -string_decoder@^1.0.0, string_decoder@^1.1.1, string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== +string_decoder@^1.0.0, string_decoder@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d" + integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w== dependencies: safe-buffer "~5.1.0" @@ -9305,6 +9427,13 @@ string_decoder@~0.10.x: resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" @@ -9348,13 +9477,13 @@ strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= -style-loader@0.23.0: - version "0.23.0" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.0.tgz#8377fefab68416a2e05f1cabd8c3a3acfcce74f1" - integrity sha512-uCcN7XWHkqwGVt7skpInW6IGO1tG6ReyFQ1Cseh0VcN6VdcFQi62aG/2F3Y9ueA8x4IVlfaSUxpmQXQD9QrEuQ== +style-loader@0.23.1: + version "0.23.1" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925" + integrity sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg== dependencies: loader-utils "^1.1.0" - schema-utils "^0.4.5" + schema-utils "^1.0.0" stylus-loader@3.0.2: version "3.0.2" @@ -9407,9 +9536,9 @@ symbol-tree@^3.2.2: integrity sha1-rifbOPZgp64uHDt9G8KQgZuFGeY= tapable@^1.0.0, tapable@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c" - integrity sha512-IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA== + version "1.1.1" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e" + integrity sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA== tar@^2.0.0: version "2.2.1" @@ -9420,7 +9549,7 @@ tar@^2.0.0: fstream "^1.0.2" inherits "2" -tar@^4: +tar@^4, tar@^4.4.6: version "4.4.8" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d" integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ== @@ -9448,9 +9577,9 @@ terser-webpack-plugin@1.1.0, terser-webpack-plugin@^1.1.0: worker-farm "^1.5.2" terser@^3.8.1: - version "3.10.11" - resolved "https://registry.yarnpkg.com/terser/-/terser-3.10.11.tgz#e063da74b194dde9faf0a561f3a438c549d2da3f" - integrity sha512-iruZ7j14oBbRYJC5cP0/vTU7YOWjN+J1ZskEGoF78tFzXdkK2hbCL/3TRZN8XB+MuvFhvOHMp7WkOCBO4VEL5g== + version "3.11.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-3.11.0.tgz#60782893e1f4d6788acc696351f40636d0e37af0" + integrity sha512-5iLMdhEPIq3zFWskpmbzmKwMQixKmTYwY3Ox9pjtSklBLnHiuQ0GKJLhL1HSYtyffHM3/lDIFBnb82m9D7ewwQ== dependencies: commander "~2.17.1" source-map "~0.6.1" @@ -9485,7 +9614,7 @@ through2@^2.0.0: readable-stream "~2.3.6" xtend "~4.0.1" -through@2, through@X.X.X, through@^2.3.6, through@~2.3.6: +through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.6, through@~2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= @@ -9586,7 +9715,15 @@ torrent-piece@^2.0.0: resolved "https://registry.yarnpkg.com/torrent-piece/-/torrent-piece-2.0.0.tgz#6598ae67d93699e887f178db267ba16d89d7ec9b" integrity sha512-H/Z/yCuvZJj1vl1IQHI8dvF2QrUuXRJoptT5DW5967/dsLpXlCg+uyhFR5lfNj5mNaYePUbKtnL+qKWZGXv4Nw== -tough-cookie@>=2.3.3, tough-cookie@^2.3.4, tough-cookie@~2.4.3: +tough-cookie@>=2.3.3, tough-cookie@^2.3.4: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" + integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== + dependencies: + psl "^1.1.28" + punycode "^2.1.1" + +tough-cookie@~2.4.3: version "2.4.3" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ== @@ -9594,13 +9731,6 @@ tough-cookie@>=2.3.3, tough-cookie@^2.3.4, tough-cookie@~2.4.3: psl "^1.1.24" punycode "^1.4.1" -tough-cookie@~2.3.3: - version "2.3.4" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655" - integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA== - dependencies: - punycode "^1.4.1" - tr46@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" @@ -9641,9 +9771,9 @@ tryer@^1.0.0: integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== ts-jest@^23.1.4: - version "23.10.4" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-23.10.4.tgz#a7a953f55c9165bcaa90ff91014a178e87fe0df8" - integrity sha512-oV/wBwGUS7olSk/9yWMiSIJWbz5xO4zhftnY3gwv6s4SMg6WHF1m8XZNBvQOKQRiTAexZ9754Z13dxBq3Zgssw== + version "23.10.5" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-23.10.5.tgz#cdb550df4466a30489bf70ba867615799f388dd5" + integrity sha512-MRCs9qnGoyKgFc8adDEntAOP64fWK1vZKnOYU1o2HxaqjdJvGqmkLCPCnVq1/If4zkUmEjKPnCiUisTrlX2p2A== dependencies: bs-logger "0.x" buffer-from "1.x" @@ -9651,6 +9781,7 @@ ts-jest@^23.1.4: json5 "2.x" make-error "1.x" mkdirp "0.x" + resolve "1.x" semver "^5.5" yargs-parser "10.x" @@ -9721,9 +9852,9 @@ tsutils@^2.27.2: tslib "^1.8.1" tsutils@^3.0.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.5.0.tgz#42602f7df241e753a2105cc3627a664abf11f745" - integrity sha512-/FZ+pEJQixWruFejFxNPRSwg+iF6aw7PYZVRqUscJ7EnzV3zieI8byfZziUR7QjCuJFulq8SEe9JcGflO4ze4Q== + version "3.5.2" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.5.2.tgz#6fd3c2d5a731e83bb21b070a173ec0faf3a8f6d3" + integrity sha512-qIlklNuI/1Dzfm+G+kJV5gg3gimZIX5haYtIVQe7qGyKd7eu8T1t1DY6pz4Sc2CGXAj9s1izycctm9Zfl9sRuQ== dependencies: tslib "^1.8.1" @@ -9838,7 +9969,7 @@ uniq@^1.0.1: resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8= -unique-filename@^1.1.0: +unique-filename@^1.1.0, unique-filename@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== @@ -9897,12 +10028,7 @@ urix@^0.1.0: resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= -url-join@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.0.tgz#4d3340e807d3773bda9991f8305acdcc2a665d2a" - integrity sha1-TTNA6AfTdzvamZH4MFrNzCpmXSo= - -url-parse@^1.1.8, url-parse@^1.4.3: +url-parse@^1.4.3: version "1.4.4" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz#cac1556e95faa0303691fec5cf9d5a1bc34648f8" integrity sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg== @@ -9928,12 +10054,12 @@ use@^3.1.0: resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== -useragent@2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.2.1.tgz#cf593ef4f2d175875e8bb658ea92e18a4fd06d8e" - integrity sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4= +useragent@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972" + integrity sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw== dependencies: - lru-cache "2.2.x" + lru-cache "4.1.x" tmp "0.0.x" ut_metadata@^3.3.0: @@ -10222,35 +10348,20 @@ webpack-core@^0.6.8: source-list-map "~0.1.7" source-map "~0.4.1" -webpack-dev-middleware@3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.2.0.tgz#a20ceef194873710052da678f3c6ee0aeed92552" - integrity sha512-YJLMF/96TpKXaEQwaLEo+Z4NDK8aV133ROF6xp9pe3gQoS7sxfpXh4Rv9eC+8vCvWfmDjRQaMSlRPbO+9G6jgA== +webpack-dev-middleware@3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz#1132fecc9026fd90f0ecedac5cbff75d1fb45890" + integrity sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA== dependencies: - loud-rejection "^1.6.0" - memory-fs "~0.4.1" - mime "^2.3.1" - path-is-absolute "^1.0.0" - range-parser "^1.0.3" - url-join "^4.0.0" - webpack-log "^2.0.0" - -webpack-dev-middleware@3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.3.0.tgz#8104daf4d4f65defe06ee2eaaeea612a7c541462" - integrity sha512-5C5gXtOo1I6+0AEg4UPglYEtu3Rai6l5IiO6aUu65scHXz29dc3oIWMiRwvcNLXgL0HwRkRxa9N02ZjFt4hY8w== - dependencies: - loud-rejection "^1.6.0" memory-fs "~0.4.1" mime "^2.3.1" range-parser "^1.0.3" - url-join "^4.0.0" webpack-log "^2.0.0" -webpack-dev-server@3.1.8: - version "3.1.8" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.8.tgz#eb7a95945d1108170f902604fb3b939533d9daeb" - integrity sha512-c+tcJtDqnPdxCAzEEZKdIPmg3i5i7cAHe+B+0xFNK0BlCc2HF/unYccbU7xTgfGc5xxhCztCQzFmsqim+KhI+A== +webpack-dev-server@3.1.10: + version "3.1.10" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.10.tgz#507411bee727ee8d2fdffdc621b66a64ab3dea2b" + integrity sha512-RqOAVjfqZJtQcB0LmrzJ5y4Jp78lv9CK0MZ1YJDTaTmedMZ9PU9FLMQNrMCfVu8hHzaVLVOJKBlGEHMN10z+ww== dependencies: ansi-html "0.0.7" bonjour "^3.5.0" @@ -10273,11 +10384,11 @@ webpack-dev-server@3.1.8: selfsigned "^1.9.1" serve-index "^1.7.2" sockjs "0.3.19" - sockjs-client "1.1.5" + sockjs-client "1.3.0" spdy "^3.4.1" strip-ansi "^3.0.0" supports-color "^5.1.0" - webpack-dev-middleware "3.2.0" + webpack-dev-middleware "3.4.0" webpack-log "^2.0.0" yargs "12.0.2" @@ -10314,6 +10425,14 @@ webpack-sources@1.2.0: source-list-map "^2.0.0" source-map "~0.6.1" +webpack-sources@1.3.0, webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85" + integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA== + dependencies: + source-list-map "^2.0.0" + source-map "~0.6.1" + webpack-sources@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750" @@ -10322,14 +10441,6 @@ webpack-sources@^0.1.4: source-list-map "~0.1.7" source-map "~0.5.3" -webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85" - integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA== - dependencies: - source-list-map "^2.0.0" - source-map "~0.6.1" - webpack-subresource-integrity@1.1.0-rc.6: version "1.1.0-rc.6" resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz#37f6f1264e1eb378e41465a98da80fad76ab8886" @@ -10337,15 +10448,15 @@ webpack-subresource-integrity@1.1.0-rc.6: dependencies: webpack-core "^0.6.8" -webpack@4.19.1: - version "4.19.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.19.1.tgz#096674bc3b573f8756c762754366e5b333d6576f" - integrity sha512-j7Q/5QqZRqIFXJvC0E59ipLV5Hf6lAnS3ezC3I4HMUybwEDikQBVad5d+IpPtmaQPQArvgUZLXIN6lWijHBn4g== +webpack@4.23.1: + version "4.23.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.23.1.tgz#db7467b116771ae020c58bdfe2a0822785bb8239" + integrity sha512-iE5Cu4rGEDk7ONRjisTOjVHv3dDtcFfwitSxT7evtYj/rANJpt1OuC/Kozh1pBa99AUBr1L/LsaNB+D9Xz3CEg== dependencies: - "@webassemblyjs/ast" "1.7.6" - "@webassemblyjs/helper-module-context" "1.7.6" - "@webassemblyjs/wasm-edit" "1.7.6" - "@webassemblyjs/wasm-parser" "1.7.6" + "@webassemblyjs/ast" "1.7.10" + "@webassemblyjs/helper-module-context" "1.7.10" + "@webassemblyjs/wasm-edit" "1.7.10" + "@webassemblyjs/wasm-parser" "1.7.10" acorn "^5.6.2" acorn-dynamic-import "^3.0.0" ajv "^6.1.0" @@ -10365,12 +10476,12 @@ webpack@4.19.1: tapable "^1.1.0" uglifyjs-webpack-plugin "^1.2.4" watchpack "^1.5.0" - webpack-sources "^1.2.0" + webpack-sources "^1.3.0" webpack@^4.17.1: - version "4.25.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.25.1.tgz#4f459fbaea0f93440dc86c89f771bb3a837cfb6d" - integrity sha512-T0GU/3NRtO4tMfNzsvpdhUr8HnzA4LTdP2zd+e5zd6CdOH5vNKHnAlO+DvzccfhPdzqRrALOFcjYxx7K5DWmvA== + version "4.26.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.26.1.tgz#ff3a9283d363c07b3494dfa702d08f4f2ef6cb39" + integrity sha512-i2oOvEvuvLLSuSCkdVrknaxAhtUZ9g+nLSoHCWV0gDzqGX2DXaCrMmMUpbRsTSSLrUqAI56PoEiyMUZIZ1msug== dependencies: "@webassemblyjs/ast" "1.7.11" "@webassemblyjs/helper-module-context" "1.7.11" @@ -10393,7 +10504,7 @@ webpack@^4.17.1: node-libs-browser "^2.0.0" schema-utils "^0.4.4" tapable "^1.1.0" - uglifyjs-webpack-plugin "^1.2.4" + terser-webpack-plugin "^1.1.0" watchpack "^1.5.0" webpack-sources "^1.3.0" @@ -10468,9 +10579,9 @@ whatwg-fetch@^3.0.0: integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q== whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.2.0.tgz#a3d58ef10b76009b042d03e25591ece89b88d171" - integrity sha512-5YSO1nMd5D1hY3WzAQV3PzZL83W3YeyR1yW9PcH26Weh1t+Vzh9B6XkDh7aXm83HBZ4nSMvkjvN2H2ySWIvBgw== + version "2.3.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" + integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== whatwg-url@^6.4.1: version "6.5.0" @@ -10505,7 +10616,7 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which@1, which@^1.1.1, which@^1.2.1, which@^1.2.12, which@^1.2.9, which@^1.3.0: +which@1, which@^1.1.1, which@^1.2.1, which@^1.2.12, which@^1.2.9, which@^1.3.0, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -10566,9 +10677,9 @@ ws@^5.2.0: async-limiter "~1.0.0" ws@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.0.tgz#119a9dbf92c54e190ec18d10e871d55c95cf9373" - integrity sha512-H3dGVdGvW2H8bnYpIDc3u3LH8Wue3Qh+Zto6aXXFzvESkTVT6rAfKR6tR/+coaUvxs8yHtmNV0uioBF62ZGSTg== + version "6.1.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.2.tgz#3cc7462e98792f0ac679424148903ded3b9c3ad8" + integrity sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw== dependencies: async-limiter "~1.0.0" @@ -10640,9 +10751,9 @@ yallist@^2.1.2: integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= yallist@^3.0.0, yallist@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9" - integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k= + version "3.0.3" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" + integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A== yargs-parser@10.x, yargs-parser@^10.1.0: version "10.1.0" @@ -10651,6 +10762,14 @@ yargs-parser@10.x, yargs-parser@^10.1.0: dependencies: camelcase "^4.1.0" +yargs-parser@^11.1.1: + version "11.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4" + integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + yargs-parser@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" @@ -10697,7 +10816,7 @@ yargs@10.0.3: y18n "^3.2.1" yargs-parser "^8.0.0" -yargs@12.0.2, yargs@^12.0.2: +yargs@12.0.2: version "12.0.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc" integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ== @@ -10752,6 +10871,24 @@ yargs@^11.0.0: y18n "^3.2.1" yargs-parser "^9.0.2" +yargs@^12.0.2: + version "12.0.5" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" + integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw== + dependencies: + cliui "^4.0.0" + decamelize "^1.2.0" + find-up "^3.0.0" + get-caller-file "^1.0.1" + os-locale "^3.0.0" + require-directory "^2.1.1" + require-main-filename "^1.0.1" + set-blocking "^2.0.0" + string-width "^2.0.0" + which-module "^2.0.0" + y18n "^3.2.1 || ^4.0.0" + yargs-parser "^11.1.1" + yargs@^7.0.0: version "7.1.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" From 2beb98952a4c5939f33ea2dc77f0bd053bffbb5a Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Tue, 4 Dec 2018 13:50:50 +0100 Subject: [PATCH 010/137] change type of languageOneOf query parameter --- support/doc/api/openapi.yaml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml index 9848c93ee..cb6ba9af5 100644 --- a/support/doc/api/openapi.yaml +++ b/support/doc/api/openapi.yaml @@ -1434,6 +1434,8 @@ components: - type: array items: type: number + style: form + explode: false tagsOneOf: name: tagsOneOf in: query @@ -1445,6 +1447,8 @@ components: - type: array items: type: string + style: form + explode: false tagsAllOf: name: tagsAllOf in: query @@ -1456,6 +1460,8 @@ components: - type: array items: type: string + style: form + explode: false languageOneOf: name: languageOneOf in: query @@ -1463,10 +1469,12 @@ components: description: language id of the video schema: oneOf: - - type: number + - type: string - type: array items: - type: number + type: string + style: form + explode: false licenceOneOf: name: licenceOneOf in: query @@ -1478,6 +1486,8 @@ components: - type: array items: type: number + style: form + explode: false nsfw: name: nsfw in: query From 745778256ced65415b04a9817fc49db70d4b6681 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 4 Dec 2018 15:12:54 +0100 Subject: [PATCH 011/137] Fix thumbnail processing --- server/helpers/image-utils.ts | 14 ++++++------- server/helpers/requests.ts | 4 ++-- .../lib/activitypub/process/process-update.ts | 2 +- server/lib/activitypub/videos.ts | 21 ++++++++++++------- .../handlers/activitypub-refresher.ts | 3 ++- server/tests/cli/index.ts | 1 + 6 files changed, 25 insertions(+), 20 deletions(-) diff --git a/server/helpers/image-utils.ts b/server/helpers/image-utils.ts index da3285b13..e43ea3f1d 100644 --- a/server/helpers/image-utils.ts +++ b/server/helpers/image-utils.ts @@ -1,6 +1,7 @@ import 'multer' import * as sharp from 'sharp' -import { move, remove } from 'fs-extra' +import { readFile, remove } from 'fs-extra' +import { logger } from './logger' async function processImage ( physicalFile: { path: string }, @@ -11,14 +12,11 @@ async function processImage ( throw new Error('Sharp needs an input path different that the output path.') } - const sharpInstance = sharp(physicalFile.path) - const metadata = await sharpInstance.metadata() + logger.debug('Processing image %s to %s.', physicalFile.path, destination) - // No need to resize - if (metadata.width === newSize.width && metadata.height === newSize.height) { - await move(physicalFile.path, destination, { overwrite: true }) - return - } + // Avoid sharp cache + const buf = await readFile(physicalFile.path) + const sharpInstance = sharp(buf) await remove(destination) diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts index 805930a9f..5760ad1c1 100644 --- a/server/helpers/requests.ts +++ b/server/helpers/requests.ts @@ -3,6 +3,7 @@ import { createWriteStream } from 'fs-extra' import * as request from 'request' import { ACTIVITY_PUB } from '../initializers' import { processImage } from './image-utils' +import { extname } from 'path' function doRequest ( requestOptions: request.CoreOptions & request.UriOptions & { activityPub?: boolean } @@ -29,8 +30,7 @@ function doRequestAndSaveToFile (requestOptions: request.CoreOptions & request.U } async function downloadImage (url: string, destPath: string, size: { width: number, height: number }) { - const tmpPath = destPath + '.tmp' - + const tmpPath = destPath + '.tmp' + extname(destPath) await doRequestAndSaveToFile({ method: 'GET', uri: url }, tmpPath) await processImage({ path: tmpPath }, destPath, size) diff --git a/server/lib/activitypub/process/process-update.ts b/server/lib/activitypub/process/process-update.ts index 03831a00e..c6b42d846 100644 --- a/server/lib/activitypub/process/process-update.ts +++ b/server/lib/activitypub/process/process-update.ts @@ -51,7 +51,7 @@ async function processUpdateVideo (actor: ActorModel, activity: ActivityUpdate) return undefined } - const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: videoObject.id }) + const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: videoObject.id, allowRefresh: false }) const channelActor = await getOrCreateVideoChannelFromVideoObject(videoObject) const updateOptions = { diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts index 998f90330..a5d649391 100644 --- a/server/lib/activitypub/videos.ts +++ b/server/lib/activitypub/videos.ts @@ -158,25 +158,30 @@ async function syncVideoExternalAttributes (video: VideoModel, fetchedVideo: Vid async function getOrCreateVideoAndAccountAndChannel (options: { videoObject: VideoTorrentObject | string, syncParam?: SyncParam, - fetchType?: VideoFetchByUrlType + fetchType?: VideoFetchByUrlType, + allowRefresh?: boolean // true by default }) { // Default params const syncParam = options.syncParam || { likes: true, dislikes: true, shares: true, comments: true, thumbnail: true, refreshVideo: false } const fetchType = options.fetchType || 'all' + const allowRefresh = options.allowRefresh !== false // Get video url const videoUrl = getAPUrl(options.videoObject) let videoFromDatabase = await fetchVideoByUrl(videoUrl, fetchType) if (videoFromDatabase) { - const refreshOptions = { - video: videoFromDatabase, - fetchedType: fetchType, - syncParam - } - if (syncParam.refreshVideo === true) videoFromDatabase = await refreshVideoIfNeeded(refreshOptions) - else await JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'video', videoUrl: videoFromDatabase.url } }) + if (allowRefresh === true) { + const refreshOptions = { + video: videoFromDatabase, + fetchedType: fetchType, + syncParam + } + + if (syncParam.refreshVideo === true) videoFromDatabase = await refreshVideoIfNeeded(refreshOptions) + else await JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'video', videoUrl: videoFromDatabase.url } }) + } return { video: videoFromDatabase } } diff --git a/server/lib/job-queue/handlers/activitypub-refresher.ts b/server/lib/job-queue/handlers/activitypub-refresher.ts index 7752b3b40..671b0f487 100644 --- a/server/lib/job-queue/handlers/activitypub-refresher.ts +++ b/server/lib/job-queue/handlers/activitypub-refresher.ts @@ -10,7 +10,8 @@ export type RefreshPayload = { async function refreshAPObject (job: Bull.Job) { const payload = job.data as RefreshPayload - logger.info('Processing AP refresher in job %d.', job.id) + + logger.info('Processing AP refresher in job %d for video %s.', job.id, payload.videoUrl) if (payload.type === 'video') return refreshAPVideo(payload.videoUrl) } diff --git a/server/tests/cli/index.ts b/server/tests/cli/index.ts index 6201314ce..c6b7ec078 100644 --- a/server/tests/cli/index.ts +++ b/server/tests/cli/index.ts @@ -1,6 +1,7 @@ // Order of the tests we want to execute import './create-import-video-file-job' import './create-transcoding-job' +import './optimize-old-videos' import './peertube' import './reset-password' import './update-host' From 6040f87d143a5fa01db79867ece8197c3ce7be47 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 4 Dec 2018 16:02:49 +0100 Subject: [PATCH 012/137] Add tmp and redundancy directories --- config/default.yaml | 4 +++- config/production.yaml.example | 4 +++- config/test-1.yaml | 2 ++ config/test-2.yaml | 2 ++ config/test-3.yaml | 2 ++ config/test-4.yaml | 2 ++ config/test-5.yaml | 2 ++ config/test-6.yaml | 2 ++ config/test.yaml | 2 +- server/controllers/api/users/me.ts | 4 ++-- server/controllers/api/video-channel.ts | 2 +- server/controllers/api/videos/import.ts | 6 +++--- server/controllers/api/videos/index.ts | 10 +++++----- server/controllers/static.ts | 9 +++++++-- server/helpers/requests.ts | 9 +++++---- server/helpers/utils.ts | 6 +++--- server/helpers/webtorrent.ts | 6 +++--- server/helpers/youtube-dl.ts | 4 ++-- server/initializers/checker-before-init.ts | 1 + server/initializers/constants.ts | 2 ++ server/lib/activitypub/actor.ts | 4 +--- server/lib/activitypub/videos.ts | 3 +-- server/lib/job-queue/handlers/video-import.ts | 9 ++++----- server/lib/job-queue/handlers/video-views.ts | 4 +--- server/lib/redis.ts | 9 ++++++++- support/docker/production/config/production.yaml | 2 ++ 26 files changed, 70 insertions(+), 42 deletions(-) diff --git a/config/default.yaml b/config/default.yaml index 257ec7ed1..d95fdc57b 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -45,8 +45,10 @@ smtp: # From the project root directory storage: + tmp: 'storage/tmp/' # Used to download data (imports etc), store uploaded files before processing... avatars: 'storage/avatars/' videos: 'storage/videos/' + redundancy: 'storage/redundancy/' logs: 'storage/logs/' previews: 'storage/previews/' thumbnails: 'storage/thumbnails/' @@ -75,7 +77,7 @@ trending: redundancy: videos: check_interval: '1 hour' # How often you want to check new videos to cache - strategies: + strategies: # Just uncomment strategies you want # - # size: '10GB' # # Minimum time the video must remain in the cache. Only accept values > 10 hours (to not overload remote instances) diff --git a/config/production.yaml.example b/config/production.yaml.example index ac15fc736..4c50a550b 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example @@ -46,8 +46,10 @@ smtp: # From the project root directory storage: + tmp: '/var/www/peertube/storage/tmp/' # Used to download data (imports etc), store uploaded files before processing... avatars: '/var/www/peertube/storage/avatars/' videos: '/var/www/peertube/storage/videos/' + redundancy: '/var/www/peertube/storage/videos/' logs: '/var/www/peertube/storage/logs/' previews: '/var/www/peertube/storage/previews/' thumbnails: '/var/www/peertube/storage/thumbnails/' @@ -76,7 +78,7 @@ trending: redundancy: videos: check_interval: '1 hour' # How often you want to check new videos to cache - strategies: + strategies: # Just uncomment strategies you want # - # size: '10GB' # # Minimum time the video must remain in the cache. Only accept values > 10 hours (to not overload remote instances) diff --git a/config/test-1.yaml b/config/test-1.yaml index 503bbc661..8f4f66d2a 100644 --- a/config/test-1.yaml +++ b/config/test-1.yaml @@ -10,8 +10,10 @@ database: # From the project root directory storage: + tmp: 'test1/tmp/' avatars: 'test1/avatars/' videos: 'test1/videos/' + redundancy: 'test1/redundancy/' logs: 'test1/logs/' previews: 'test1/previews/' thumbnails: 'test1/thumbnails/' diff --git a/config/test-2.yaml b/config/test-2.yaml index 8c77bf581..a80ec6e54 100644 --- a/config/test-2.yaml +++ b/config/test-2.yaml @@ -10,8 +10,10 @@ database: # From the project root directory storage: + tmp: 'test2/tmp/' avatars: 'test2/avatars/' videos: 'test2/videos/' + redundancy: 'test2/redundancy/' logs: 'test2/logs/' previews: 'test2/previews/' thumbnails: 'test2/thumbnails/' diff --git a/config/test-3.yaml b/config/test-3.yaml index 82d89567a..934401eb0 100644 --- a/config/test-3.yaml +++ b/config/test-3.yaml @@ -10,8 +10,10 @@ database: # From the project root directory storage: + tmp: 'test3/tmp/' avatars: 'test3/avatars/' videos: 'test3/videos/' + redundancy: 'test3/redundancy/' logs: 'test3/logs/' previews: 'test3/previews/' thumbnails: 'test3/thumbnails/' diff --git a/config/test-4.yaml b/config/test-4.yaml index 1aa56d041..ee99b250b 100644 --- a/config/test-4.yaml +++ b/config/test-4.yaml @@ -10,8 +10,10 @@ database: # From the project root directory storage: + tmp: 'test4/tmp/' avatars: 'test4/avatars/' videos: 'test4/videos/' + redundancy: 'test4/redundancy/' logs: 'test4/logs/' previews: 'test4/previews/' thumbnails: 'test4/thumbnails/' diff --git a/config/test-5.yaml b/config/test-5.yaml index 5f1c2f583..e2662bdd9 100644 --- a/config/test-5.yaml +++ b/config/test-5.yaml @@ -10,8 +10,10 @@ database: # From the project root directory storage: + tmp: 'test5/tmp/' avatars: 'test5/avatars/' videos: 'test5/videos/' + redundancy: 'test5/redundancy/' logs: 'test5/logs/' previews: 'test5/previews/' thumbnails: 'test5/thumbnails/' diff --git a/config/test-6.yaml b/config/test-6.yaml index 719629844..ad39c6a9f 100644 --- a/config/test-6.yaml +++ b/config/test-6.yaml @@ -10,8 +10,10 @@ database: # From the project root directory storage: + tmp: 'test6/tmp/' avatars: 'test6/avatars/' videos: 'test6/videos/' + redundancy: 'test6/redundancy/' logs: 'test6/logs/' previews: 'test6/previews/' thumbnails: 'test6/thumbnails/' diff --git a/config/test.yaml b/config/test.yaml index 9c051fabc..51a77e2fd 100644 --- a/config/test.yaml +++ b/config/test.yaml @@ -67,4 +67,4 @@ import: enabled: true instance: - default_nsfw_policy: 'display' \ No newline at end of file + default_nsfw_policy: 'display' diff --git a/server/controllers/api/users/me.ts b/server/controllers/api/users/me.ts index 82299747d..47f2c9ec7 100644 --- a/server/controllers/api/users/me.ts +++ b/server/controllers/api/users/me.ts @@ -42,7 +42,7 @@ import { AccountModel } from '../../../models/account/account' const auditLogger = auditLoggerFactory('users-me') -const reqAvatarFile = createReqFiles([ 'avatarfile' ], IMAGE_MIMETYPE_EXT, { avatarfile: CONFIG.STORAGE.AVATARS_DIR }) +const reqAvatarFile = createReqFiles([ 'avatarfile' ], IMAGE_MIMETYPE_EXT, { avatarfile: CONFIG.STORAGE.TMP_DIR }) const meRouter = express.Router() @@ -348,7 +348,7 @@ async function updateMe (req: express.Request, res: express.Response, next: expr return res.sendStatus(204) } -async function updateMyAvatar (req: express.Request, res: express.Response, next: express.NextFunction) { +async function updateMyAvatar (req: express.Request, res: express.Response) { const avatarPhysicalFile = req.files[ 'avatarfile' ][ 0 ] const user: UserModel = res.locals.oauth.token.user const oldUserAuditView = new UserAuditView(user.toFormattedJSON()) diff --git a/server/controllers/api/video-channel.ts b/server/controllers/api/video-channel.ts index 9bf3c5fd8..63240dfa1 100644 --- a/server/controllers/api/video-channel.ts +++ b/server/controllers/api/video-channel.ts @@ -32,7 +32,7 @@ import { resetSequelizeInstance } from '../../helpers/database-utils' import { UserModel } from '../../models/account/user' const auditLogger = auditLoggerFactory('channels') -const reqAvatarFile = createReqFiles([ 'avatarfile' ], IMAGE_MIMETYPE_EXT, { avatarfile: CONFIG.STORAGE.AVATARS_DIR }) +const reqAvatarFile = createReqFiles([ 'avatarfile' ], IMAGE_MIMETYPE_EXT, { avatarfile: CONFIG.STORAGE.TMP_DIR }) const videoChannelRouter = express.Router() diff --git a/server/controllers/api/videos/import.ts b/server/controllers/api/videos/import.ts index 398fd5a7f..f27d648c7 100644 --- a/server/controllers/api/videos/import.ts +++ b/server/controllers/api/videos/import.ts @@ -37,9 +37,9 @@ const reqVideoFileImport = createReqFiles( [ 'thumbnailfile', 'previewfile', 'torrentfile' ], Object.assign({}, TORRENT_MIMETYPE_EXT, IMAGE_MIMETYPE_EXT), { - thumbnailfile: CONFIG.STORAGE.THUMBNAILS_DIR, - previewfile: CONFIG.STORAGE.PREVIEWS_DIR, - torrentfile: CONFIG.STORAGE.TORRENTS_DIR + thumbnailfile: CONFIG.STORAGE.TMP_DIR, + previewfile: CONFIG.STORAGE.TMP_DIR, + torrentfile: CONFIG.STORAGE.TMP_DIR } ) diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index 3d1b2e1a2..4e4697ef4 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts @@ -67,17 +67,17 @@ const reqVideoFileAdd = createReqFiles( [ 'videofile', 'thumbnailfile', 'previewfile' ], Object.assign({}, VIDEO_MIMETYPE_EXT, IMAGE_MIMETYPE_EXT), { - videofile: CONFIG.STORAGE.VIDEOS_DIR, - thumbnailfile: CONFIG.STORAGE.THUMBNAILS_DIR, - previewfile: CONFIG.STORAGE.PREVIEWS_DIR + videofile: CONFIG.STORAGE.TMP_DIR, + thumbnailfile: CONFIG.STORAGE.TMP_DIR, + previewfile: CONFIG.STORAGE.TMP_DIR } ) const reqVideoFileUpdate = createReqFiles( [ 'thumbnailfile', 'previewfile' ], IMAGE_MIMETYPE_EXT, { - thumbnailfile: CONFIG.STORAGE.THUMBNAILS_DIR, - previewfile: CONFIG.STORAGE.PREVIEWS_DIR + thumbnailfile: CONFIG.STORAGE.TMP_DIR, + previewfile: CONFIG.STORAGE.TMP_DIR } ) diff --git a/server/controllers/static.ts b/server/controllers/static.ts index 75e30353c..f16a7d72b 100644 --- a/server/controllers/static.ts +++ b/server/controllers/static.ts @@ -34,12 +34,17 @@ staticRouter.use( ) // Videos path for webseeding -const videosPhysicalPath = CONFIG.STORAGE.VIDEOS_DIR staticRouter.use( STATIC_PATHS.WEBSEED, cors(), - express.static(videosPhysicalPath) + express.static(CONFIG.STORAGE.VIDEOS_DIR) ) +staticRouter.use( + STATIC_PATHS.WEBSEED, + cors(), + express.static(CONFIG.STORAGE.REDUNDANCY_DIR, { fallthrough: false }) // 404, because we don't have this video +) + staticRouter.use( STATIC_DOWNLOAD_PATHS.VIDEOS + ':id-:resolution([0-9]+).:extension', asyncMiddleware(videosGetValidator), diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts index 5760ad1c1..3fc776f1a 100644 --- a/server/helpers/requests.ts +++ b/server/helpers/requests.ts @@ -1,9 +1,9 @@ import * as Bluebird from 'bluebird' import { createWriteStream } from 'fs-extra' import * as request from 'request' -import { ACTIVITY_PUB } from '../initializers' +import { ACTIVITY_PUB, CONFIG } from '../initializers' import { processImage } from './image-utils' -import { extname } from 'path' +import { join } from 'path' function doRequest ( requestOptions: request.CoreOptions & request.UriOptions & { activityPub?: boolean } @@ -29,10 +29,11 @@ function doRequestAndSaveToFile (requestOptions: request.CoreOptions & request.U }) } -async function downloadImage (url: string, destPath: string, size: { width: number, height: number }) { - const tmpPath = destPath + '.tmp' + extname(destPath) +async function downloadImage (url: string, destDir: string, destName: string, size: { width: number, height: number }) { + const tmpPath = join(CONFIG.STORAGE.TMP_DIR, 'pending-' + destName) await doRequestAndSaveToFile({ method: 'GET', uri: url }, tmpPath) + const destPath = join(destDir, destName) await processImage({ path: tmpPath }, destPath, size) } diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts index 5c9d6fe2f..9b89e3e61 100644 --- a/server/helpers/utils.ts +++ b/server/helpers/utils.ts @@ -46,11 +46,11 @@ const getServerActor = memoizee(async function () { return actor }) -function generateVideoTmpPath (target: string | ParseTorrent) { +function generateVideoImportTmpPath (target: string | ParseTorrent) { const id = typeof target === 'string' ? target : target.infoHash const hash = sha256(id) - return join(CONFIG.STORAGE.VIDEOS_DIR, hash + '-import.mp4') + return join(CONFIG.STORAGE.TMP_DIR, hash + '-import.mp4') } function getSecureTorrentName (originalName: string) { @@ -103,6 +103,6 @@ export { getSecureTorrentName, getServerActor, getServerCommit, - generateVideoTmpPath, + generateVideoImportTmpPath, getUUIDFromFilename } diff --git a/server/helpers/webtorrent.ts b/server/helpers/webtorrent.ts index ce35b87da..3c9a0b96a 100644 --- a/server/helpers/webtorrent.ts +++ b/server/helpers/webtorrent.ts @@ -1,5 +1,5 @@ import { logger } from './logger' -import { generateVideoTmpPath } from './utils' +import { generateVideoImportTmpPath } from './utils' import * as WebTorrent from 'webtorrent' import { createWriteStream, ensureDir, remove } from 'fs-extra' import { CONFIG } from '../initializers' @@ -9,10 +9,10 @@ async function downloadWebTorrentVideo (target: { magnetUri: string, torrentName const id = target.magnetUri || target.torrentName let timer - const path = generateVideoTmpPath(id) + const path = generateVideoImportTmpPath(id) logger.info('Importing torrent video %s', id) - const directoryPath = join(CONFIG.STORAGE.VIDEOS_DIR, 'import') + const directoryPath = join(CONFIG.STORAGE.TMP_DIR, 'webtorrent') await ensureDir(directoryPath) return new Promise((res, rej) => { diff --git a/server/helpers/youtube-dl.ts b/server/helpers/youtube-dl.ts index 2a5663042..b74351b42 100644 --- a/server/helpers/youtube-dl.ts +++ b/server/helpers/youtube-dl.ts @@ -1,7 +1,7 @@ import { truncate } from 'lodash' import { CONSTRAINTS_FIELDS, VIDEO_CATEGORIES } from '../initializers' import { logger } from './logger' -import { generateVideoTmpPath } from './utils' +import { generateVideoImportTmpPath } from './utils' import { join } from 'path' import { root } from './core-utils' import { ensureDir, writeFile, remove } from 'fs-extra' @@ -40,7 +40,7 @@ function getYoutubeDLInfo (url: string, opts?: string[]): Promise } function downloadYoutubeDLVideo (url: string, timeout: number) { - const path = generateVideoTmpPath(url) + const path = generateVideoImportTmpPath(url) let timer logger.info('Importing youtubeDL video %s', url) diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts index 9dfb5d68c..b51c7cfba 100644 --- a/server/initializers/checker-before-init.ts +++ b/server/initializers/checker-before-init.ts @@ -12,6 +12,7 @@ function checkMissedConfig () { 'database.hostname', 'database.port', 'database.suffix', 'database.username', 'database.password', 'database.pool.max', 'smtp.hostname', 'smtp.port', 'smtp.username', 'smtp.password', 'smtp.tls', 'smtp.from_address', 'storage.avatars', 'storage.videos', 'storage.logs', 'storage.previews', 'storage.thumbnails', 'storage.torrents', 'storage.cache', + 'storage.redundancy', 'storage.tmp', 'log.level', 'user.video_quota', 'user.video_quota_daily', 'cache.previews.size', 'admin.email', diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 8a8bcd126..876aa1cf5 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -185,9 +185,11 @@ const CONFIG = { FROM_ADDRESS: config.get('smtp.from_address') }, STORAGE: { + TMP_DIR: buildPath(config.get('storage.tmp')), AVATARS_DIR: buildPath(config.get('storage.avatars')), LOG_DIR: buildPath(config.get('storage.logs')), VIDEOS_DIR: buildPath(config.get('storage.videos')), + REDUNDANCY_DIR: buildPath(config.get('storage.redundancy')), THUMBNAILS_DIR: buildPath(config.get('storage.thumbnails')), PREVIEWS_DIR: buildPath(config.get('storage.previews')), CAPTIONS_DIR: buildPath(config.get('storage.captions')), diff --git a/server/lib/activitypub/actor.ts b/server/lib/activitypub/actor.ts index 504263c99..bbe48833d 100644 --- a/server/lib/activitypub/actor.ts +++ b/server/lib/activitypub/actor.ts @@ -178,9 +178,7 @@ async function fetchAvatarIfExists (actorJSON: ActivityPubActor) { const extension = IMAGE_MIMETYPE_EXT[actorJSON.icon.mediaType] const avatarName = uuidv4() + extension - const destPath = join(CONFIG.STORAGE.AVATARS_DIR, avatarName) - - await downloadImage(actorJSON.icon.url, destPath, AVATARS_SIZE) + await downloadImage(actorJSON.icon.url, CONFIG.STORAGE.AVATARS_DIR, avatarName, AVATARS_SIZE) return avatarName } diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts index a5d649391..3d17e6846 100644 --- a/server/lib/activitypub/videos.ts +++ b/server/lib/activitypub/videos.ts @@ -95,9 +95,8 @@ function fetchRemoteVideoStaticFile (video: VideoModel, path: string, reject: Fu function generateThumbnailFromUrl (video: VideoModel, icon: ActivityIconObject) { const thumbnailName = video.getThumbnailName() - const thumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, thumbnailName) - return downloadImage(icon.url, thumbnailPath, THUMBNAILS_SIZE) + return downloadImage(icon.url, CONFIG.STORAGE.THUMBNAILS_DIR, thumbnailName, THUMBNAILS_SIZE) } function getOrCreateVideoChannelFromVideoObject (videoObject: VideoTorrentObject) { diff --git a/server/lib/job-queue/handlers/video-import.ts b/server/lib/job-queue/handlers/video-import.ts index 4de901c0c..51a0b5faf 100644 --- a/server/lib/job-queue/handlers/video-import.ts +++ b/server/lib/job-queue/handlers/video-import.ts @@ -7,7 +7,7 @@ import { getDurationFromVideoFile, getVideoFileFPS, getVideoFileResolution } fro import { extname, join } from 'path' import { VideoFileModel } from '../../../models/video/video-file' import { CONFIG, PREVIEWS_SIZE, sequelizeTypescript, THUMBNAILS_SIZE, VIDEO_IMPORT_TIMEOUT } from '../../../initializers' -import { doRequestAndSaveToFile, downloadImage } from '../../../helpers/requests' +import { downloadImage } from '../../../helpers/requests' import { VideoState } from '../../../../shared' import { JobQueue } from '../index' import { federateVideoIfNeeded } from '../../activitypub' @@ -109,6 +109,7 @@ async function processFile (downloader: () => Promise, videoImport: Vide let tempVideoPath: string let videoDestFile: string let videoFile: VideoFileModel + try { // Download video from youtubeDL tempVideoPath = await downloader() @@ -144,8 +145,7 @@ async function processFile (downloader: () => Promise, videoImport: Vide // Process thumbnail if (options.downloadThumbnail) { if (options.thumbnailUrl) { - const destThumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, videoImport.Video.getThumbnailName()) - await downloadImage(options.thumbnailUrl, destThumbnailPath, THUMBNAILS_SIZE) + await downloadImage(options.thumbnailUrl, CONFIG.STORAGE.THUMBNAILS_DIR, videoImport.Video.getThumbnailName(), THUMBNAILS_SIZE) } else { await videoImport.Video.createThumbnail(videoFile) } @@ -156,8 +156,7 @@ async function processFile (downloader: () => Promise, videoImport: Vide // Process preview if (options.downloadPreview) { if (options.thumbnailUrl) { - const destPreviewPath = join(CONFIG.STORAGE.PREVIEWS_DIR, videoImport.Video.getPreviewName()) - await downloadImage(options.thumbnailUrl, destPreviewPath, PREVIEWS_SIZE) + await downloadImage(options.thumbnailUrl, CONFIG.STORAGE.PREVIEWS_DIR, videoImport.Video.getPreviewName(), PREVIEWS_SIZE) } else { await videoImport.Video.createPreview(videoFile) } diff --git a/server/lib/job-queue/handlers/video-views.ts b/server/lib/job-queue/handlers/video-views.ts index 038ef43e2..fa1fd13b3 100644 --- a/server/lib/job-queue/handlers/video-views.ts +++ b/server/lib/job-queue/handlers/video-views.ts @@ -23,9 +23,7 @@ async function processVideosViews () { for (const videoId of videoIds) { try { const views = await Redis.Instance.getVideoViews(videoId, hour) - if (isNaN(views)) { - logger.error('Cannot process videos views of video %d in hour %d: views number is NaN (%s).', videoId, hour, views) - } else { + if (views) { logger.debug('Adding %d views to video %d in hour %d.', views, videoId, hour) try { diff --git a/server/lib/redis.ts b/server/lib/redis.ts index abd75d512..3e25e6a2c 100644 --- a/server/lib/redis.ts +++ b/server/lib/redis.ts @@ -121,7 +121,14 @@ class Redis { const key = this.generateVideoViewKey(videoId, hour) const valueString = await this.getValue(key) - return parseInt(valueString, 10) + const valueInt = parseInt(valueString, 10) + + if (isNaN(valueInt)) { + logger.error('Cannot get videos views of video %d in hour %d: views number is NaN (%s).', videoId, hour, valueString) + return undefined + } + + return valueInt } async getVideosIdViewed (hour: number) { diff --git a/support/docker/production/config/production.yaml b/support/docker/production/config/production.yaml index 4970bbcca..846c838e8 100644 --- a/support/docker/production/config/production.yaml +++ b/support/docker/production/config/production.yaml @@ -32,8 +32,10 @@ redis: # From the project root directory storage: + tmp: '../data/tmp/' avatars: '../data/avatars/' videos: '../data/videos/' + redundancy: '../data/redundancy/' logs: '../data/logs/' previews: '../data/previews/' thumbnails: '../data/thumbnails/' From b9fffa297f49a84df8ffd0d7b842599bc88a8e3e Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 4 Dec 2018 17:08:55 +0100 Subject: [PATCH 013/137] Create redundancy endpoint --- server/controllers/static.ts | 6 ++--- server/initializers/constants.ts | 1 + .../schedulers/videos-redundancy-scheduler.ts | 4 +-- server/models/redundancy/video-redundancy.ts | 4 +-- server/models/video/video.ts | 10 +++++-- server/tests/api/redundancy/redundancy.ts | 27 ++++++++++--------- support/nginx/peertube | 9 +++++-- 7 files changed, 38 insertions(+), 23 deletions(-) diff --git a/server/controllers/static.ts b/server/controllers/static.ts index f16a7d72b..55e7392a1 100644 --- a/server/controllers/static.ts +++ b/server/controllers/static.ts @@ -37,12 +37,12 @@ staticRouter.use( staticRouter.use( STATIC_PATHS.WEBSEED, cors(), - express.static(CONFIG.STORAGE.VIDEOS_DIR) + express.static(CONFIG.STORAGE.VIDEOS_DIR, { fallthrough: false }) // 404 because we don't have this video ) staticRouter.use( - STATIC_PATHS.WEBSEED, + STATIC_PATHS.REDUNDANCY, cors(), - express.static(CONFIG.STORAGE.REDUNDANCY_DIR, { fallthrough: false }) // 404, because we don't have this video + express.static(CONFIG.STORAGE.REDUNDANCY_DIR, { fallthrough: false }) // 404 because we don't have this video ) staticRouter.use( diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 876aa1cf5..7195ae6c5 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -571,6 +571,7 @@ const STATIC_PATHS = { THUMBNAILS: '/static/thumbnails/', TORRENTS: '/static/torrents/', WEBSEED: '/static/webseed/', + REDUNDANCY: '/static/redundancy/', AVATARS: '/static/avatars/', VIDEO_CAPTIONS: '/static/video-captions/' } diff --git a/server/lib/schedulers/videos-redundancy-scheduler.ts b/server/lib/schedulers/videos-redundancy-scheduler.ts index 8b7f33539..2a99a665d 100644 --- a/server/lib/schedulers/videos-redundancy-scheduler.ts +++ b/server/lib/schedulers/videos-redundancy-scheduler.ts @@ -145,13 +145,13 @@ export class VideosRedundancyScheduler extends AbstractScheduler { const tmpPath = await downloadWebTorrentVideo({ magnetUri }, VIDEO_IMPORT_TIMEOUT) - const destPath = join(CONFIG.STORAGE.VIDEOS_DIR, video.getVideoFilename(file)) + const destPath = join(CONFIG.STORAGE.REDUNDANCY_DIR, video.getVideoFilename(file)) await rename(tmpPath, destPath) const createdModel = await VideoRedundancyModel.create({ expiresOn: this.buildNewExpiration(redundancy.minLifetime), url: getVideoCacheFileActivityPubUrl(file), - fileUrl: video.getVideoFileUrl(file, CONFIG.WEBSERVER.URL), + fileUrl: video.getVideoRedundancyUrl(file, CONFIG.WEBSERVER.URL), strategy: redundancy.strategy, videoFileId: file.id, actorId: serverActor.id diff --git a/server/models/redundancy/video-redundancy.ts b/server/models/redundancy/video-redundancy.ts index 9de4356b4..dd37dad22 100644 --- a/server/models/redundancy/video-redundancy.ts +++ b/server/models/redundancy/video-redundancy.ts @@ -15,7 +15,7 @@ import { import { ActorModel } from '../activitypub/actor' import { getVideoSort, throwIfNotValid } from '../utils' import { isActivityPubUrlValid, isUrlValid } from '../../helpers/custom-validators/activitypub/misc' -import { CONFIG, CONSTRAINTS_FIELDS, VIDEO_EXT_MIMETYPE } from '../../initializers' +import { CONFIG, CONSTRAINTS_FIELDS, STATIC_PATHS, VIDEO_EXT_MIMETYPE } from '../../initializers' import { VideoFileModel } from '../video/video-file' import { getServerActor } from '../../helpers/utils' import { VideoModel } from '../video/video' @@ -124,7 +124,7 @@ export class VideoRedundancyModel extends Model { const logIdentifier = `${videoFile.Video.uuid}-${videoFile.resolution}` logger.info('Removing duplicated video file %s.', logIdentifier) - videoFile.Video.removeFile(videoFile) + videoFile.Video.removeFile(videoFile, true) .catch(err => logger.error('Cannot delete %s files.', logIdentifier, { err })) return undefined diff --git a/server/models/video/video.ts b/server/models/video/video.ts index 0f18d9f0c..e8cb5aa88 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -1538,8 +1538,10 @@ export class VideoModel extends Model { .catch(err => logger.warn('Cannot delete preview %s.', previewPath, { err })) } - removeFile (videoFile: VideoFileModel) { - const filePath = join(CONFIG.STORAGE.VIDEOS_DIR, this.getVideoFilename(videoFile)) + removeFile (videoFile: VideoFileModel, isRedundancy = false) { + const baseDir = isRedundancy ? CONFIG.STORAGE.REDUNDANCY_DIR : CONFIG.STORAGE.VIDEOS_DIR + + const filePath = join(baseDir, this.getVideoFilename(videoFile)) return remove(filePath) .catch(err => logger.warn('Cannot delete file %s.', filePath, { err })) } @@ -1617,6 +1619,10 @@ export class VideoModel extends Model { return baseUrlHttp + STATIC_PATHS.WEBSEED + this.getVideoFilename(videoFile) } + getVideoRedundancyUrl (videoFile: VideoFileModel, baseUrlHttp: string) { + return baseUrlHttp + STATIC_PATHS.REDUNDANCY + this.getVideoFilename(videoFile) + } + getVideoFileDownloadUrl (videoFile: VideoFileModel, baseUrlHttp: string) { return baseUrlHttp + STATIC_DOWNLOAD_PATHS.VIDEOS + this.getVideoFilename(videoFile) } diff --git a/server/tests/api/redundancy/redundancy.ts b/server/tests/api/redundancy/redundancy.ts index a8a2f305f..5b29a503a 100644 --- a/server/tests/api/redundancy/redundancy.ts +++ b/server/tests/api/redundancy/redundancy.ts @@ -136,7 +136,7 @@ async function check2Webseeds (strategy: VideoRedundancyStrategy, videoUUID?: st if (!videoUUID) videoUUID = video1Server2UUID const webseeds = [ - 'http://localhost:9001/static/webseed/' + videoUUID, + 'http://localhost:9001/static/redundancy/' + videoUUID, 'http://localhost:9002/static/webseed/' + videoUUID ] @@ -148,20 +148,23 @@ async function check2Webseeds (strategy: VideoRedundancyStrategy, videoUUID?: st for (const file of video.files) { checkMagnetWebseeds(file, webseeds, server) - // Only servers 1 and 2 have the video - if (server.serverNumber !== 3) { - await makeGetRequest({ - url: server.url, - statusCodeExpected: 200, - path: '/static/webseed/' + `${videoUUID}-${file.resolution.id}.mp4`, - contentType: null - }) - } + await makeGetRequest({ + url: servers[0].url, + statusCodeExpected: 200, + path: '/static/redundancy/' + `${videoUUID}-${file.resolution.id}.mp4`, + contentType: null + }) + await makeGetRequest({ + url: servers[1].url, + statusCodeExpected: 200, + path: '/static/webseed/' + `${videoUUID}-${file.resolution.id}.mp4`, + contentType: null + }) } } - for (const directory of [ 'test1', 'test2' ]) { - const files = await readdir(join(root(), directory, 'videos')) + for (const directory of [ 'test1/redundancy', 'test2/videos' ]) { + const files = await readdir(join(root(), directory)) expect(files).to.have.length.at.least(4) for (const resolution of [ 240, 360, 480, 720 ]) { diff --git a/support/nginx/peertube b/support/nginx/peertube index b00031133..e0b006088 100644 --- a/support/nginx/peertube +++ b/support/nginx/peertube @@ -105,7 +105,7 @@ server { } # Bypass PeerTube for performance reasons. Could be removed - location /static/webseed { + location ~ ^/static/(webseed|redundancy)/ { # Clients usually have 4 simultaneous webseed connections, so the real limit is 3MB/s per client limit_rate 800k; @@ -128,7 +128,12 @@ server { access_log off; } - alias /var/www/peertube/storage/videos; + root /var/www/peertube/storage; + + rewrite ^/static/webseed/(.*)$ /videos/$1 break; + rewrite ^/static/redundancy/(.*)$ /redundancy/$1 break; + + try_files $uri /; } # Websocket tracker From 9024bece9a51d3bc666ba94f272aaec186e3c278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nathana=C3=ABl=20J?= Date: Tue, 4 Dec 2018 14:23:28 +0100 Subject: [PATCH 014/137] Use `'` instead of `'` for passwords in the documentation (see #1453) --- support/doc/tools.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/doc/tools.md b/support/doc/tools.md index 5a1f212b1..98048ec41 100644 --- a/support/doc/tools.md +++ b/support/doc/tools.md @@ -82,7 +82,7 @@ The wrapper provides a convenient interface to the following scripts. You can ac The wrapper can keep track of instances you have an account on. We limit to one account per instance for now. ```bash -$ peertube auth add -u "PEERTUBE_URL" -U "PEERTUBE_USER" --password "PEERTUBE_PASSWORD" +$ peertube auth add -u "PEERTUBE_URL" -U "PEERTUBE_USER" --password 'PEERTUBE_PASSWORD' $ peertube auth list ┌──────────────────────────────┬──────────────────────────────┐ │ instance │ login │ @@ -112,7 +112,7 @@ Be sure you own the videos or have the author's authorization to do so. $ node dist/server/tools/peertube-import-videos.js \ -u "PEERTUBE_URL" \ -U "PEERTUBE_USER" \ - --password "PEERTUBE_PASSWORD" \ + --password 'PEERTUBE_PASSWORD' \ -t "TARGET_URL" ``` From 5b036b8ef2f15c30afe6cddfe9bcfc5816b08bba Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 4 Dec 2018 17:19:44 +0100 Subject: [PATCH 015/137] Better tools.md doc --- support/doc/tools.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/support/doc/tools.md b/support/doc/tools.md index 98048ec41..69d68464a 100644 --- a/support/doc/tools.md +++ b/support/doc/tools.md @@ -82,12 +82,12 @@ The wrapper provides a convenient interface to the following scripts. You can ac The wrapper can keep track of instances you have an account on. We limit to one account per instance for now. ```bash -$ peertube auth add -u "PEERTUBE_URL" -U "PEERTUBE_USER" --password 'PEERTUBE_PASSWORD' +$ peertube auth add -u 'PEERTUBE_URL' -U 'PEERTUBE_USER' --password 'PEERTUBE_PASSWORD' $ peertube auth list ┌──────────────────────────────┬──────────────────────────────┐ │ instance │ login │ ├──────────────────────────────┼──────────────────────────────┤ -│ "PEERTUBE_URL" │ "PEERTUBE_USER" │ +│ 'PEERTUBE_URL' │ 'PEERTUBE_USER' │ └──────────────────────────────┴──────────────────────────────┘ ``` @@ -110,15 +110,15 @@ Be sure you own the videos or have the author's authorization to do so. ```sh $ node dist/server/tools/peertube-import-videos.js \ - -u "PEERTUBE_URL" \ - -U "PEERTUBE_USER" \ + -u 'PEERTUBE_URL' \ + -U 'PEERTUBE_USER' \ --password 'PEERTUBE_PASSWORD' \ - -t "TARGET_URL" + -t 'TARGET_URL' ``` * `PEERTUBE_URL` : the full URL of your PeerTube server where you want to import, eg: https://peertube.cpy.re * `PEERTUBE_USER` : your PeerTube account where videos will be uploaded -* `PEERTUBE_PASSWORD` : password of your PeerTube account (if omitted, you will be prompted for it) +* `PEERTUBE_PASSWORD` : password of your PeerTube account (if `PEERTUBE_PASSWORD` is omitted, you will be prompted for it) * `TARGET_URL` : the target url you want to import. Examples: * YouTube: * Channel: https://www.youtube.com/channel/ChannelId From d7aea77bdb989df7df4a9c492f5e5ab033291e07 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 4 Dec 2018 17:43:24 +0100 Subject: [PATCH 016/137] Add ru pl and it translations --- client/src/locale/target/angular_ar_001.xml | 301 ++++++++ client/src/locale/target/angular_eu_ES.xml | 358 +++++++++ client/src/locale/target/angular_it_IT.xml | 141 ++++ client/src/locale/target/angular_oc.xml | 67 ++ client/src/locale/target/angular_pl_PL.xml | 4 + client/src/locale/target/angular_sv_SE.xml | 14 + .../src/locale/target/angular_zh_Hant_TW.xml | 67 ++ client/src/locale/target/iso639_pl_PL.xml | 695 ------------------ client/src/locale/target/player_ar_001.xml | 2 +- client/src/locale/target/player_it_IT.json | 1 + client/src/locale/target/player_pl_PL.json | 1 + client/src/locale/target/player_pl_PL.xml | 383 ---------- client/src/locale/target/player_ru_RU.json | 1 + client/src/locale/target/server_it_IT.json | 1 + client/src/locale/target/server_pl_PL.json | 1 + client/src/locale/target/server_pl_PL.xml | 147 ---- client/src/locale/target/server_ru_RU.json | 1 + scripts/build/client.sh | 2 +- shared/models/i18n/i18n.ts | 9 +- 19 files changed, 966 insertions(+), 1230 deletions(-) delete mode 100644 client/src/locale/target/iso639_pl_PL.xml create mode 100644 client/src/locale/target/player_it_IT.json create mode 100644 client/src/locale/target/player_pl_PL.json delete mode 100644 client/src/locale/target/player_pl_PL.xml create mode 100644 client/src/locale/target/player_ru_RU.json create mode 100644 client/src/locale/target/server_it_IT.json create mode 100644 client/src/locale/target/server_pl_PL.json delete mode 100644 client/src/locale/target/server_pl_PL.xml create mode 100644 client/src/locale/target/server_ru_RU.json diff --git a/client/src/locale/target/angular_ar_001.xml b/client/src/locale/target/angular_ar_001.xml index 05e55793d..894798226 100644 --- a/client/src/locale/target/angular_ar_001.xml +++ b/client/src/locale/target/angular_ar_001.xml @@ -1804,6 +1804,13 @@ 159 + + Sorry, but something went wrong + عذرا، لقد حدث خلل ما + + 49 + + Update تحديث @@ -1811,6 +1818,13 @@ 92 + + Select the file to upload + اختر الملف الذي تريد ارساله + + 6 + + Scheduled مبرمجة @@ -1916,6 +1930,20 @@ 177 + + Upload thumbnail + تحديث الصورة المصغرة + + 195 + + + + Upload preview + إرسال معاينة + + 202 + + Support الدعم @@ -2032,6 +2060,13 @@ 57 + + Dislike this video + إلغاء الإعجاب بهذه الفيديو + + 64 + + Download the video تنزيل الفيديو @@ -2060,6 +2095,13 @@ 91 + + Blacklist + حجب في القائمة السوداء + + 96 + + Blacklist this video حجب هذه الفيديو @@ -2109,6 +2151,13 @@ 152 + + Friendly Reminder: + تذكير أخوي: + + 208 + + More information المزيد من التفاصيل @@ -2259,6 +2308,13 @@ 1 + + Configuration updated. + تم تحديث الإعدادات + + 1 + + Unlimited بلا حدود @@ -2280,6 +2336,20 @@ 1 + + enabled + مفعّل + + 1 + + + + disabled + خامل + + 1 + + Comment updated. تم تحديث التعليق. @@ -2336,6 +2406,13 @@ 1 + + Ownership accepted + تم قبول الملكية + + 1 + + Password updated. تم تحديث الكلمة السرية. @@ -2343,6 +2420,13 @@ 1 + + You current password is invalid. + كلمتك السرية الحالية غير صالحة. + + 1 + + Are you sure you want to delete your account? This will delete all you data, including channels, videos etc. متأكد أنك تريد حذف حسابك ؟هذا سيحذف بياناتك,قنواتك,فيديوهاتك الخ. @@ -2413,6 +2497,20 @@ 1 + + Published + المنشورة + + 1 + + + + To import + للاستيراد + + 1 + + Channels القنوات @@ -2420,6 +2518,90 @@ 1 + + Subscribe to the account + الاشتراك في الحساب + + 1 + + + + Toggle the left menu + الانتقال إلى القائمة اليسرى + + 1 + + + + Go to the videos overview page + الذهاب إلى صفحة معاينة الفيديوهات + + 1 + + + + Go to the trending videos page + الذهاب إلى صفحة الفيديوهات الشائعة + + 1 + + + + Go to the recently added videos page + الذهاب إلى صفحةالفيديوهات المضافة حديثا + + 1 + + + + Go to the local videos page + الذهاب إلى صفحة الفيديوهات المحلية + + 1 + + + + Go to the videos upload page + الذهاب إلى صفحة إرسال الفيديوهات + + 1 + + + + Toggle Dark theme + التغيير إلى السمة الداكنة + + 1 + + + + Go to my subscriptions + الذهاب إلى اشتراكاتي + + 1 + + + + Go to my videos + الذهاب إلى فيديوهاتي + + 1 + + + + Go to my imports + الذهاب إلى استيراداتي + + 1 + + + + Go to my channels + الذهاب إلى قنواتي + + 1 + + You need to reconnect. يجب عليك إعادة الإتصال. @@ -2434,6 +2616,13 @@ 1 + + Keyboard Shortcuts: + اختصارات لوحة المفاتيح: + + 1 + + Incorrect username or password. اسم المستخدم أو كلمة المرور خاطئة. @@ -2448,6 +2637,13 @@ 1 + + Your password has been successfully reset! + لقد تم إعادة تعيين كلمتك السرية بنجاح! + + 1 + + Today اليوم @@ -2567,6 +2763,62 @@ 1 + + User role is required. + دور المستخدم مطلوب. + + 1 + + + + Display name is required. + عرض الاسم لازم. + + 1 + + + + Description must be at least 3 characters long. + طول الوصف يجب أن يتعدى 3حروف. + + 1 + + + + Report reason is required. + سبب الإبلاغ لازم. + + 1 + + + + Moderation comment is required. + تعليق الإشراف لازم. + + 1 + + + + The channel is required. + القناة لازمة. + + 1 + + + + The username is required. + اسم المستخدم مطلوب. + + 1 + + + + You can only transfer ownership to a local account + لا يمكن نقل الملكية إلى حساب محلي + + 1 + + Name is required. الاسم مطلوب. @@ -2574,6 +2826,13 @@ 1 + + Name cannot be more than 20 characters long. + طول الاسم لا يجب أن يتجاوز 20 حرفا. + + 1 + + Comment is required. التعليق مطلوب. @@ -2595,6 +2854,13 @@ 1 + + A tag should be less than 30 characters long. + طول الوسم لا يجب أن يتجاوز 30 حرفا. + + 1 + + This file is too large. حجم هذا الملف كبير جدًّا. @@ -2917,6 +3183,20 @@ 1 + + Clear + مسح + + 1 + + + + Torrent import + استيراد تورنت + + 1 + + Links الروابط @@ -2980,6 +3260,20 @@ 1 + + Too many attempts, please try again later. + محاولات كثيرة، يرجى العودة لاحقا. + + 1 + + + + Server error. Please retry later. + خطأ على السيرفر. يرجى إعادة المحاولة لاحقا. + + 1 + + Subscribed مشترك @@ -3036,6 +3330,13 @@ 1 + + Video reported. + فيديو تم الإبلاغ عنها. + + 1 + + Like the video الإعجاب بالفيديو diff --git a/client/src/locale/target/angular_eu_ES.xml b/client/src/locale/target/angular_eu_ES.xml index d30351a35..d17189c7a 100644 --- a/client/src/locale/target/angular_eu_ES.xml +++ b/client/src/locale/target/angular_eu_ES.xml @@ -601,6 +601,13 @@ 17 + + I am at least 16 years old and agree to the <a href='/about/instance#terms-section' target='_blank'rel='noopener noreferrer'>Terms</a> of this instance + 16 urte edo gehiago ditut eta onartzen ditut instantzia honen <a href='/about/instance#terms-section' target='_blank'rel='noopener noreferrer'>erabilera badintzak</a> + + 55 + + Signup Eman izena @@ -633,6 +640,19 @@ 6 + + + Filters + + + + Iragazkiak + + + + 16 + + No results found @@ -1239,6 +1259,19 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. 83 + + + PeerTube is in its early stages, and want to deliver the best countermeasures possible by the time the stable is released. + In the meantime, we want to test different ideas related to this issue: + + + PeerTube oso berria da oraindik, eta egonkortzen denerako babes-neurri egokienak ezarri nahi ditugu. + Bitartean, hainbat ideia saiatu nahi ditugu gai honen inguruan: + + + 85 + + Set a limit to the number of peers sent by the tracker Tracker-ak bidaltzen dituen berdin kopurua mugatzea @@ -1984,6 +2017,20 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. 133 + + User's email must be verified to login + Erabiltzailearen e-mail helbidea baieztatu behar da saioa hasi aurretik + + 70 + + + + User's email is verified / User can login without email verification + Erabiltzailearen e-mail helbidea baieztatuta dago / Erabiltzaileak e-mail helbidea baieztatu gabe saioa hasi dezake + + 74 + + Ban reason: Debekatzeko arrazoia: @@ -2465,6 +2512,13 @@ Kanal honetara bideo bat igotzen duzunean, bideoa babesteko eremua testu honekin 3 + + Use WebTorrent to exchange parts of the video with others + Erabili WebTorrent bideoaren zatiak besteekin partekatzeko + + 21 + + Automatically plays video Automatikoki abiatzen du bideoa @@ -2507,6 +2561,13 @@ Kanal honetara bideo bat igotzen duzunean, bideoa babesteko eremua testu honekin 18 + + Once you delete your account, there is no going back. Please be certain. + Behin kontua ezabatuta ez dago atzera egiterik. Ziurtatu hau dela nahi duzuna. + + 2 + + Delete your account Ezabatu zure kontua @@ -2621,6 +2682,13 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 159 + + Sorry, but something went wrong + Akatsen bat egon da + + 49 + + Congratulations, the video behind will be imported! You can already add information about this video. @@ -2885,6 +2953,13 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 159 + + Will be created on update + Eguneratzean sortuko da + + 167 + + Cancel create Ezeztatu sorkuntza @@ -2892,6 +2967,13 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 169 + + Will be deleted on update + Eguneratzean ezabatuko da + + 175 + + Cancel deletion Ezeztatu ezabaketa @@ -2899,6 +2981,17 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 177 + + + No captions for now. + + + Azpititulurik ez oraingoz. + + + 182 + + Captions Azpitituluak @@ -3337,6 +3430,24 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 20 + + You are one step away from commenting + Iruzkina egitetik urrats batera zaude + + 28 + + + + + If you have an account on this instance, you can login: + + + Instantzia honetan kontua baduzu, saioa hasi dezakezu: + + + 32 + + login to comment hasi saioa iruzkinak egiteko @@ -3344,6 +3455,15 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 35 + + + If you have an account on Mastodon or Pleroma, you can open it directly in their interface: + + Mastodon edo Pleroma sareetan kontua baduzu, zuzenean ireki dezakezu hango interfazean: + + 41 + + Highlighted comment Nabarmendutako iruzkina @@ -3596,6 +3716,20 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + Account unmuted by your instance. + kontua zure instantziak desmutututa. + + 1 + + + + Instance unmuted by your instance. + instantzia zure instantziak demutututa. + + 1 + + Comment updated. Iruzkina eguneratua. @@ -3687,6 +3821,13 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + Set Email as Verified + Ezarri e-maila baieztatua gisa + + 1 + + You cannot ban root. Ezin duzu root debekatu @@ -3694,6 +3835,20 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + Do you really want to unban users? + Ziur erabiltzaileei debekua kendu nahi diozula? + + 1 + + + + users unbanned. + erabiltzaileei debekua kendu zaie. + + 1 + + You cannot delete root. Ezin duzu erroa ezabatu. @@ -3708,6 +3863,34 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + users deleted. + erabiltzaile ezabatuta. + + 1 + + + + users email set as verified. + erabiltzailearen e-mail helbidea baieztatua gisa ezarri da. + + 1 + + + + Account unmuted. + kontua desmutututa. + + 1 + + + + Instance unmuted. + instantzia desmutututa. + + 1 + + Ownership accepted Jabetza onartuta @@ -3722,6 +3905,13 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + You current password is invalid. + Zure uneko pasahitza baliogabea da. + + 1 + + Are you sure you want to delete your account? This will delete all you data, including channels, videos etc. Ziur kontua ezabatu nahi duzula? Honek zure datu guztiak ezabatuko ditu, kanalak, bideoak eta abar barne. @@ -3932,6 +4122,13 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + Toggle the left menu + Txandakatu ezkerreko menua + + 1 + + Go to the videos overview page Joan bideoen ikuspegi orokorraren orrira @@ -3939,6 +4136,69 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + Go to the trending videos page + Joan puri-purian dauden bideoen orrira + + 1 + + + + Go to the recently added videos page + Joan gehitutako azken bideoen orrira + + 1 + + + + Go to the local videos page + Joan bideo lokalen orrira + + 1 + + + + Go to the videos upload page + Joan bideoak igotzeko orrira + + 1 + + + + Toggle Dark theme + Txandakatu gai iluna + + 1 + + + + Go to my subscriptions + Joan nire harpidetzetara + + 1 + + + + Go to my videos + Joan nire bideoetara + + 1 + + + + Go to my imports + Joan nire inportazioetara + + 1 + + + + Go to my channels + Joan nire kanaletara + + 1 + + Cannot retrieve OAuth Client credentials: . @@ -3969,6 +4229,13 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + Keyboard Shortcuts: + Teklatu laster-bideak: + + 1 + + Incorrect username or password. Erabiltzaile-izen edo pasahitz okerra. @@ -4326,6 +4593,13 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + Description cannot be more than 1000 characters long. + Deskripzioa ezin da 1000 karaktere baino luzeagoa izan. + + 1 + + You must to agree with the instance terms in order to registering on it. Instantziaren baldintzak onartu behar dituzu bertan izena emateko. @@ -5103,6 +5377,13 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + users banned. + erabiltzaile debekatuta. + + 1 + + User banned. erabiltzailea debekatuta. @@ -5124,6 +5405,13 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + If you remove this user, you will not be able to create another with the same username! + Erabiltzaile hau kentzen baduzu, ezin izango duzu erabiltzaile-izen bera duen beste bat sortu gero! + + 1 + + User deleted. erabiltzailea ezabatuta. @@ -5131,6 +5419,13 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + User email set as verified + erabiltzailearen e-mail helbidea baieztatua gisa ezarri da + + 1 + + Account muted. kontua mutututa. @@ -5138,6 +5433,41 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + Instance muted. + instantzia mutututa. + + 1 + + + + Account muted by the instance. + kontua instantziak mutututa. + + 1 + + + + Account unmuted by the instance. + kontua instantziak desmutututa. + + 1 + + + + Instance muted by the instance. + instantzia instantziak mutututa. + + 1 + + + + Instance unmuted by the instance. + kontua instantziak desmutututa. + + 1 + + Mute this account Mututu kontu hau @@ -5278,6 +5608,20 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + Welcome! Now please check your emails to verify your account and complete signup. + Ongi etorri! Egiaztatu zure e-maila kontua baieztatzeko eta izen ematea osatzeko. + + 1 + + + + You are now logged in as ! + gisa hasi duzu saioa! + + 1 + + Video to import updated. Inportatzeko bideoa eguneratuta. @@ -5327,6 +5671,20 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + Your video quota is exceeded with this video (video size: , used: , quota: ) + Zure bideo-kuota bideo honekin gainditzen da (bideoaren tamaina: , erabilita: , kuota: ) + + 1 + + + + Your daily video quota is exceeded with this video (video size: , used: , quota: ) + Zure eguneko bideo-kuota bideo honekin gainditzen da (bideoaren tamaina: , erabilita: , kuota: ) + + 1 + + Video published. Bideoa argitaratuta. diff --git a/client/src/locale/target/angular_it_IT.xml b/client/src/locale/target/angular_it_IT.xml index dea48b4a7..2f5178484 100644 --- a/client/src/locale/target/angular_it_IT.xml +++ b/client/src/locale/target/angular_it_IT.xml @@ -613,6 +613,19 @@ 6 + + + Filters + + + + Filtri + + + + 16 + + No results found @@ -1646,6 +1659,21 @@ </pre> + + Scrivi direttamente codice CSS .Esempio:<br /> + <pre> + body + background-color: red; + + </pre> + + Precedi con <em>#custom-css</em> per sovrascrivere stili. Esempio: + <pre> + #custom-css .logged-in-email + color: red; + + </pre> + 297 @@ -1901,6 +1929,10 @@ Transcoding is enabled on server. The video quota only take in account original video. At most, this user could use ~ . + + Il Transcoding e abilitato sul server. La quota video considera solo originale video. + In totale, questo utente potrebbe usare ~ . + 65 @@ -2292,6 +2324,8 @@ Short text to tell people how they can support your channel (membership platform...).<br /><br /> When you will upload a video in this channel, the video support field will be automatically filled by this text. + Breve testo per dire alla gente come possono supportare il tuo canale (iscrizione piattaforma...).<br /><br /> +Quando tu carichi un video su questo canale. il campo di supporto per il video verra riempito con questo testo. 52 @@ -2970,6 +3004,9 @@ When you will upload a video in this channel, the video support field will be au The url is not secured (no HTTPS), so the embed video won't work on HTTPS websites (web browsers block non secured HTTP requests on HTTPS websites). + + L'url non è sicuro (no HTTPS), quindi il video "incluso" non funzionerà su siti HTTPS (il browser blocca richieste verso siti HTTP su siti in cui HTTPS è abilitato). + 45 @@ -2992,6 +3029,9 @@ When you will upload a video in this channel, the video support field will be au The video is being imported, it will be available when the import is finished. + + Il video è nella fase di import, sarà disponibile quando l'import sarà completato. + 11 @@ -3028,6 +3068,9 @@ When you will upload a video in this channel, the video support field will be au Published - views + + Pubblicato - visioni + 37 @@ -3297,6 +3340,20 @@ Altri video 1 + + 240p + 240p + + 1 + + + + 360p + 360p + + 1 + + SuccessSuccess 1 @@ -3316,6 +3373,48 @@ Altri video 1 + + 100MB + 100MB + + 1 + + + + 500MB + 500MB + + 1 + + + + 1GB + 1GB + + 1 + + + + 5GB + 5GB + + 1 + + + + 20GB + 20GB + + 1 + + + + 50GB + 50GB + + 1 + + 10MB 10MB @@ -3400,6 +3499,13 @@ Altri video 1 + + enabled + attivato + + 1 + + disabled disabilitato @@ -3421,6 +3527,13 @@ Altri video 1 + + Delete this report + Elimina questa segnalazione + + 1 + + Update moderation comment Modifica commento di moderazione @@ -3442,6 +3555,13 @@ Altri video 1 + + Do you really want to delete this abuse report? + Vuoi veramente eliminare questa segnalazione di abuso? + + 1 + + Abuse deleted.Abuse deleted. 1 @@ -3501,6 +3621,13 @@ Altri video 1 + + users deleted. + utenti eliminati. + + 1 + + Ownership acceptedOwnership accepted 1 @@ -3576,6 +3703,13 @@ Altri video 1 + + This name already exists on this instance. + Questo nome esiste già nell'istanza. + + 1 + + Create Crea @@ -3705,6 +3839,13 @@ Altri video 1 + + Go to the videos overview page + Vai alla pagina di anteprima dei video + + 1 + + Cannot retrieve OAuth Client credentials: . diff --git a/client/src/locale/target/angular_oc.xml b/client/src/locale/target/angular_oc.xml index c353ead7a..26ff5264e 100644 --- a/client/src/locale/target/angular_oc.xml +++ b/client/src/locale/target/angular_oc.xml @@ -1578,6 +1578,17 @@ 198 + + If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br /> + If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.<br /><br /> + Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> to see if you instance is whitelisted. + Se vòstra instància es mesa en lista blanca per Twitter, un lector vidèo serà integrat pel fil Twitter sul partatge d’una vidèo PeerTube.<br /> + Se l’instància es pas en lista blanca, utilizam un imatge amb un ligam que mena a l’instància PeerTube.<br /><br /> + Clicatz aquesta bóstia, salvagardatz la configuracion e ensajatz amb l’URL d’una vidèo de vòstra instància (https://exemple.com/videos/watch/blabla) sus <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> per veire se vòstra instància es en lista blanca. + + 199 + + Services Servicis @@ -2022,6 +2033,20 @@ 133 + + User's email must be verified to login + Lo corrièl de l’utilizaire deu èsser verificat abans la connexion + + 70 + + + + User's email is verified / User can login without email verification + Lo corrièl de l’utilizaire es verificat / Pòt se connectar sens verificacion de l’adreça + + 74 + + Ban reason: Rason del bandiment : @@ -2680,6 +2705,13 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 159 + + Sorry, but something went wrong + O planhèm, quicòm a trucat + + 49 + + Congratulations, the video behind will be imported! You can already add information about this video. @@ -3836,6 +3868,13 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 + + Set Email as Verified + Passar l’adreça coma verificada + + 1 + + You cannot ban root. Podètz pas fòrabandir lo root. @@ -3878,6 +3917,13 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 + + users email set as verified. + adreças d’utilizaires passadas coma verificadas. + + 1 + + Account unmuted. Compte pas mai mut. @@ -5420,6 +5466,13 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 + + User email set as verified + L’adreça a es passada coma verificada + + 1 + + Account muted. Lo compte es mut. @@ -5602,6 +5655,20 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 + + Welcome! Now please check your emails to verify your account and complete signup. + La benvenguda ! Ara volgatz ben verificar vòstres corrièls per confirmar vòstre compte e acabar l’inscripcion. + + 1 + + + + You are now logged in as ! + Sètz ara connectat coma ! + + 1 + + Video to import updated. Vidèo d’importar actualizada diff --git a/client/src/locale/target/angular_pl_PL.xml b/client/src/locale/target/angular_pl_PL.xml index fd6e03469..e8494997a 100644 --- a/client/src/locale/target/angular_pl_PL.xml +++ b/client/src/locale/target/angular_pl_PL.xml @@ -1601,6 +1601,10 @@ Transcoding is enabled on server. The video quota only take in account original video. At most, this user could use ~ . + + Transcoding is enabled on server. The video quota only take in account original video. + At most, this user could use ~ . + 65 diff --git a/client/src/locale/target/angular_sv_SE.xml b/client/src/locale/target/angular_sv_SE.xml index e30575d80..eadcfa444 100644 --- a/client/src/locale/target/angular_sv_SE.xml +++ b/client/src/locale/target/angular_sv_SE.xml @@ -5550,6 +5550,20 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + Welcome! Now please check your emails to verify your account and complete signup. + Välkommen! Kontrollera gärna din e-post för att verifiera ditt konto och fullfölja kontoskapandet. + + 1 + + + + You are now logged in as ! + Du är nu inloggad som ! + + 1 + + Video to import updated. Videon att importera har uppdaterats. diff --git a/client/src/locale/target/angular_zh_Hant_TW.xml b/client/src/locale/target/angular_zh_Hant_TW.xml index 4779d9cc8..028520a6e 100644 --- a/client/src/locale/target/angular_zh_Hant_TW.xml +++ b/client/src/locale/target/angular_zh_Hant_TW.xml @@ -1538,6 +1538,17 @@ 198 + + If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br /> + If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.<br /><br /> + Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> to see if you instance is whitelisted. + 如果您的實體在 Twitter 的白名單裡面，PeerTube 的影片分享將會在 Twitter 的推文中嵌入影片播放器。<br /> + 如果實體不在白名單中，我們會使用一張圖片連結卡片並重新導向至您的 PeerTube 實體。<br /><br /> + 在此勾選框打勾，儲存設定並使用您實體的影片 URL (https://example.com/videos/watch/blabla)在 <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> 上測試以檢視您的實體是否在白名單內。 + + 199 + + Services 服務 @@ -1972,6 +1983,20 @@ 133 + + User's email must be verified to login + 使用者的電子郵件必須驗證過才能登入 + + 70 + + + + User's email is verified / User can login without email verification + 使用者的電子郵件已驗證／使用者可以不透過電子郵件驗證登入 + + 74 + + Ban reason: 阻擋理由： @@ -2628,6 +2653,13 @@ When you will upload a video in this channel, the video support field will be au 159 + + Sorry, but something went wrong + 抱歉，不過好像有什麼東西出錯了 + + 49 + + Congratulations, the video behind will be imported! You can already add information about this video. @@ -3778,6 +3810,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + Set Email as Verified + 設定電子郵件為已驗證 + + 1 + + You cannot ban root. 您不能阻擋 root。 @@ -3820,6 +3859,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + users email set as verified. + 個使用者電子郵件設定為已驗證。 + + 1 + + Account unmuted. 帳號 已解除靜音。 @@ -5362,6 +5408,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + User email set as verified + 使用者 的電子郵件設定為已驗證 + + 1 + + Account muted. 帳號 已解除靜音。 @@ -5544,6 +5597,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Welcome! Now please check your emails to verify your account and complete signup. + 歡迎！現在請檢查您的電子郵件以驗證您的帳號並完成註冊。 + + 1 + + + + You are now logged in as ! + 您現在登入為 ！ + + 1 + + Video to import updated. 要匯入的影片已更新。 diff --git a/client/src/locale/target/iso639_pl_PL.xml b/client/src/locale/target/iso639_pl_PL.xml deleted file mode 100644 index b483f5ce8..000000000 --- a/client/src/locale/target/iso639_pl_PL.xml +++ /dev/null @@ -1,695 +0,0 @@ - - - - - - - Afar - Afar - - - Abkhazian - Abchaski - - - Afrikaans - Afrikaans - - - Akan - Akan - - - Amharic - Amharski - - - Arabic - Arabski - - - Aragonese - - - American Sign Language - Amerykański Język Migowy - - - Assamese - - - Avaric - Awarski - - - Kotava - - - Aymara - - - Azerbaijani - - - Bashkir - Baszkirski - - - Bambara - Bambara - - - Belarusian - Białoruski - - - Bengali - Bengalski - - - British Sign Language - Brytyjski Język Migowy - - - Bislama - Bislama - - - Tibetan - Tybetański - - - Bosnian - Bośniacki - - - Breton - Bretoński - - - Bulgarian - Bułgarski - - - Brazilian Sign Language - - - Catalan - Kataloński - - - Czech - Czeski - - - Chamorro - - - Chechen - - - Chuvash - - - Cornish - Kornijski - - - Corsican - Korsykański - - - Cree - Kri - - - Czech Sign Language - Czeski Język Migowy - - - Chinese Sign Language - Chiński Język Migowy - - - Welsh - Walijski - - - Danish - Duński - - - German - Niemiecki - - - Dhivehi - - - Danish Sign Language - Duński Język Migowy - - - Dzongkha - Dzongkha - - - Modern Greek (1453-) - Nowogrecki (1453-) - - - English - Angielski - - - Esperanto - - - Estonian - Estoński - - - Basque - Baskijski - - - Ewe - Ewe - - - Faroese - - - Persian - Perski - - - Fijian - Fidżyjski - - - Finnish - Fiński - - - French - Francuski - - - Western Frisian - - - French Sign Language - Francuski Język Migowy - - - Fulah - Ful - - - Scottish Gaelic - - - Irish - Irlandzki - - - Galician - Galicyjski - - - Manx - - - Guarani - - - German Sign Language - Niemiecki Język Migowy - - - Gujarati - - - Haitian - - - Hausa - Hausa - - - Serbo-Croatian - Serbsko-Chorwacki - - - Hebrew - - - Herero - - - Hindi - Hindi - - - Hiri Motu - - - Croatian - Chorwacki - - - Hungarian - Węgierski - - - Armenian - Ormański - - - Igbo - Igbo - - - Sichuan Yi - - - Inuktitut - - - Indonesian - Indonezyjski - - - Inupiaq - - - Icelandic - Islandzki - - - Italian - Włoski - - - Javanese - Jawajski - - - Lojban - - - Japanese - Japoński - - - Japanese Sign Language - Japoński Język Migowy - - - Kalaallisut - - - Kannada - - - Kashmiri - - - Georgian - - - Kanuri - - - Kazakh - - - Khmer - - - Kikuyu - - - Kinyarwanda - - - Kirghiz - - - Komi - Komi - - - Kongo - Kongo - - - Korean - Koreański - - - Kuanyama - - - Kurdish - Kurdyjski - - - Lao - Laotański - - - Latvian - Łotewski - - - Limburgan - - - Lingala - - - Lithuanian - Litewski - - - Luxembourgish - Luksemburski - - - Luba-Katanga - - - Ganda - - - Marshallese - - - Malayalam - - - Marathi - - - Macedonian - - - Malagasy - - - Maltese - - - Mongolian - - - Maori - - - Malay (macrolanguage) - - - Burmese - - - Nauru - Naurański - - - Navajo - - - South Ndebele - - - North Ndebele - - - Ndonga - - - Nepali (macrolanguage) - - - Dutch - Holenderski - - - Norwegian Nynorsk - Norweski Nynorsk - - - Norwegian Bokmål - Norweski Bokmål - - - Norwegian - Norweski - - - Nyanja - - - Occitan - - - Ojibwa - - - Oriya (macrolanguage) - - - Oromo - Oromo - - - Ossetian - - - Panjabi - - - Pakistan Sign Language - - - Polish - Polski - - - Portuguese - Portugalski - - - Pushto - Paszto - - - Quechua - - - Romansh - Romansz - - - Romanian - Rumuński - - - Russian Sign Language - Rosyjski Język Migowy - - - Rundi - Rundi - - - Russian - Rosyjski - - - Sango - Sango - - - Saudi Arabian Sign Language - - - South African Sign Language - - - Sinhala - - - Slovak - Słowacki - - - Slovenian - Słoweński - - - Northern Sami - - - Samoan - Samoański - - - Shona - Shona - - - Sindhi - Sindhi - - - Somali - Somalijski - - - Southern Sotho - - - Spanish - Hiszpański - - - Albanian - - - Sardinian - - - Serbian - Serbski - - - Swati - - - Sundanese - - - Swahili (macrolanguage) - - - Swedish - Szwedzki - - - Swedish Sign Language - Szwedzki Język Migowy - - - Tahitian - - - Tamil - Tamilski - - - Tatar - Tatarski - - - Telugu - Telugu - - - Tajik - Tadżycki - - - Tagalog - Tagalski - - - Thai - Tajski - - - Tigrinya - - - Klingon - - - Tonga (Tonga Islands) - - - Tswana - - - Tsonga - - - Turkmen - Turkmeński - - - Turkish - Turecki - - - Twi - Twi - - - Uighur - - - Ukrainian - Ukraiński - - - Urdu - Urdu - - - Uzbek - Uzbecki - - - Venda - Venda - - - Vietnamese - Wietnamski - - - Walloon - Waloński - - - Wolof - Wolof - - - Xhosa - Xhosa - - - Yiddish - Jidysz - - - Yoruba - Joruba - - - Zhuang - Zhuang - - - Chinese - Chiński - - - Zulu - Zulu - - - \ No newline at end of file diff --git a/client/src/locale/target/player_ar_001.xml b/client/src/locale/target/player_ar_001.xml index f81c084d4..4e3a12ad7 100644 --- a/client/src/locale/target/player_ar_001.xml +++ b/client/src/locale/target/player_ar_001.xml @@ -81,7 +81,7 @@ Subtitles - ترجمة + الترجمات subtitles off diff --git a/client/src/locale/target/player_it_IT.json b/client/src/locale/target/player_it_IT.json new file mode 100644 index 000000000..add193bfe --- /dev/null +++ b/client/src/locale/target/player_it_IT.json @@ -0,0 +1 @@ +{"Audio Player":"Riproduttore Audio","Video Player":"Riproduttore Video","Play":"Play","Pause":"Pausa","Replay":"Replay","Current Time":"Posizione attuale","Duration":"Durata","Remaining Time":"Tempo rimanente","Stream Type":"Tipo dello Streaming","LIVE":"LIVE","Loaded":"Caricato","Progress":"Stato","Progress Bar":"Barra di progresso","progress bar timing: currentTime={1} duration={2}":"{1} di {2}","Fullscreen":"Schermo intero","Non-Fullscreen":"Chiudi schermo intero","Mute":"Muto","Unmute":"Audio ","Playback Rate":"Velocità di riproduzione","Subtitles":"Sottotitoli","subtitles off":"Senza sottotitoli","Captions":"Sottotitoli per non udenti","captions off":"Senza sottotitoli per non udenti","Chapters":"Capitoli","Descriptions":"Descrizioni","descriptions off":"Descrizioni disattivate","Audio Track":"Traccia Audio","Volume Level":"Volume","You aborted the media playback":"La riproduzione del filmato è stata interrotta","A network error caused the media download to fail part-way.":"Il download del filmato è stato interrotto a causa di un problema rete.","The media could not be loaded, either because the server or network failed or because the format is not supported.":"Il filmato non può essere caricato a causa di un errore nel server o nella rete o perché il formato non viene supportato.","The media playback was aborted due to a corruption problem or because the media used features your browser did not support.":"La riproduzione del filmato è stata interrotta a causa di un file danneggiato o per l’utilizzo di impostazioni non supportate dal browser.","No compatible source was found for this media.":"Non ci sono fonti compatibili per questo filmato.","The media is encrypted and we do not have the keys to decrypt it.":"Il filmato è crittato e non disponiamo delle chiavi per decrittarlo","Play Video":"Riproduci Video","Close":"Chiudi","Close Modal Dialog":"Chiudi finestra di dialogo","Modal Window":"Finestra di dialogo","This is a modal window":"Questa è una finestra di dialogo","This modal can be closed by pressing the Escape key or activating the close button.":"Questa finestra di dialogo può essere chiusa premendo Esc o cliccando sul pulsante chiudi.",", opens captions settings dialog":", apri la finestra delle impostazioni delle didascalie",", opens subtitles settings dialog":", apri la finestra delle impostazioni dei sottotitoli",", opens descriptions settings dialog":", apri la finestra delle impostazioni delle descrizioni",", selected":", selezionati","captions settings":"impostazioni delle didascalie","subtitles settings":"impostazioni dei sottotitoli","descriptions settings":"impostazioni delle descrizioni","Text":"Testo","White":"Bianco","Black":"Nero","Red":"Rosso","Green":"Verde","Blue":"Blu","Yellow":"Giallo","Magenta":"Magenta","Cyan":"Ciano","Background":"Sfondo","Window":"Finestra","Transparent":"Trasparente","Semi-Transparent":"Semi-Trasparente","Opaque":"Opaco","Font Size":"Dimensione del Testo","Text Edge Style":"Stile dei Bordi del Testo","None":"Nessuno","Raised":"In Rilievo","Depressed":"Incavato","Uniform":"Uniforme","Dropshadow":"Ombreggiatura","Font Family":"Stile del Testo","Proportional Sans-Serif":"Senza Grazie Proporzionale","Monospace Sans-Serif":"Senza Grazie Monospazio","Proportional Serif":"Con Grazie Proporzionale","Monospace Serif":"Con Grazie Monospazio","Casual":"Casuale","Script":"Codice","Small Caps":"Maiuscoletto","Reset":"Ripristina","restore all settings to the default values":"ripristina tutte le impostazioni ai valori predefiniti","Done":"Fatto","Caption Settings Dialog":"Finestra delle Impostazioni dei Sottotitoli","Beginning of dialog window. Escape will cancel and close the window.":"Apertura della finestra di dialogo. Premendo ESC si annullerà e si chiuderà la finestra.","End of dialog window.":"Chiusura della finestra di dialogo.","{1} is loading.":"{1} è in caricamento.","Quality":"Qualità","Auto":"Auto","Speed":"Velocità","Subtitles/CC":"Sottotitoli/CC","peers":"nodi","Go to the video page":"Vai alla pagina del video","Settings":"Impostazioni","Uses P2P, others may know you are watching this video.":"Usa P2P, altri potrebbero sapere che stai guardando questo video.","Copy the video URL":"Copia l'URL del video","Copy the video URL at the current time":"Copia l'URL del video della posizione corrente","Copy embed code":"Copia il codice per incorporare"} \ No newline at end of file diff --git a/client/src/locale/target/player_pl_PL.json b/client/src/locale/target/player_pl_PL.json new file mode 100644 index 000000000..2178a137d --- /dev/null +++ b/client/src/locale/target/player_pl_PL.json @@ -0,0 +1 @@ +{"Audio Player":"Odtwarzacz audio","Video Player":"Odtwarzacz wideo","Play":"Odtwórz","Pause":"Wstrzymaj","Replay":"Powtórz","Current Time":"Obecny czas","Duration":"Czas trwania","Remaining Time":"Pozostały czas","Stream Type":"Rodzaj strumienia","LIVE":"NA ŻYWO","Loaded":"Załadowano","Progress":"Postęp","Progress Bar":"Pasek postępu","progress bar timing: currentTime={1} duration={2}":"{1} z {2}","Fullscreen":"Pełny ekran","Non-Fullscreen":"Bez pełnego ekranu","Mute":"Wycisz","Unmute":"Cofnij wyciszenie","Playback Rate":"Szybkość odtwarzania","Subtitles":"Napisy","subtitles off":"napisy są wyłączone","Captions":"CC","captions off":"CC są wyłączone","Chapters":"Rozdziały","Descriptions":"Opisy","descriptions off":"opisy są wyłączone","Audio Track":"Ścieżka dźwiękowa","Volume Level":"Poziom głośności","You aborted the media playback":"Przerwałeś odtwarzanie zawartości mulimedialnej","A network error caused the media download to fail part-way.":"Błąd sieci spowodował, że zawartość multimedialna została pobrana tylko częściowo.","The media could not be loaded, either because the server or network failed or because the format is not supported.":"Nie udało się załadować zawartości multimedialnej z powodu błędy sieci lub serwera lub ponieważ format nie jest obsługiwany.","The media playback was aborted due to a corruption problem or because the media used features your browser did not support.":"Odtwarzanie zostało przerwane ze względu na uszkodzenie pliku lub przez brak wsparcia funkcji multimediów przez Twoją przeglądarkę.","No compatible source was found for this media.":"Nie znaleziono kompatybilnego źródła dla tego media.","The media is encrypted and we do not have the keys to decrypt it.":"Zawartość multimedialna jest zaszyfrowana, a klucz do jej odszyfrowania jest nieznany.","Play Video":"Odtwórz film","Close":"Zamknij","Close Modal Dialog":"Zamknij okno modalne","Modal Window":"Okno modalne","This is a modal window":"To jest okno modalne","This modal can be closed by pressing the Escape key or activating the close button.":"To okno może zostać zamknięte klawiszem Escape lub przyciskiem zamykania.",", opens captions settings dialog":", otwiera okno ustawień CC",", opens subtitles settings dialog":", otwiera okno ustawień napisów",", opens descriptions settings dialog":", otwiera okno ustawień opisów",", selected":", zaznaczone","captions settings":"ustawienia CC","subtitles settings":"ustawienia napisów","descriptions settings":"ustawienia opisów","Text":"Tekst","White":"Biały","Black":"Czarny","Red":"Czerwony","Green":"Zielony","Blue":"Niebieski","Yellow":"Żółty","Magenta":"Magenta","Cyan":"Cyjanowy","Background":"Tło","Window":"Okno","Transparent":"Przezroczyste","Semi-Transparent":"Półprzezroczyste","Opaque":"Widoczne","Font Size":"Rozmiar czcionki","Text Edge Style":"Styl krawędzi tekstu","None":"Brak","Raised":"Wypukłe","Depressed":"Wgłębione","Uniform":"Jednolity","Dropshadow":"Cień","Font Family":"Rodzina czcionek","Proportional Sans-Serif":"Proporcjonalne bezszeryfowe","Monospace Sans-Serif":"Bezszeryfowe o stałej szerokości","Proportional Serif":"Proporcjonalne szeryfowe","Monospace Serif":"Szeryfowe o stałej szerokości","Casual":"Ozdobne","Script":"Pismo odręczne","Small Caps":"Kapitaliki","Reset":"Resetuj","restore all settings to the default values":"przywróć wszystkie ustawienia do wartości domyślnych","Done":"Gotowe","Caption Settings Dialog":"Okno ustawień napisów","Beginning of dialog window. Escape will cancel and close the window.":"Początek okna dialogowego. Przycisk Escape anuluje i zamknie okno.","End of dialog window.":"Koniec okna dialogowego.","{1} is loading.":"{1} ładuje się.","Quality":"Jakość","Auto":"Automatyczna","Speed":"Prędkość","Subtitles/CC":"Napisy/CC","peers":"peers","Go to the video page":"Przejdź na stronę filmu","Settings":"Ustawienia","Uses P2P, others may know you are watching this video.":"Korzysta z P2P, inni mogą dowiedzieć się, że oglądasz ten film.","Copy the video URL":"Skopiuj adres URL filmu","Copy the video URL at the current time":"Skopiuj adres URL filmu z obecnym czasem","Copy embed code":"Skopiuj kod do osadzenia"} \ No newline at end of file diff --git a/client/src/locale/target/player_pl_PL.xml b/client/src/locale/target/player_pl_PL.xml deleted file mode 100644 index 2affa5948..000000000 --- a/client/src/locale/target/player_pl_PL.xml +++ /dev/null @@ -1,383 +0,0 @@ - - - - - - - Audio Player - Odtwarzacz audio - - - Video Player - Odtwarzacz wideo - - - Play - Odtwórz - - - Pause - Wstrzymaj - - - Replay - Powtórz - - - Current Time - Obecny czas - - - Duration - Czas trwania - - - Remaining Time - Pozostały czas - - - Stream Type - Rodzaj strumienia - - - LIVE - NA ŻYWO - - - Loaded - Załadowano - - - Progress - Postęp - - - Progress Bar - Pasek postępu - - - {1} of {2} - {1} z {2} - - - Fullscreen - Pełny ekran - - - Non-Fullscreen - Bez pełnego ekranu - - - Mute - Wycisz - - - Unmute - Cofnij wyciszenie - - - Playback Rate - Szybkość odtwarzania - - - Subtitles - Napisy - - - subtitles off - napisy są wyłączone - - - Captions - CC - - - captions off - CC są wyłączone - - - Chapters - Rozdziały - - - Descriptions - Opisy - - - descriptions off - opisy są wyłączone - - - Audio Track - Ścieżka dźwiękowa - - - Volume Level - Poziom głośności - - - You aborted the media playback - Przerwałeś odtwarzanie zawartości mulimedialnej - - - A network error caused the media download to fail part-way. - Błąd sieci spowodował, że zawartość multimedialna została pobrana tylko częściowo. - - - The media could not be loaded, either because the server or network failed or because the format is not supported. - Nie udało się załadować zawartości multimedialnej z powodu błędy sieci lub serwera lub ponieważ format nie jest obsługiwany. - - - The media playback was aborted due to a corruption problem or because the media used features your browser did not support. - Odtwarzanie zostało przerwane ze względu na uszkodzenie pliku lub przez brak wsparcia funkcji multimediów przez Twoją przeglądarkę. - - - No compatible source was found for this media. - Nie znaleziono kompatybilnego źródła dla tego media. - - - The media is encrypted and we do not have the keys to decrypt it. - Zawartość multimedialna jest zaszyfrowana, a klucz do jej odszyfrowania jest nieznany. - - - Play Video - Odtwórz film - - - Close - Zamknij - - - Close Modal Dialog - Zamknij okno modalne - - - Modal Window - Okno modalne - - - This is a modal window - To jest okno modalne - - - This modal can be closed by pressing the Escape key or activating the close button. - To okno może zostać zamknięte klawiszem Escape lub przyciskiem zamykania. - - - , opens captions settings dialog - , otwiera okno ustawień CC - - - , opens subtitles settings dialog - , otwiera okno ustawień napisów - - - , opens descriptions settings dialog - , otwiera okno ustawień opisów - - - , selected - , zaznaczone - - - captions settings - ustawienia CC - - - subititles settings - ustawienia napisów - - - descriptions settings - ustawienia opisów - - - Text - Tekst - - - White - Biały - - - Black - Czarny - - - Red - Czerwony - - - Green - Zielony - - - Blue - Niebieski - - - Yellow - Żółty - - - Magenta - Magenta - - - Cyan - Cyjanowy - - - Background - Tło - - - Window - Okno - - - Transparent - Przezroczyste - - - Semi-Transparent - Półprzezroczyste - - - Opaque - Widoczne - - - Font Size - Rozmiar czcionki - - - Text Edge Style - Styl krawędzi tekstu - - - None - Brak - - - Raised - Wypukłe - - - Depressed - Wgłębione - - - Uniform - Jednolity - - - Dropshadow - Cień - - - Font Family - Rodzina czcionek - - - Proportional Sans-Serif - Proporcjonalne bezszeryfowe - - - Monospace Sans-Serif - Bezszeryfowe o stałej szerokości - - - Proportional Serif - Proporcjonalne szeryfowe - - - Monospace Serif - Szeryfowe o stałej szerokości - - - Casual - Ozdobne - - - Script - Pismo odręczne - - - Small Caps - Kapitaliki - - - Reset - Resetuj - - - restore all settings to the default values - przywróć wszystkie ustawienia do wartości domyślnych - - - Done - Gotowe - - - Caption Settings Dialog - Okno ustawień napisów - - - Beginning of dialog window. Escape will cancel and close the window. - Początek okna dialogowego. Przycisk Escape anuluje i zamknie okno. - - - End of dialog window. - Koniec okna dialogowego. - - - {1} is loading. - {1} ładuje się. - - - Quality - Jakość - - - Auto - Automatyczna - - - Speed - Prędkość - - - Subtitles/CC - Napisy/CC - - - peers - peers - - - Go to the video page - Przejdź na stronę filmu - - - Settings - Ustawienia - - - Uses P2P, others may know you are watching this video. - Korzysta z P2P, inni mogą dowiedzieć się, że oglądasz ten film. - - - Copy the video URL - Skopiuj adres URL filmu - - - Copy the video URL at the current time - Skopiuj adres URL filmu z obecnym czasem - - - Copy embed code - Skopiuj kod do osadzenia - - - \ No newline at end of file diff --git a/client/src/locale/target/player_ru_RU.json b/client/src/locale/target/player_ru_RU.json new file mode 100644 index 000000000..e2d8d4980 --- /dev/null +++ b/client/src/locale/target/player_ru_RU.json @@ -0,0 +1 @@ +{"Audio Player":"Аудиоплеер","Video Player":"Видеоплеер","Play":"Воспроизвести","Pause":"Пауза","Replay":"Воспроизвести снова","Current Time":"Текущий момент","Duration":"Продолжительность","Remaining Time":"Оставшееся время","Stream Type":"Тип потока","LIVE":"Прямой эфир","Loaded":"Загружено","Progress":"Ход выполнения","Progress Bar":"Индикатор выполнения","progress bar timing: currentTime={1} duration={2}":"{1} из {2}","Fullscreen":"Полный экран","Non-Fullscreen":"Окно","Mute":"Без звука","Unmute":"Со звуком","Playback Rate":" Скорость воспроизведения","Subtitles":"Субтитры","subtitles off":"Без субтитров","Captions":"Сопроводительные надписи","captions off":"Без сопроводительных надписей","Chapters":"Главы","Descriptions":"Описание","descriptions off":"без описаний","Audio Track":"Аудиодорожка","Volume Level":"Громкость","You aborted the media playback":"Вы отменили воспроизведение медиафайла","A network error caused the media download to fail part-way.":"Ошибка сети стала причиной неудачного воспроизведения медиафайла","The media could not be loaded, either because the server or network failed or because the format is not supported.":"Медиафайл не может быть воспроизведен: ошибки сервера или сети; или не поддерживается формат медиафайла","The media playback was aborted due to a corruption problem or because the media used features your browser did not support.":"Воспроизведение отменено: файл испорчен или использует инструменты, которые ваш навигатор не поддерживает ","No compatible source was found for this media.":"Не найдено совместимого источника для загружения медиафайла","The media is encrypted and we do not have the keys to decrypt it.":"Этот медиафайл зашифрован и у нас нет ключей для его расшифровки ","Play Video":"Воспроизвести видео","Close":"Закрыть","Close Modal Dialog":"Закрыть модальное диалоговое окно","Modal Window":"Модальное окно","This is a modal window":"Это модальное окно","This modal can be closed by pressing the Escape key or activating the close button.":"Это модальное окно можно закрыть нажав на кнопку Escape или на кнопку закрыть",", opens captions settings dialog":", открывает окно настроек сопроводительных надписей",", opens subtitles settings dialog":", открывает окно настроек субтитров",", opens descriptions settings dialog":", открывает окно настроек описаний",", selected":", выделено ","captions settings":"Настройки сопроводительных надписей","subtitles settings":"Настройки субтитров","descriptions settings":"Настройки описаний ","Text":"Текст","White":"Белый","Black":"Черный","Red":"Красный","Green":"Зеленый","Blue":"Синий","Yellow":"Желтый","Magenta":"Пурпурный ","Cyan":"Голубой","Background":"Фон","Window":"Окно","Transparent":"Прозрачный","Semi-Transparent":"Полупрозрачный ","Opaque":"Непрозрачный","Font Size":"Размер шрифта ","None":"Отсутствует","Uniform":"Однообразный","Dropshadow":"Падающая тень","Font Family":"Шрифт","Proportional Sans-Serif":"Пропорциональный без засечек","Monospace Sans-Serif":"Фиксированной ширины без засечек","Proportional Serif":"Пропорциональный с засечками","Monospace Serif":"Фиксированной ширины с засечками","Casual":"Свободный","Script":"рукописный шрифт","Small Caps":" Уменьшенные заглавные буквы","Reset":"Восстановить ","restore all settings to the default values":"Восстановить настройки по умолчанию ","Done":"Выполнено","Caption Settings Dialog":"Окно настроек сопроводительных надписей","Beginning of dialog window. Escape will cancel and close the window.":"Начало диалогового окна. Клавиша Escape отменит действие и закроет окно","End of dialog window.":"Конец диалогового окна","{1} is loading.":"{1} в процессе загрузки","Quality":"Качество","Auto":"Авто","Speed":"Скорость","Subtitles/CC":"Субтитры","peers":"Партнер","Go to the video page":"Перейти на страницу с видео","Settings":"Настройки","Uses P2P, others may know you are watching this video.":"Использует P2P, другие могут знать, что вы просматриваете это видео.","Copy the video URL":"Скопировать URL видео","Copy the video URL at the current time":"Скопировать URL видео на текущем моменте ","Copy embed code":"Скопировать встроенный код"} \ No newline at end of file diff --git a/client/src/locale/target/server_it_IT.json b/client/src/locale/target/server_it_IT.json new file mode 100644 index 000000000..6586f622e --- /dev/null +++ b/client/src/locale/target/server_it_IT.json @@ -0,0 +1 @@ +{"Music":"Musica","Films":"Film","Vehicles":"Veicoli","Art":"Arte","Sports":"Sport","Travels":"Viaggi","Gaming":"Giochi","People":"Persone","Comedy":"Commedia","Entertainment":"Intrattenimento","News & Politics":"Notizie & Politica","How To":"Come fare","Education":"Educazione","Activism":"Attivismo","Science & Technology":"Scienza & Tecnologia","Animals":"Animali","Kids":"Bambini","Food":"Cibo","Attribution":"Attribuzione","Attribution - Share Alike":"Attribuzione - Condividi Allo Stesso Modo","Attribution - No Derivatives":"Attribuzione - Non Opere Derivate","Attribution - Non Commercial":"Attribuzione - Non Commerciale","Attribution - Non Commercial - Share Alike":"Attribuzione - Non Commerciale - Condividi Allo Stesso Modo","Attribution - Non Commercial - No Derivatives":"Attribuzione - Non Commerciale - Non Opere Derivate","Public Domain Dedication":"Pubblico Dominio","Public":"Pubblico","Unlisted":"Non elencato","Private":"Privato","Published":"Pubblicato","To transcode":"Da codificare","To import":"Da importare","Pending":"In sospeso","Success":"Successo","Failed":"Fallito","Misc":"Altro","Unknown":"Sconosciuto","Afar":"Afar","Abkhazian":"Abcaso","Afrikaans":"Afrikaans","Akan":"Akan","Amharic":"Amarico","Arabic":"Arabo","Aragonese":"Aragonese","American Sign Language":"Lingua dei Segni Americana","Assamese":"Assamese","Avaric":"Avarico","Kotava":"Kotava","Aymara":"Aymara","Azerbaijani":"Azero","Bashkir":"Bashkir","Bambara":"Bambara","Belarusian":"Bielorusso","Bengali":"Bengalese","British Sign Language":"Lingua dei Segni Britannica","Bislama":"Bislama","Tibetan":"Tibetano","Bosnian":"Bosniaco","Breton":"Bretone","Bulgarian":"Bulgaro","Brazilian Sign Language":"Lingua dei Segni Brasiliana","Catalan":"Catalano","Czech":"Ceco","Chamorro":"Chamorro","Chechen":"Ceceno","Chuvash":"Ciuvascio","Cornish":"Cornico","Corsican":"Corso","Cree":"Cree","Czech Sign Language":"Lingua dei Segni Ceca","Chinese Sign Language":"Lingua dei Segni Cinese","Welsh":"Gallese","Danish":"Danese","German":"Tedesco","Dhivehi":"Dhivehi","Danish Sign Language":"Lingua dei Segni Danese","Dzongkha":"Dzongkha","Modern Greek (1453-)":"Greco Moderno (1453-)","English":"Inglese","Esperanto":"Esperanto","Estonian":"Estone","Basque":"Basco","Ewe":"Ewe","Faroese":"Faroese","Persian":"Persiano","Fijian":"Fijiano","Finnish":"Finlandese","French":"Francese","Western Frisian":"Frisone Occidentale","French Sign Language":"Lingua dei Segni Francese","Fulah":"Fula","Scottish Gaelic":"Gaelico Scozzese","Irish":"Irlandese","Galician":"Galiziano","Manx":"Mannese","Guarani":"Guarani","German Sign Language":"Lingua dei Segni Tedesca","Gujarati":"Gujarati","Haitian":"Haitiano","Hausa":"Hausa","Serbo-Croatian":"Serbocroato","Hebrew":"Ebraico","Herero":"Herero","Hindi":"Hindi","Hiri Motu":"Hiri Motu","Croatian":"Croato","Hungarian":"Ungherese","Armenian":"Armeno","Igbo":"Igbo","Sichuan Yi":"Sichuan Yi","Inuktitut":"Inuktitut","Indonesian":"Indonesiano","Inupiaq":"Inupiaq","Icelandic":"Islandese","Italian":"Italiano","Javanese":"Giavanese","Lojban":"Lojban","Japanese":"Giapponese","Japanese Sign Language":"Lingua dei Segni Giapponese","Kalaallisut":"Kalaallisut","Kannada":"Kannada","Kashmiri":"Kashmiri","Georgian":"Georgiano","Kanuri":"Kanuri","Kazakh":"Kazako","Khmer":"Khmer","Kikuyu":"Kikuyu","Kinyarwanda":"Kinyarwanda","Kirghiz":"Kirghiso","Komi":"Komi","Kongo":"Kongo","Korean":"Coreano","Kuanyama":"Kuanyama","Kurdish":"Curdo","Lao":"Lao","Latvian":"Lettone","Limburgan":"Limburghese","Lingala":"Lingala","Lithuanian":"Lituano","Luxembourgish":"Lussemburghese","Luba-Katanga":"Luba-Katanga","Ganda":"Ganda","Marshallese":"Marshallese","Malayalam":"Malayalam","Marathi":"Marathi","Macedonian":"Macedone","Malagasy":"Malgascio","Maltese":"Maltese","Mongolian":"Mongolo","Maori":"Maori","Malay (macrolanguage)":"Malay (macrolinguaggio)","Burmese":"Birmano","Nauru":"Nauru","Navajo":"Navajo","South Ndebele":"Ndebele Meridionale","North Ndebele":"Ndebele Settentrionale","Ndonga":"Ndonga","Nepali (macrolanguage)":"Nepalese (macrolinguaggio)","Dutch":"Olandese","Norwegian Nynorsk":"Norvegese Nynorsk","Norwegian Bokmål":"Norvegese Bokmål","Norwegian":"Norvegese","Nyanja":"Chewa","Occitan":"Occitano","Ojibwa":"Ojibwa","Oriya (macrolanguage)":"Oriya (macrolinguaggio)","Oromo":"Oromo","Ossetian":"Osseto","Panjabi":"Punjabi","Pakistan Sign Language":"Lingua dei Segni Pakistana","Polish":"Polacco","Portuguese":"Portoghese","Pushto":"Pashto","Quechua":"Quechua","Romansh":"Romancio","Romanian":"Romeno","Russian Sign Language":"Lingua dei Segni Russa","Rundi":"Rundi","Russian":"Russo","Sango":"Sango","Saudi Arabian Sign Language":"Lingua dei Segni dell'Arabia Saudita","South African Sign Language":"Lingua dei Segni Sudafricana","Sinhala":"Singalese","Slovak":"Slovacco","Slovenian":"Sloveno","Northern Sami":"Sami Settentrionale","Samoan":"Samoano","Shona":"Shona","Sindhi":"Sindhi","Somali":"Somalo","Southern Sotho":"Sotho Meridionale","Spanish":"Spagnolo","Albanian":"Albanese","Sardinian":"Sardo","Serbian":"Serbo","Swati":"Swati","Sundanese":"Sondanese","Swahili (macrolanguage)":"Swahili (macrolinguaggio)","Swedish":"Svedese","Swedish Sign Language":"Lingua dei Segni Svedese","Tahitian":"Tahitiano","Tamil":"Tamil","Tatar":"Tataro","Telugu":"Telugu","Tajik":"Tagico","Tagalog":"Tagalog","Thai":"Thai","Tigrinya":"Tigrino","Klingon":"Klingon","Tonga (Tonga Islands)":"Tonga (Isole delle Tonga)","Tswana":"Tswana","Tsonga":"Tsonga","Turkmen":"Turcmeno","Turkish":"Turco","Twi":"Twi","Uighur":"Uighuro","Ukrainian":"Ucraino","Urdu":"Urdu","Uzbek":"Uzbeco","Venda":"Venda","Vietnamese":"Vietnamita","Walloon":"Vallone","Wolof":"Wolof","Xhosa":"Xhosa","Yiddish":"Yiddish","Yoruba":"Yoruba","Zhuang":"Zhuang","Chinese":"Cinese","Zulu":"Zulu"} \ No newline at end of file diff --git a/client/src/locale/target/server_pl_PL.json b/client/src/locale/target/server_pl_PL.json new file mode 100644 index 000000000..90973bf28 --- /dev/null +++ b/client/src/locale/target/server_pl_PL.json @@ -0,0 +1 @@ +{"Music":"Muzyka","Films":"Filmy","Vehicles":"Pojazdy","Art":"Sztuka","Sports":"Sport","Travels":"Podróże","Gaming":"Gry","People":"Ludzie","Comedy":"Komedia","Entertainment":"Rozrywka","How To":"Poradniki","Education":"Edukacja","Activism":"Aktywizm","Science & Technology":"Nauka i technologia","Animals":"Zwierzęta","Kids":"Dzieci","Food":"Jedzenie","Attribution":"Uznanie autostwa","Attribution - Share Alike":"Uznanie autorstwa - Na tych samych warunkach","Attribution - No Derivatives":"Uznanie autorstwa - Bez utworów zależnych","Attribution - Non Commercial":"Uznanie autorstwa - Użycie niekomercyjne","Attribution - Non Commercial - Share Alike":"Uznanie autorstwa - Użycie niekomercyjne - Na tych samych warunkach","Attribution - Non Commercial - No Derivatives":"Uznanie autorstwa - Użycie niekomercyjne - Bez utworów zależnych","Public Domain Dedication":"Przekazanie do Domeny Publicznej","Public":"Publiczne","Unlisted":"Niewypisane","Private":"Prywatne","Published":"Opublikowano","To transcode":"Transkodować","To import":"Importować","Pending":"Oczekiwanie","Success":"Sukces","Failed":"Niepowodzenie","Misc":"Różne","Unknown":"Nieznane","Afar":"Afar","Abkhazian":"Abchaski","Afrikaans":"Afrikaans","Akan":"Akan","Amharic":"Amharski","Arabic":"Arabski","American Sign Language":"Amerykański Język Migowy","Avaric":"Awarski","Bashkir":"Baszkirski","Bambara":"Bambara","Belarusian":"Białoruski","Bengali":"Bengalski","British Sign Language":"Brytyjski Język Migowy","Bislama":"Bislama","Tibetan":"Tybetański","Bosnian":"Bośniacki","Breton":"Bretoński","Bulgarian":"Bułgarski","Catalan":"Kataloński","Czech":"Czeski","Cornish":"Kornijski","Corsican":"Korsykański","Cree":"Kri","Czech Sign Language":"Czeski Język Migowy","Chinese Sign Language":"Chiński Język Migowy","Welsh":"Walijski","Danish":"Duński","German":"Niemiecki","Danish Sign Language":"Duński Język Migowy","Dzongkha":"Dzongkha","Modern Greek (1453-)":"Nowogrecki (1453-)","English":"Angielski","Estonian":"Estoński","Basque":"Baskijski","Ewe":"Ewe","Persian":"Perski","Fijian":"Fidżyjski","Finnish":"Fiński","French":"Francuski","French Sign Language":"Francuski Język Migowy","Fulah":"Ful","Irish":"Irlandzki","Galician":"Galicyjski","German Sign Language":"Niemiecki Język Migowy","Hausa":"Hausa","Serbo-Croatian":"Serbsko-Chorwacki","Hindi":"Hindi","Croatian":"Chorwacki","Hungarian":"Węgierski","Armenian":"Ormański","Igbo":"Igbo","Indonesian":"Indonezyjski","Icelandic":"Islandzki","Italian":"Włoski","Javanese":"Jawajski","Japanese":"Japoński","Japanese Sign Language":"Japoński Język Migowy","Komi":"Komi","Kongo":"Kongo","Korean":"Koreański","Kurdish":"Kurdyjski","Lao":"Laotański","Latvian":"Łotewski","Lithuanian":"Litewski","Luxembourgish":"Luksemburski","Nauru":"Naurański","Dutch":"Holenderski","Norwegian Nynorsk":"Norweski Nynorsk","Norwegian Bokmål":"Norweski Bokmål","Norwegian":"Norweski","Oromo":"Oromo","Polish":"Polski","Portuguese":"Portugalski","Pushto":"Paszto","Romansh":"Romansz","Romanian":"Rumuński","Russian Sign Language":"Rosyjski Język Migowy","Rundi":"Rundi","Russian":"Rosyjski","Sango":"Sango","Slovak":"Słowacki","Slovenian":"Słoweński","Samoan":"Samoański","Shona":"Shona","Sindhi":"Sindhi","Somali":"Somalijski","Spanish":"Hiszpański","Serbian":"Serbski","Swedish":"Szwedzki","Swedish Sign Language":"Szwedzki Język Migowy","Tamil":"Tamilski","Tatar":"Tatarski","Telugu":"Telugu","Tajik":"Tadżycki","Tagalog":"Tagalski","Thai":"Tajski","Turkmen":"Turkmeński","Turkish":"Turecki","Twi":"Twi","Ukrainian":"Ukraiński","Urdu":"Urdu","Uzbek":"Uzbecki","Venda":"Venda","Vietnamese":"Wietnamski","Walloon":"Waloński","Wolof":"Wolof","Xhosa":"Xhosa","Yiddish":"Jidysz","Yoruba":"Joruba","Zhuang":"Zhuang","Chinese":"Chiński","Zulu":"Zulu"} \ No newline at end of file diff --git a/client/src/locale/target/server_pl_PL.xml b/client/src/locale/target/server_pl_PL.xml deleted file mode 100644 index f5ce3f9ad..000000000 --- a/client/src/locale/target/server_pl_PL.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - Music - Muzyka - - - Films - Filmy - - - Vehicles - Pojazdy - - - Art - Sztuka - - - Sports - Sport - - - Travels - Podróże - - - Gaming - Gry - - - People - Ludzie - - - Comedy - Komedia - - - Entertainment - Rozrywka - - - How To - Poradniki - - - Education - Edukacja - - - Activism - Aktywizm - - - Science & Technology - Nauka i technologia - - - Animals - Zwierzęta - - - Kids - Dzieci - - - Food - Jedzenie - - - Attribution - Uznanie autostwa - - - Attribution - Share Alike - Uznanie autorstwa - Na tych samych warunkach - - - Attribution - No Derivatives - Uznanie autorstwa - Bez utworów zależnych - - - Attribution - Non Commercial - Uznanie autorstwa - Użycie niekomercyjne - - - Attribution - Non Commercial - Share Alike - Uznanie autorstwa - Użycie niekomercyjne - Na tych samych warunkach - - - Attribution - Non Commercial - No Derivatives - Uznanie autorstwa - Użycie niekomercyjne - Bez utworów zależnych - - - Public Domain Dedication - Przekazanie do Domeny Publicznej - - - Public - Publiczne - - - Unlisted - Niewypisane - - - Private - Prywatne - - - Published - Opublikowano - - - To transcode - Transkodować - - - To import - Importować - - - Pending - Oczekiwanie - - - Success - Sukces - - - Failed - Niepowodzenie - - - Misc - Różne - - - Unknown - Nieznane - - - \ No newline at end of file diff --git a/client/src/locale/target/server_ru_RU.json b/client/src/locale/target/server_ru_RU.json new file mode 100644 index 000000000..e62f2aeb4 --- /dev/null +++ b/client/src/locale/target/server_ru_RU.json @@ -0,0 +1 @@ +{"Music":"Музыка","Films":"Филмы","Vehicles":"Транспортные средства","Art":"Искусство","Sports":"Спорт","Travels":"Путешествия","Gaming":"Видеоигры","People":"Люди","Comedy":"Комедия","Entertainment":"Развлечения","How To":"Как","Education":"Образование","Activism":"Активизм","Science & Technology":"Наука и Технология","Animals":"Животные ","Kids":"Дети","Food":"Еда","Attribution":"Атрибуция","Attribution - Share Alike":" Атрибуция - публикация с одинаковыми условиями ","Attribution - No Derivatives":"Атрибуция - без права изменения ","Attribution - Non Commercial":"Атрибуция - не коммерческое использование","Attribution - Non Commercial - Share Alike":"Атрибуция - не коммерческое использование - публикация с одинаковыми условиями","Attribution - Non Commercial - No Derivatives":"Атрибуция - не коммерческое использование - без права изменения","Public Domain Dedication":"Безлицензионный","Public":"Общественный","Unlisted":" Ее включённый в список","Private":"Личный","Published":"Опубликованный","To transcode":"Перекодировать","To import":"Импортировать","Pending":"В ожидании","Success":"Удачное завершение","Failed":"Неудачно","Misc":"Разное","Unknown":"Неизвестное","Afar":"Афарский","Abkhazian":"Абхазский","Afrikaans":"Африкаанс","Akan":"Акан","Amharic":"Амхарский","Arabic":"Арабский","Aragonese":"Арагонский","American Sign Language":"Амслен","Assamese":"Ассамский","Avaric":"Аварский","Kotava":"Котава","Aymara":"Аймара","Azerbaijani":"Азербайджанский","Bashkir":"Башкирский","Bambara":"Бамана","Belarusian":"Белорусский","Bengali":"Бенгальский","British Sign Language":"Британский жестовый","Bislama":"Бислама","Tibetan":"Тибетский","Bosnian":"Боснийский","Breton":"Бретонский","Bulgarian":"Болгарский","Brazilian Sign Language":"Бразильский жестовый","Catalan":"Каталанский","Czech":"Чешский","Chamorro":"Чаморро","Chechen":"Чеченский","Chuvash":"Чувашский","Cornish":"Корнский","Corsican":"Корсиканский","Cree":"Кри","Czech Sign Language":"Чешский жестовый","Chinese Sign Language":"Китайский жестовый","Welsh":"Уэлш","Danish":"Датский","German":"Немецкий","Dhivehi":"Дивехи","Danish Sign Language":"Датский жестовый ","Dzongkha":"Дзонг-кэ","Modern Greek (1453-)":"Современный греческий","English":"Английский","Esperanto":"Эсперанто","Estonian":"Эстонский","Basque":"Баскский","Ewe":"Эве","Faroese":"Фарерский","Persian":"Персидский","Fijian":"Фиджийский","Finnish":"Финский","French":"Французский","Western Frisian":"Западнофризский","French Sign Language":"Французский жестовый","Fulah":"Фула","Scottish Gaelic":"Шотландский","Irish":"Ирландский","Galician":"Галисийский","Manx":"Мэнский","Guarani":"Гуарани","German Sign Language":"Немецкий жестовый","Gujarati":"Гуджарати","Haitian":"Гаитянский креольский","Hausa":"Хауса","Serbo-Croatian":"Сербохорватский","Hebrew":"Иврит","Herero":"Гереро","Hindi":"Хинди","Hiri Motu":"Хири-моту","Croatian":"Хорватский","Hungarian":"Венгерский","Armenian":"Армянский","Igbo":"Игбо","Sichuan Yi":"Носу","Inuktitut":"Инуктитут","Indonesian":"Индонезийский","Inupiaq":"Аляскинско-инуитские","Icelandic":"Исландский","Italian":"Итальянский","Javanese":"Яванский","Lojban":"Ложбан","Japanese":"Японский","Japanese Sign Language":"Японский жестовый","Kalaallisut":"Гренландский","Kannada":"Каннада","Kashmiri":"Кашмирский","Georgian":"Грузинский","Kanuri":"Канури","Kazakh":"Казахский","Khmer":"Кхмерский","Kikuyu":"Кикуйю","Kinyarwanda":"Руанда","Kirghiz":"Киргизский","Komi":"Коми","Kongo":"Конго","Korean":"Корейский","Kuanyama":"Кваньяма","Kurdish":"Курдские","Lao":"Лаосский","Latvian":"Латышский","Limburgan":"Лимбургский","Lingala":"Лингала","Lithuanian":"Литовский","Luxembourgish":"Люксембургский","Luba-Katanga":"Луба-катанга","Ganda":"Луганда","Marshallese":"Маршалльский","Malayalam":"Малаялам","Marathi":"Маратхи","Macedonian":"Македонский","Malagasy":"Малагасийский","Maltese":"Мальтийский","Mongolian":"Монгольский","Maori":"Маори","Malay (macrolanguage)":"Малайский","Burmese":"Бирманский","Nauru":"Науруанский","Navajo":"Навахо","South Ndebele":"Южный ндебеле","North Ndebele":"Северный ндебеле","Ndonga":"Ндонга","Nepali (macrolanguage)":"Непальский","Dutch":"Нидерландский","Norwegian Nynorsk":"Новонорвежский","Norwegian Bokmål":"Букмол","Norwegian":"Норвежский","Nyanja":"Ньянджа","Ojibwa":"Оджибве","Oriya (macrolanguage)":"Ория","Oromo":"Оромо","Ossetian":"Осетинский","Panjabi":"Панджаби","Pakistan Sign Language":"Дагестанский ","Polish":"Польский","Portuguese":"Португальский","Pushto":"Пушту","Quechua":"Ке́чуа","Romansh":"Романшский","Romanian":"Румынский","Russian Sign Language":"Русский жестовый","Rundi":"Рунди","Russian":"Русский","Sango":"Санго","Saudi Arabian Sign Language":"Арабский жестовый","South African Sign Language":"Жестовый Южной Африки","Sinhala":"Сингальский","Slovak":"Словацкий","Slovenian":"Словенский","Northern Sami":"Северносаамский","Samoan":"Самоанский","Shona":"Шона","Sindhi":"Синдхи","Somali":"Сомалийский","Southern Sotho":"Сесото","Spanish":"Испанский","Albanian":"Албанский","Sardinian":"Сардинский","Serbian":"Сербский","Swati":"Свати","Sundanese":"Сунданский","Swahili (macrolanguage)":"Суахили","Swedish":"Шведский","Swedish Sign Language":"Шведский жестовый","Tahitian":"Таитянский","Tamil":"Тамильский","Tatar":"Татарский","Telugu":"Телугу","Tajik":"Таджикский","Tagalog":"Тагальский","Thai":"Тайский","Tigrinya":"Тигринья","Klingon":"Клингонский","Tonga (Tonga Islands)":"Тонганский","Tswana":"Тсвана","Tsonga":"Тсонга","Turkmen":"Туркменский","Turkish":"Турецкий","Twi":"Чви","Uighur":"Уйгурский","Ukrainian":"Украинский","Urdu":"Урду","Uzbek":"Узбекский","Venda":"Венда","Vietnamese":"Вьетнамский","Walloon":"Валлонский","Wolof":"Волоф","Xhosa":"Коса","Yiddish":"Идиш","Yoruba":"Йоруба","Zhuang":"Чжуанский","Chinese":"Китайский","Zulu":"Зулу"} \ No newline at end of file diff --git a/scripts/build/client.sh b/scripts/build/client.sh index 62daf98cf..be3eef802 100755 --- a/scripts/build/client.sh +++ b/scripts/build/client.sh @@ -41,7 +41,7 @@ if [ -z ${1+x} ] || [ "$1" != "--light" ]; then languages=("fr_FR") else # Supported languages - languages=("fr_FR" "pt_BR" "sv_SE" "eu_ES" "ca_ES" "cs_CZ" "eo" "zh_Hant_TW" "de_DE" "es_ES" "oc" "zh_Hans_CN") + languages=("pl_PL" "it_IT" "ru_RU" "fr_FR" "pt_BR" "sv_SE" "eu_ES" "ca_ES" "cs_CZ" "eo" "zh_Hant_TW" "de_DE" "es_ES" "oc" "zh_Hans_CN") fi for lang in "${languages[@]}"; do diff --git a/shared/models/i18n/i18n.ts b/shared/models/i18n/i18n.ts index 5c3249452..d7164b73f 100644 --- a/shared/models/i18n/i18n.ts +++ b/shared/models/i18n/i18n.ts @@ -8,12 +8,14 @@ export const I18N_LOCALES = { 'cs-CZ': 'Čeština', 'eo': 'Esperanto', 'de-DE': 'Deutsch', + 'it-IT': 'Italiano', 'es-ES': 'Español', 'oc': 'Occitan', 'zh-Hant-TW': '繁體中文（台灣）', 'pt-BR': 'Português (Brasil)', 'sv-SE': 'svenska', - // 'pl-PL': 'Polski' + 'pl-PL': 'Polski', + 'ru-RU': 'русский', 'zh-Hans-CN': '简体中文（中国）' } @@ -26,8 +28,9 @@ const I18N_LOCALE_ALIAS = { 'de': 'de-DE', 'es': 'es-ES', 'pt': 'pt-BR', - 'sv': 'sv-SE' - // 'pl': 'pl-PL' + 'sv': 'sv-SE', + 'pl': 'pl-PL', + 'ru': 'ru-RU' } export const POSSIBLE_LOCALES = Object.keys(I18N_LOCALES) From 9c53ef67e303d6c2742126670963db8cfc81e6d2 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 5 Dec 2018 10:53:14 +0100 Subject: [PATCH 017/137] Add button to help to translate peertube --- client/src/app/menu/language-chooser.component.html | 5 +++++ client/src/app/menu/language-chooser.component.scss | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/client/src/app/menu/language-chooser.component.html b/client/src/app/menu/language-chooser.component.html index c37bf2826..c79609898 100644 --- a/client/src/app/menu/language-chooser.component.html +++ b/client/src/app/menu/language-chooser.component.html @@ -4,6 +4,11 @@ + + + Help to translate PeerTube! + +
{{ lang.label }}
diff --git a/client/src/app/menu/language-chooser.component.scss b/client/src/app/menu/language-chooser.component.scss index 944e86f46..72deb3952 100644 --- a/client/src/app/menu/language-chooser.component.scss +++ b/client/src/app/menu/language-chooser.component.scss @@ -1,6 +1,11 @@ @import '_variables'; @import '_mixins'; +.help-to-translate { + @include peertube-button-link; + @include orange-button; +} + .modal-body { text-align: center; @@ -9,4 +14,4 @@ font-size: 16px; margin: 15px; } -} \ No newline at end of file +} From a1b2f876132e2c1fa8adb27bb333b2cd859dc82b Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 5 Dec 2018 11:05:54 +0100 Subject: [PATCH 018/137] Add information in report modal --- .../modal/video-report.component.html | 5 +++++ .../modal/video-report.component.scss | 4 ++++ .../+video-watch/modal/video-report.component.ts | 16 ++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/client/src/app/videos/+video-watch/modal/video-report.component.html b/client/src/app/videos/+video-watch/modal/video-report.component.html index 8d9a49276..733c01be0 100644 --- a/client/src/app/videos/+video-watch/modal/video-report.component.html +++ b/client/src/app/videos/+video-watch/modal/video-report.component.html @@ -6,6 +6,11 @@
+
+ Your report will be sent to moderators of {{ currentHost }}. + It will be forwarded to origin instance {{ originHost }} too. +
+
-
- {{ formErrors.instanceShortDescription }} +
+ + +
{{ formErrors.instance.shortDescription }}
-
-
- - -
- {{ formErrors.instanceDescription }} +
+ + +
{{ formErrors.instance.description }}
-
-
- - -
- {{ formErrors.instanceTerms }} +
+ + +
{{ formErrors.instance.terms }}
-
-
- -
- +
+ +
+ +
+
{{ formErrors.instance.defaultClientRoute }}
-
- {{ formErrors.instanceDefaultClientRoute }} -
-
-
- - +
+ + -
- +
+ +
+
{{ formErrors.instance.defaultNSFWPolicy }}
-
- {{ formErrors.instanceDefaultNSFWPolicy }} -
-
+
Signup
-
- -
- -
- -
- -
- - -
- {{ formErrors.signupLimit }} + +
+
-
-
Import
- -
- -
- -
- -
- -
Administrator
- -
- - -
- {{ formErrors.adminEmail }} +
+
-
+ +
+ + +
{{ formErrors.signup.limit }}
+
+
Users
-
- -
- + +
+ +
+ +
+
{{ formErrors.user.videoQuota }}
-
- {{ formErrors.userVideoQuota }} + +
+ +
+ +
+
{{ formErrors.user.videoQuotaDaily }}
+ + +
Import
+ + + + +
+ +
+ +
+ +
+ + + + +
Administrator
+ +
+ + +
{{ formErrors.admin.email }}
-
- -
- -
-
- {{ formErrors.userVideoQuotaDaily }} -
+
+
+ @@ -177,30 +177,35 @@
Twitter
-
- - - -
- {{ formErrors.servicesTwitterUsername }} -
-
+ + + +
+ + + +
{{ formErrors.services.twitter.username }}
+
+ +
+ +
+ + + -
- -
@@ -209,45 +214,48 @@
Transcoding
-
- -
- - - +
-
- -
- -
-
- {{ formErrors.transcodingThreads }} -
-
+ -
- -
- +
+ +
+ +
+ +
+ +
+
{{ formErrors.transcoding.threads }}
+
+ + +
+ +
+ + + +
Cache @@ -258,74 +266,73 @@ >
-
- - -
- {{ formErrors.cachePreviewsSize }} + +
+ + +
{{ formErrors.cache.previews.size }}
-
-
- - -
- {{ formErrors.cacheCaptionsSize }} +
+ + +
{{ formErrors.cache.captions.size }}
-
+
Customizations
-
- - - -
- {{ formErrors.customizationJavascript }} -
-
+ + +
+ + + +
{{ formErrors.instance.customizations.javascript }}
+
-
- - + + + +
{{ formErrors.instance.customizations.css }}
+
+ + - Prepend with #custom-css to override styles. Example: - 
-      #custom-css .logged-in-email {{ '{' }}
-        color: red;
-      {{ '}' }}
-
- " - > - -
- {{ formErrors.customizationCSS }} -
-
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts index ee877ee31..654a076b0 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts @@ -18,9 +18,6 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { resolutions: string[] = [] transcodingThreadOptions: { label: string, value: number }[] = [] - private oldCustomJavascript: string - private oldCustomCSS: string - constructor ( protected formValidatorService: FormValidatorService, private customConfigValidatorsService: CustomConfigValidatorsService, @@ -58,41 +55,78 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { } getResolutionKey (resolution: string) { - return 'transcodingResolution' + resolution + return 'transcoding.resolutions.' + resolution } ngOnInit () { - const formGroupData: { [key: string]: any } = { - instanceName: this.customConfigValidatorsService.INSTANCE_NAME, - instanceShortDescription: this.customConfigValidatorsService.INSTANCE_SHORT_DESCRIPTION, - instanceDescription: null, - instanceTerms: null, - instanceDefaultClientRoute: null, - instanceDefaultNSFWPolicy: null, - servicesTwitterUsername: this.customConfigValidatorsService.SERVICES_TWITTER_USERNAME, - servicesTwitterWhitelisted: null, - cachePreviewsSize: this.customConfigValidatorsService.CACHE_PREVIEWS_SIZE, - cacheCaptionsSize: this.customConfigValidatorsService.CACHE_CAPTIONS_SIZE, - signupEnabled: null, - signupLimit: this.customConfigValidatorsService.SIGNUP_LIMIT, - signupRequiresEmailVerification: null, - importVideosHttpEnabled: null, - importVideosTorrentEnabled: null, - adminEmail: this.customConfigValidatorsService.ADMIN_EMAIL, - userVideoQuota: this.userValidatorsService.USER_VIDEO_QUOTA, - userVideoQuotaDaily: this.userValidatorsService.USER_VIDEO_QUOTA_DAILY, - transcodingThreads: this.customConfigValidatorsService.TRANSCODING_THREADS, - transcodingAllowAdditionalExtensions: null, - transcodingEnabled: null, - customizationJavascript: null, - customizationCSS: null + const formGroupData: { [key in keyof CustomConfig ]: any } = { + instance: { + name: this.customConfigValidatorsService.INSTANCE_NAME, + shortDescription: this.customConfigValidatorsService.INSTANCE_SHORT_DESCRIPTION, + description: null, + terms: null, + defaultClientRoute: null, + defaultNSFWPolicy: null, + customizations: { + javascript: null, + css: null + } + }, + services: { + twitter: { + username: this.customConfigValidatorsService.SERVICES_TWITTER_USERNAME, + whitelisted: null + } + }, + cache: { + previews: { + size: this.customConfigValidatorsService.CACHE_PREVIEWS_SIZE + }, + captions: { + size: this.customConfigValidatorsService.CACHE_CAPTIONS_SIZE + } + }, + signup: { + enabled: null, + limit: this.customConfigValidatorsService.SIGNUP_LIMIT, + requiresEmailVerification: null + }, + import: { + videos: { + http: { + enabled: null + }, + torrent: { + enabled: null + } + } + }, + admin: { + email: this.customConfigValidatorsService.ADMIN_EMAIL + }, + contactForm: { + enabled: null + }, + user: { + videoQuota: this.userValidatorsService.USER_VIDEO_QUOTA, + videoQuotaDaily: this.userValidatorsService.USER_VIDEO_QUOTA_DAILY + }, + transcoding: { + enabled: null, + threads: this.customConfigValidatorsService.TRANSCODING_THREADS, + allowAdditionalExtensions: null, + resolutions: {} + } } - const defaultValues: BuildFormDefaultValues = {} + const defaultValues = { + transcoding: { + resolutions: {} + } + } for (const resolution of this.resolutions) { - const key = this.getResolutionKey(resolution) - defaultValues[key] = 'false' - formGroupData[key] = null + defaultValues.transcoding.resolutions[resolution] = 'false' + formGroupData.transcoding.resolutions[resolution] = null } this.buildForm(formGroupData) @@ -102,9 +136,6 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { res => { this.customConfig = res - this.oldCustomCSS = this.customConfig.instance.customizations.css - this.oldCustomJavascript = this.customConfig.instance.customizations.javascript - this.updateForm() // Force form validation this.forceCheck() @@ -115,78 +146,15 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { } isTranscodingEnabled () { - return this.form.value['transcodingEnabled'] === true + return this.form.value['transcoding']['enabled'] === true } isSignupEnabled () { - return this.form.value['signupEnabled'] === true + return this.form.value['signup']['enabled'] === true } async formValidated () { - const data: CustomConfig = { - instance: { - name: this.form.value['instanceName'], - shortDescription: this.form.value['instanceShortDescription'], - description: this.form.value['instanceDescription'], - terms: this.form.value['instanceTerms'], - defaultClientRoute: this.form.value['instanceDefaultClientRoute'], - defaultNSFWPolicy: this.form.value['instanceDefaultNSFWPolicy'], - customizations: { - javascript: this.form.value['customizationJavascript'], - css: this.form.value['customizationCSS'] - } - }, - services: { - twitter: { - username: this.form.value['servicesTwitterUsername'], - whitelisted: this.form.value['servicesTwitterWhitelisted'] - } - }, - cache: { - previews: { - size: this.form.value['cachePreviewsSize'] - }, - captions: { - size: this.form.value['cacheCaptionsSize'] - } - }, - signup: { - enabled: this.form.value['signupEnabled'], - limit: this.form.value['signupLimit'], - requiresEmailVerification: this.form.value['signupRequiresEmailVerification'] - }, - admin: { - email: this.form.value['adminEmail'] - }, - user: { - videoQuota: this.form.value['userVideoQuota'], - videoQuotaDaily: this.form.value['userVideoQuotaDaily'] - }, - transcoding: { - enabled: this.form.value['transcodingEnabled'], - allowAdditionalExtensions: this.form.value['transcodingAllowAdditionalExtensions'], - threads: this.form.value['transcodingThreads'], - resolutions: { - '240p': this.form.value[this.getResolutionKey('240p')], - '360p': this.form.value[this.getResolutionKey('360p')], - '480p': this.form.value[this.getResolutionKey('480p')], - '720p': this.form.value[this.getResolutionKey('720p')], - '1080p': this.form.value[this.getResolutionKey('1080p')] - } - }, - import: { - videos: { - http: { - enabled: this.form.value['importVideosHttpEnabled'] - }, - torrent: { - enabled: this.form.value['importVideosTorrentEnabled'] - } - } - } - } - - this.configService.updateCustomConfig(data) + this.configService.updateCustomConfig(this.form.value) .subscribe( res => { this.customConfig = res @@ -204,38 +172,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { } private updateForm () { - const data: { [key: string]: any } = { - instanceName: this.customConfig.instance.name, - instanceShortDescription: this.customConfig.instance.shortDescription, - instanceDescription: this.customConfig.instance.description, - instanceTerms: this.customConfig.instance.terms, - instanceDefaultClientRoute: this.customConfig.instance.defaultClientRoute, - instanceDefaultNSFWPolicy: this.customConfig.instance.defaultNSFWPolicy, - servicesTwitterUsername: this.customConfig.services.twitter.username, - servicesTwitterWhitelisted: this.customConfig.services.twitter.whitelisted, - cachePreviewsSize: this.customConfig.cache.previews.size, - cacheCaptionsSize: this.customConfig.cache.captions.size, - signupEnabled: this.customConfig.signup.enabled, - signupLimit: this.customConfig.signup.limit, - signupRequiresEmailVerification: this.customConfig.signup.requiresEmailVerification, - adminEmail: this.customConfig.admin.email, - userVideoQuota: this.customConfig.user.videoQuota, - userVideoQuotaDaily: this.customConfig.user.videoQuotaDaily, - transcodingThreads: this.customConfig.transcoding.threads, - transcodingEnabled: this.customConfig.transcoding.enabled, - transcodingAllowAdditionalExtensions: this.customConfig.transcoding.allowAdditionalExtensions, - customizationJavascript: this.customConfig.instance.customizations.javascript, - customizationCSS: this.customConfig.instance.customizations.css, - importVideosHttpEnabled: this.customConfig.import.videos.http.enabled, - importVideosTorrentEnabled: this.customConfig.import.videos.torrent.enabled - } - - for (const resolution of this.resolutions) { - const key = this.getResolutionKey(resolution) - data[key] = this.customConfig.transcoding.resolutions[resolution] - } - - this.form.patchValue(data) + this.form.patchValue(this.customConfig) } } diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts index 6eccb8336..5351f18d5 100644 --- a/client/src/app/core/server/server.service.ts +++ b/client/src/app/core/server/server.service.ts @@ -40,6 +40,9 @@ export class ServerService { email: { enabled: false }, + contactForm: { + enabled: false + }, serverVersion: 'Unknown', signup: { allowed: false, diff --git a/client/src/app/shared/forms/form-reactive.ts b/client/src/app/shared/forms/form-reactive.ts index 0bb7d25e6..2d0e8359f 100644 --- a/client/src/app/shared/forms/form-reactive.ts +++ b/client/src/app/shared/forms/form-reactive.ts @@ -1,11 +1,9 @@ import { FormGroup } from '@angular/forms' import { BuildFormArgument, BuildFormDefaultValues, FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' -export type FormReactiveErrors = { [ id: string ]: string } +export type FormReactiveErrors = { [ id: string ]: string | FormReactiveErrors } export type FormReactiveValidationMessages = { - [ id: string ]: { - [ name: string ]: string - } + [ id: string ]: { [ name: string ]: string } | FormReactiveValidationMessages } export abstract class FormReactive { @@ -23,29 +21,49 @@ export abstract class FormReactive { this.formErrors = formErrors this.validationMessages = validationMessages - this.form.valueChanges.subscribe(() => this.onValueChanged(false)) + this.form.valueChanges.subscribe(() => this.onValueChanged(this.form, this.formErrors, this.validationMessages, false)) } - protected onValueChanged (forceCheck = false) { - for (const field in this.formErrors) { + protected forceCheck () { + return this.onValueChanged(this.form, this.formErrors, this.validationMessages, true) + } + + protected check () { + return this.onValueChanged(this.form, this.formErrors, this.validationMessages, false) + } + + private onValueChanged ( + form: FormGroup, + formErrors: FormReactiveErrors, + validationMessages: FormReactiveValidationMessages, + forceCheck = false + ) { + for (const field of Object.keys(formErrors)) { + if (formErrors[field] && typeof formErrors[field] === 'object') { + this.onValueChanged( + form.controls[field] as FormGroup, + formErrors[field] as FormReactiveErrors, + validationMessages[field] as FormReactiveValidationMessages, + forceCheck + ) + continue + } + // clear previous error message (if any) - this.formErrors[ field ] = '' - const control = this.form.get(field) + formErrors[ field ] = '' + const control = form.get(field) if (control.dirty) this.formChanged = true // Don't care if dirty on force check const isDirty = control.dirty || forceCheck === true if (control && isDirty && !control.valid) { - const messages = this.validationMessages[ field ] + const messages = validationMessages[ field ] for (const key in control.errors) { - this.formErrors[ field ] += messages[ key ] + ' ' + formErrors[ field ] += messages[ key ] + ' ' } } } } - protected forceCheck () { - return this.onValueChanged(true) - } } diff --git a/client/src/app/shared/forms/form-validators/form-validator.service.ts b/client/src/app/shared/forms/form-validators/form-validator.service.ts index 19a8bef25..249fdf119 100644 --- a/client/src/app/shared/forms/form-validators/form-validator.service.ts +++ b/client/src/app/shared/forms/form-validators/form-validator.service.ts @@ -7,10 +7,10 @@ export type BuildFormValidator = { MESSAGES: { [ name: string ]: string } } export type BuildFormArgument = { - [ id: string ]: BuildFormValidator + [ id: string ]: BuildFormValidator | BuildFormArgument } export type BuildFormDefaultValues = { - [ name: string ]: string | string[] + [ name: string ]: string | string[] | BuildFormDefaultValues } @Injectable() @@ -29,7 +29,16 @@ export class FormValidatorService { formErrors[name] = '' const field = obj[name] - if (field && field.MESSAGES) validationMessages[name] = field.MESSAGES + if (this.isRecursiveField(field)) { + const result = this.buildForm(field as BuildFormArgument, defaultValues[name] as BuildFormDefaultValues) + group[name] = result.form + formErrors[name] = result.formErrors + validationMessages[name] = result.validationMessages + + continue + } + + if (field && field.MESSAGES) validationMessages[name] = field.MESSAGES as { [ name: string ]: string } const defaultValue = defaultValues[name] || '' @@ -52,13 +61,27 @@ export class FormValidatorService { formErrors[name] = '' const field = obj[name] - if (field && field.MESSAGES) validationMessages[name] = field.MESSAGES + if (this.isRecursiveField(field)) { + this.updateForm( + form[name], + formErrors[name] as FormReactiveErrors, + validationMessages[name] as FormReactiveValidationMessages, + obj[name] as BuildFormArgument, + defaultValues[name] as BuildFormDefaultValues + ) + continue + } + + if (field && field.MESSAGES) validationMessages[name] = field.MESSAGES as { [ name: string ]: string } const defaultValue = defaultValues[name] || '' - if (field && field.VALIDATORS) form.addControl(name, new FormControl(defaultValue, field.VALIDATORS)) + if (field && field.VALIDATORS) form.addControl(name, new FormControl(defaultValue, field.VALIDATORS as ValidatorFn[])) else form.addControl(name, new FormControl(defaultValue)) } } + private isRecursiveField (field: any) { + return field && typeof field === 'object' && !field.MESSAGES && !field.VALIDATORS + } } diff --git a/client/src/app/shared/misc/help.component.scss b/client/src/app/shared/misc/help.component.scss index 6a5c3b1fa..047e53fab 100644 --- a/client/src/app/shared/misc/help.component.scss +++ b/client/src/app/shared/misc/help.component.scss @@ -12,7 +12,7 @@ } /deep/ { - .popover-help.popover { + .help-popover { max-width: 300px; .popover-body { diff --git a/client/src/app/shared/user-subscription/remote-subscribe.component.ts b/client/src/app/shared/user-subscription/remote-subscribe.component.ts index 49722ce40..ba2a45df1 100644 --- a/client/src/app/shared/user-subscription/remote-subscribe.component.ts +++ b/client/src/app/shared/user-subscription/remote-subscribe.component.ts @@ -29,7 +29,7 @@ export class RemoteSubscribeComponent extends FormReactive implements OnInit { } onValidKey () { - this.onValueChanged() + this.check() if (!this.form.valid) return this.formValidated() diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts b/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts index 6b7e62042..fd85c28f2 100644 --- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts +++ b/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts @@ -70,7 +70,7 @@ export class VideoCommentAddComponent extends FormReactive implements OnInit { } onValidKey () { - this.onValueChanged() + this.check() if (!this.form.valid) return this.formValidated() From d3e56c0c4b307c99e83fbafb7f2c5884cbc20055 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 10 Jan 2019 11:12:41 +0100 Subject: [PATCH 089/137] Implement contact form in the client --- .../about-instance.component.html | 8 ++- .../about-instance.component.scss | 16 ++++- .../about-instance.component.ts | 17 ++++- .../contact-admin-modal.component.html | 50 +++++++++++++ .../contact-admin-modal.component.scss | 11 +++ .../contact-admin-modal.component.ts | 72 +++++++++++++++++++ client/src/app/+about/about.module.ts | 4 +- client/src/app/core/server/server.service.ts | 5 +- .../app/shared/forms/form-validators/index.ts | 1 + .../instance-validators.service.ts | 48 +++++++++++++ .../app/shared/instance/instance.service.ts | 36 ++++++++++ client/src/app/shared/shared.module.ts | 4 ++ scripts/clean/server/test.sh | 2 +- server/controllers/api/config.ts | 2 +- server/initializers/checker-after-init.ts | 14 +++- server/initializers/checker-before-init.ts | 2 +- server/lib/emailer.ts | 11 ++- server/middlewares/validators/server.ts | 2 +- 18 files changed, 281 insertions(+), 24 deletions(-) create mode 100644 client/src/app/+about/about-instance/contact-admin-modal.component.html create mode 100644 client/src/app/+about/about-instance/contact-admin-modal.component.scss create mode 100644 client/src/app/+about/about-instance/contact-admin-modal.component.ts create mode 100644 client/src/app/shared/forms/form-validators/instance-validators.service.ts create mode 100644 client/src/app/shared/instance/instance.service.ts diff --git a/client/src/app/+about/about-instance/about-instance.component.html b/client/src/app/+about/about-instance/about-instance.component.html index 37ff795f5..8c700752e 100644 --- a/client/src/app/+about/about-instance/about-instance.component.html +++ b/client/src/app/+about/about-instance/about-instance.component.html @@ -1,7 +1,9 @@
-
- About {{ instanceName }} instance +
+
About {{ instanceName }} instance
+ +
Contact administrator
@@ -46,3 +48,5 @@
+ + diff --git a/client/src/app/+about/about-instance/about-instance.component.scss b/client/src/app/+about/about-instance/about-instance.component.scss index b451e85aa..75cf57322 100644 --- a/client/src/app/+about/about-instance/about-instance.component.scss +++ b/client/src/app/+about/about-instance/about-instance.component.scss @@ -2,9 +2,19 @@ @import '_mixins'; .about-instance-title { - font-size: 20px; - font-weight: bold; - margin-bottom: 15px; + display: flex; + justify-content: space-between; + + & > div { + font-size: 20px; + font-weight: bold; + margin-bottom: 15px; + } + + & > .contact-admin { + @include peertube-button; + @include orange-button; + } } .section-title { diff --git a/client/src/app/+about/about-instance/about-instance.component.ts b/client/src/app/+about/about-instance/about-instance.component.ts index 36e7a8e5b..d3ee8a1e4 100644 --- a/client/src/app/+about/about-instance/about-instance.component.ts +++ b/client/src/app/+about/about-instance/about-instance.component.ts @@ -1,7 +1,9 @@ -import { Component, OnInit } from '@angular/core' +import { Component, OnInit, ViewChild } from '@angular/core' import { Notifier, ServerService } from '@app/core' import { MarkdownService } from '@app/videos/shared' import { I18n } from '@ngx-translate/i18n-polyfill' +import { ContactAdminModalComponent } from '@app/+about/about-instance/contact-admin-modal.component' +import { InstanceService } from '@app/shared/instance/instance.service' @Component({ selector: 'my-about-instance', @@ -9,6 +11,8 @@ import { I18n } from '@ngx-translate/i18n-polyfill' styleUrls: [ './about-instance.component.scss' ] }) export class AboutInstanceComponent implements OnInit { + @ViewChild('contactAdminModal') contactAdminModal: ContactAdminModalComponent + shortDescription = '' descriptionHTML = '' termsHTML = '' @@ -16,6 +20,7 @@ export class AboutInstanceComponent implements OnInit { constructor ( private notifier: Notifier, private serverService: ServerService, + private instanceService: InstanceService, private markdownService: MarkdownService, private i18n: I18n ) {} @@ -32,8 +37,12 @@ export class AboutInstanceComponent implements OnInit { return this.serverService.getConfig().signup.allowed } + get isContactFormEnabled () { + return this.serverService.getConfig().email.enabled && this.serverService.getConfig().contactForm.enabled + } + ngOnInit () { - this.serverService.getAbout() + this.instanceService.getAbout() .subscribe( res => { this.shortDescription = res.instance.shortDescription @@ -45,4 +54,8 @@ export class AboutInstanceComponent implements OnInit { ) } + openContactModal () { + return this.contactAdminModal.show() + } + } diff --git a/client/src/app/+about/about-instance/contact-admin-modal.component.html b/client/src/app/+about/about-instance/contact-admin-modal.component.html new file mode 100644 index 000000000..2b3fb32f3 --- /dev/null +++ b/client/src/app/+about/about-instance/contact-admin-modal.component.html @@ -0,0 +1,50 @@ + +
+

Contact {{ instanceName }} administrator

+ +
+ +
+ + +
+ + +
{{ formErrors.fromName }}
+
+ +
+ + +
{{ formErrors.fromEmail }}
+
+ +
+ + +
{{ formErrors.body }}
+
+ +
{{ error }}
+ +
+ + Cancel + + + +
+ + +
+ diff --git a/client/src/app/+about/about-instance/contact-admin-modal.component.scss b/client/src/app/+about/about-instance/contact-admin-modal.component.scss new file mode 100644 index 000000000..260d77888 --- /dev/null +++ b/client/src/app/+about/about-instance/contact-admin-modal.component.scss @@ -0,0 +1,11 @@ +@import 'variables'; +@import 'mixins'; + +input[type=text] { + @include peertube-input-text(340px); + display: block; +} + +textarea { + @include peertube-textarea(100%, 200px); +} diff --git a/client/src/app/+about/about-instance/contact-admin-modal.component.ts b/client/src/app/+about/about-instance/contact-admin-modal.component.ts new file mode 100644 index 000000000..2f707bd53 --- /dev/null +++ b/client/src/app/+about/about-instance/contact-admin-modal.component.ts @@ -0,0 +1,72 @@ +import { Component, OnInit, ViewChild } from '@angular/core' +import { Notifier } from '@app/core' +import { I18n } from '@ngx-translate/i18n-polyfill' +import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' +import { NgbModal } from '@ng-bootstrap/ng-bootstrap' +import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref' +import { FormReactive, InstanceValidatorsService } from '@app/shared' +import { InstanceService } from '@app/shared/instance/instance.service' + +@Component({ + selector: 'my-contact-admin-modal', + templateUrl: './contact-admin-modal.component.html', + styleUrls: [ './contact-admin-modal.component.scss' ] +}) +export class ContactAdminModalComponent extends FormReactive implements OnInit { + @ViewChild('modal') modal: NgbModal + + error: string + + private openedModal: NgbModalRef + + constructor ( + protected formValidatorService: FormValidatorService, + private modalService: NgbModal, + private instanceValidatorsService: InstanceValidatorsService, + private instanceService: InstanceService, + private notifier: Notifier, + private i18n: I18n + ) { + super() + } + + ngOnInit () { + this.buildForm({ + fromName: this.instanceValidatorsService.FROM_NAME, + fromEmail: this.instanceValidatorsService.FROM_EMAIL, + body: this.instanceValidatorsService.BODY + }) + } + + show () { + this.openedModal = this.modalService.open(this.modal, { keyboard: false }) + } + + hide () { + this.form.reset() + this.error = undefined + + this.openedModal.close() + this.openedModal = null + } + + sendForm () { + const fromName = this.form.value['fromName'] + const fromEmail = this.form.value[ 'fromEmail' ] + const body = this.form.value[ 'body' ] + + this.instanceService.contactAdministrator(fromEmail, fromName, body) + .subscribe( + () => { + this.notifier.success(this.i18n('Your message has been sent.')) + this.hide() + }, + + err => { + this.error = err.status === 403 + ? this.i18n('You already sent this form recently') + : err.message + } + ) + } +} diff --git a/client/src/app/+about/about.module.ts b/client/src/app/+about/about.module.ts index ff6e8ef41..9c6b29740 100644 --- a/client/src/app/+about/about.module.ts +++ b/client/src/app/+about/about.module.ts @@ -5,6 +5,7 @@ import { AboutComponent } from './about.component' import { SharedModule } from '../shared' import { AboutInstanceComponent } from '@app/+about/about-instance/about-instance.component' import { AboutPeertubeComponent } from '@app/+about/about-peertube/about-peertube.component' +import { ContactAdminModalComponent } from '@app/+about/about-instance/contact-admin-modal.component' @NgModule({ imports: [ @@ -15,7 +16,8 @@ import { AboutPeertubeComponent } from '@app/+about/about-peertube/about-peertub declarations: [ AboutComponent, AboutInstanceComponent, - AboutPeertubeComponent + AboutPeertubeComponent, + ContactAdminModalComponent ], exports: [ diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts index 5351f18d5..f33e6f20c 100644 --- a/client/src/app/core/server/server.service.ts +++ b/client/src/app/core/server/server.service.ts @@ -13,6 +13,7 @@ import { sortBy } from '@app/shared/misc/utils' @Injectable() export class ServerService { + private static BASE_SERVER_URL = environment.apiUrl + '/api/v1/server/' private static BASE_CONFIG_URL = environment.apiUrl + '/api/v1/config/' private static BASE_VIDEO_URL = environment.apiUrl + '/api/v1/videos/' private static BASE_LOCALE_URL = environment.apiUrl + '/client/locales/' @@ -147,10 +148,6 @@ export class ServerService { return this.videoPrivacies } - getAbout () { - return this.http.get(ServerService.BASE_CONFIG_URL + '/about') - } - private loadVideoAttributeEnum ( attributeName: 'categories' | 'licences' | 'languages' | 'privacies', hashToPopulate: VideoConstant[], diff --git a/client/src/app/shared/forms/form-validators/index.ts b/client/src/app/shared/forms/form-validators/index.ts index 74e385b3d..fdcbedb71 100644 --- a/client/src/app/shared/forms/form-validators/index.ts +++ b/client/src/app/shared/forms/form-validators/index.ts @@ -1,6 +1,7 @@ export * from './custom-config-validators.service' export * from './form-validator.service' export * from './host' +export * from './instance-validators.service' export * from './login-validators.service' export * from './reset-password-validators.service' export * from './user-validators.service' diff --git a/client/src/app/shared/forms/form-validators/instance-validators.service.ts b/client/src/app/shared/forms/form-validators/instance-validators.service.ts new file mode 100644 index 000000000..5bb852858 --- /dev/null +++ b/client/src/app/shared/forms/form-validators/instance-validators.service.ts @@ -0,0 +1,48 @@ +import { I18n } from '@ngx-translate/i18n-polyfill' +import { Validators } from '@angular/forms' +import { BuildFormValidator } from '@app/shared' +import { Injectable } from '@angular/core' + +@Injectable() +export class InstanceValidatorsService { + readonly FROM_EMAIL: BuildFormValidator + readonly FROM_NAME: BuildFormValidator + readonly BODY: BuildFormValidator + + constructor (private i18n: I18n) { + + this.FROM_EMAIL = { + VALIDATORS: [ Validators.required, Validators.email ], + MESSAGES: { + 'required': this.i18n('Email is required.'), + 'email': this.i18n('Email must be valid.') + } + } + + this.FROM_NAME = { + VALIDATORS: [ + Validators.required, + Validators.minLength(1), + Validators.maxLength(120) + ], + MESSAGES: { + 'required': this.i18n('Your name is required.'), + 'minlength': this.i18n('Your name must be at least 1 character long.'), + 'maxlength': this.i18n('Your name cannot be more than 120 characters long.') + } + } + + this.BODY = { + VALIDATORS: [ + Validators.required, + Validators.minLength(3), + Validators.maxLength(5000) + ], + MESSAGES: { + 'required': this.i18n('A message is required.'), + 'minlength': this.i18n('The message must be at least 3 characters long.'), + 'maxlength': this.i18n('The message cannot be more than 5000 characters long.') + } + } + } +} diff --git a/client/src/app/shared/instance/instance.service.ts b/client/src/app/shared/instance/instance.service.ts new file mode 100644 index 000000000..61321ecce --- /dev/null +++ b/client/src/app/shared/instance/instance.service.ts @@ -0,0 +1,36 @@ +import { catchError } from 'rxjs/operators' +import { HttpClient } from '@angular/common/http' +import { Injectable } from '@angular/core' +import { environment } from '../../../environments/environment' +import { RestExtractor, RestService } from '../rest' +import { About } from '../../../../../shared/models/server' + +@Injectable() +export class InstanceService { + private static BASE_CONFIG_URL = environment.apiUrl + '/api/v1/config' + private static BASE_SERVER_URL = environment.apiUrl + '/api/v1/server' + + constructor ( + private authHttp: HttpClient, + private restService: RestService, + private restExtractor: RestExtractor + ) { + } + + getAbout () { + return this.authHttp.get(InstanceService.BASE_CONFIG_URL + '/about') + .pipe(catchError(res => this.restExtractor.handleError(res))) + } + + contactAdministrator (fromEmail: string, fromName: string, message: string) { + const body = { + fromEmail, + fromName, + body: message + } + + return this.authHttp.post(InstanceService.BASE_SERVER_URL + '/contact', body) + .pipe(catchError(res => this.restExtractor.handleError(res))) + + } +} diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts index c99c87c00..d1320aeec 100644 --- a/client/src/app/shared/shared.module.ts +++ b/client/src/app/shared/shared.module.ts @@ -37,6 +37,7 @@ import { LoginValidatorsService, ReactiveFileComponent, ResetPasswordValidatorsService, + InstanceValidatorsService, TextareaAutoResizeDirective, UserValidatorsService, VideoAbuseValidatorsService, @@ -65,6 +66,7 @@ import { TopMenuDropdownComponent } from '@app/shared/menu/top-menu-dropdown.com import { UserHistoryService } from '@app/shared/users/user-history.service' import { UserNotificationService } from '@app/shared/users/user-notification.service' import { UserNotificationsComponent } from '@app/shared/users/user-notifications.component' +import { InstanceService } from '@app/shared/instance/instance.service' @NgModule({ imports: [ @@ -185,8 +187,10 @@ import { UserNotificationsComponent } from '@app/shared/users/user-notifications OverviewService, VideoChangeOwnershipValidatorsService, VideoAcceptOwnershipValidatorsService, + InstanceValidatorsService, BlocklistService, UserHistoryService, + InstanceService, I18nPrimengCalendarService, ScreenService, diff --git a/scripts/clean/server/test.sh b/scripts/clean/server/test.sh index 75ad491bf..b897c30ba 100755 --- a/scripts/clean/server/test.sh +++ b/scripts/clean/server/test.sh @@ -13,7 +13,7 @@ recreateDB () { } removeFiles () { - rm -rf "./test$1" "./config/local-test-$1.json" + rm -rf "./test$1" "./config/local-test.json" "./config/local-test-$1.json" } dropRedis () { diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts index 43b20e078..dd06a0597 100644 --- a/server/controllers/api/config.ts +++ b/server/controllers/api/config.ts @@ -65,7 +65,7 @@ async function getConfig (req: express.Request, res: express.Response) { } }, email: { - enabled: Emailer.Instance.isEnabled() + enabled: Emailer.isEnabled() }, contactForm: { enabled: CONFIG.CONTACT_FORM.ENABLED diff --git a/server/initializers/checker-after-init.ts b/server/initializers/checker-after-init.ts index 72d846957..955d55206 100644 --- a/server/initializers/checker-after-init.ts +++ b/server/initializers/checker-after-init.ts @@ -10,6 +10,7 @@ import { getServerActor } from '../helpers/utils' import { RecentlyAddedStrategy } from '../../shared/models/redundancy' import { isArray } from '../helpers/custom-validators/misc' import { uniq } from 'lodash' +import { Emailer } from '../lib/emailer' async function checkActivityPubUrls () { const actor = await getServerActor() @@ -32,9 +33,19 @@ async function checkActivityPubUrls () { // Some checks on configuration files // Return an error message, or null if everything is okay function checkConfig () { - const defaultNSFWPolicy = CONFIG.INSTANCE.DEFAULT_NSFW_POLICY + + if (!Emailer.isEnabled()) { + if (CONFIG.SIGNUP.ENABLED && CONFIG.SIGNUP.REQUIRES_EMAIL_VERIFICATION) { + return 'Emailer is disabled but you require signup email verification.' + } + + if (CONFIG.CONTACT_FORM.ENABLED) { + logger.warn('Emailer is disabled so the contact form will not work.') + } + } // NSFW policy + const defaultNSFWPolicy = CONFIG.INSTANCE.DEFAULT_NSFW_POLICY { const available = [ 'do_not_list', 'blur', 'display' ] if (available.indexOf(defaultNSFWPolicy) === -1) { @@ -68,6 +79,7 @@ function checkConfig () { } } + // Check storage directory locations if (isProdInstance()) { const configStorage = config.get('storage') for (const key of Object.keys(configStorage)) { diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts index a7bc7eec8..7905d9ffa 100644 --- a/server/initializers/checker-before-init.ts +++ b/server/initializers/checker-before-init.ts @@ -15,7 +15,7 @@ function checkMissedConfig () { 'storage.redundancy', 'storage.tmp', 'log.level', 'user.video_quota', 'user.video_quota_daily', - 'cache.previews.size', 'admin.email', + 'cache.previews.size', 'admin.email', 'contact_form.enabled', 'signup.enabled', 'signup.limit', 'signup.requires_email_verification', 'signup.filters.cidr.whitelist', 'signup.filters.cidr.blacklist', 'redundancy.videos.strategies', 'redundancy.videos.check_interval', diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts index 9b1c5122f..f384a254e 100644 --- a/server/lib/emailer.ts +++ b/server/lib/emailer.ts @@ -18,7 +18,6 @@ class Emailer { private static instance: Emailer private initialized = false private transporter: Transporter - private enabled = false private constructor () {} @@ -27,7 +26,7 @@ class Emailer { if (this.initialized === true) return this.initialized = true - if (CONFIG.SMTP.HOSTNAME && CONFIG.SMTP.PORT) { + if (Emailer.isEnabled()) { logger.info('Using %s:%s as SMTP server.', CONFIG.SMTP.HOSTNAME, CONFIG.SMTP.PORT) let tls @@ -55,8 +54,6 @@ class Emailer { tls, auth }) - - this.enabled = true } else { if (!isTestInstance()) { logger.error('Cannot use SMTP server because of lack of configuration. PeerTube will not be able to send mails!') @@ -64,8 +61,8 @@ class Emailer { } } - isEnabled () { - return this.enabled + static isEnabled () { + return !!CONFIG.SMTP.HOSTNAME && !!CONFIG.SMTP.PORT } async checkConnectionOrDie () { @@ -374,7 +371,7 @@ class Emailer { } sendMail (to: string[], subject: string, text: string, from?: string) { - if (!this.enabled) { + if (!Emailer.isEnabled()) { throw new Error('Cannot send mail because SMTP is not configured.') } diff --git a/server/middlewares/validators/server.ts b/server/middlewares/validators/server.ts index d82e19230..d85afc2ff 100644 --- a/server/middlewares/validators/server.ts +++ b/server/middlewares/validators/server.ts @@ -50,7 +50,7 @@ const contactAdministratorValidator = [ .end() } - if (Emailer.Instance.isEnabled() === false) { + if (Emailer.isEnabled() === false) { return res .status(409) .send({ error: 'Emailer is not enabled on this instance.' }) From 26a008fe8d71b1bba818dd5f4fae760e0f7fc47c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 10 Jan 2019 11:51:25 +0100 Subject: [PATCH 090/137] Update translations --- .../contact-admin-modal.component.ts | 7 +- client/src/app/shared/forms/form-reactive.ts | 2 +- client/src/locale/source/angular_en_US.xml | 1598 ++++++++--------- server/tests/api/server/contact-form.ts | 2 + 4 files changed, 755 insertions(+), 854 deletions(-) diff --git a/client/src/app/+about/about-instance/contact-admin-modal.component.ts b/client/src/app/+about/about-instance/contact-admin-modal.component.ts index 2f707bd53..7d79c2215 100644 --- a/client/src/app/+about/about-instance/contact-admin-modal.component.ts +++ b/client/src/app/+about/about-instance/contact-admin-modal.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, ViewChild } from '@angular/core' -import { Notifier } from '@app/core' +import { Notifier, ServerService } from '@app/core' import { I18n } from '@ngx-translate/i18n-polyfill' import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' @@ -24,12 +24,17 @@ export class ContactAdminModalComponent extends FormReactive implements OnInit { private modalService: NgbModal, private instanceValidatorsService: InstanceValidatorsService, private instanceService: InstanceService, + private serverService: ServerService, private notifier: Notifier, private i18n: I18n ) { super() } + get instanceName () { + return this.serverService.getConfig().instance.name + } + ngOnInit () { this.buildForm({ fromName: this.instanceValidatorsService.FROM_NAME, diff --git a/client/src/app/shared/forms/form-reactive.ts b/client/src/app/shared/forms/form-reactive.ts index 2d0e8359f..b9873af2c 100644 --- a/client/src/app/shared/forms/form-reactive.ts +++ b/client/src/app/shared/forms/form-reactive.ts @@ -11,7 +11,7 @@ export abstract class FormReactive { protected formChanged = false form: FormGroup - formErrors: FormReactiveErrors + formErrors: any // To avoid casting in template because of string | FormReactiveErrors validationMessages: FormReactiveValidationMessages buildForm (obj: BuildFormArgument, defaultValues: BuildFormDefaultValues = {}) { diff --git a/client/src/locale/source/angular_en_US.xml b/client/src/locale/source/angular_en_US.xml index 7ebdd8e07..d61d4f9f2 100644 --- a/client/src/locale/source/angular_en_US.xml +++ b/client/src/locale/source/angular_en_US.xml @@ -210,7 +210,7 @@ app/login/login.component.html - 72 + 77 app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html @@ -226,6 +226,113 @@ app/shared/forms/reactive-file.component.html 11 + + You don't have notifications. + + app/shared/users/user-notifications.component.html + 1 + + + + <x id="INTERPOLATION" equiv-text="{{ notification.video.channel.displayName }}"/> published a <x id="START_LINK" ctype="x-a" equiv-text="<a>"/>new video<x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> + + + app/shared/users/user-notifications.component.html + 7 + + + + Your video <x id="START_LINK" ctype="x-a" equiv-text="<a>"/><x id="INTERPOLATION" equiv-text="{{ notification.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> has been unblacklisted + + + app/shared/users/user-notifications.component.html + 11 + + + + Your video <x id="START_LINK" ctype="x-a" equiv-text="<a>"/><x id="INTERPOLATION" equiv-text="{{ notification.videoBlacklist.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> has been blacklisted + + + app/shared/users/user-notifications.component.html + 15 + + + + <x id="START_LINK" ctype="x-a" equiv-text="<a>"/>A new video abuse<x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> has been created on video <x id="START_LINK_1" ctype="x-a" equiv-text="<a>"/><x id="INTERPOLATION" equiv-text="{{ notification.videoAbuse.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> + + + app/shared/users/user-notifications.component.html + 19 + + + + <x id="INTERPOLATION" equiv-text="{{ notification.comment.account.displayName }}"/> commented your video <x id="START_LINK" ctype="x-a" equiv-text="<a>"/><x id="INTERPOLATION_1" equiv-text="{{ notification.comment.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> + + + app/shared/users/user-notifications.component.html + 23 + + + + Your video <x id="START_LINK" ctype="x-a" equiv-text="<a>"/><x id="INTERPOLATION" equiv-text="{{ notification.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> has been published + + + app/shared/users/user-notifications.component.html + 27 + + + + <x id="START_LINK" ctype="x-a" equiv-text="<a>"/>Your video import<x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> <x id="INTERPOLATION" equiv-text="{{ notification.videoImportIdentifier }}"/> succeeded + + + app/shared/users/user-notifications.component.html + 31 + + + + <x id="START_LINK" ctype="x-a" equiv-text="<a>"/>Your video import<x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> <x id="INTERPOLATION" equiv-text="{{ notification.videoImportIdentifier }}"/> failed + + + app/shared/users/user-notifications.component.html + 35 + + + + User <x id="START_LINK" ctype="x-a" equiv-text="<a>"/><x id="INTERPOLATION" equiv-text="{{ notification.account.name }}"/> registered<x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> on your instance + + + app/shared/users/user-notifications.component.html + 39 + + + + <x id="START_LINK" ctype="x-a" equiv-text="<a>"/><x id="INTERPOLATION" equiv-text="{{ notification.actorFollow.follower.displayName }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> is following + + <x id="START_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="<ng-container>"/> + your channel <x id="INTERPOLATION_1" equiv-text="{{ notification.actorFollow.following.displayName }}"/> + <x id="CLOSE_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="</ng-container>"/> + <x id="START_TAG_NG-CONTAINER_1" ctype="x-ng-container" equiv-text="<ng-container>"/>your account<x id="CLOSE_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="</ng-container>"/> + + + app/shared/users/user-notifications.component.html + 43 + + + + <x id="INTERPOLATION" equiv-text="{{ notification.comment.account.displayName }}"/> mentioned you on <x id="START_LINK" ctype="x-a" equiv-text="<a>"/>video <x id="INTERPOLATION_1" equiv-text="{{ notification.comment.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> + + + app/shared/users/user-notifications.component.html + 52 + + + + <x id="START_TAG_DIV" ctype="x-div" equiv-text="<div>"/><x id="CLOSE_TAG_DIV" ctype="x-div" equiv-text="</div>"/> + + + app/shared/users/user-notifications.component.html + 57 + Unlisted @@ -256,7 +363,7 @@ app/videos/+video-edit/shared/video-edit.component.html - 161 + 162 app/videos/+video-watch/video-watch.component.html @@ -412,7 +519,7 @@ app/videos/+video-watch/modal/video-report.component.html - 11 + 16 app/videos/+video-watch/modal/video-blacklist.component.html @@ -432,6 +539,12 @@ app/shared/moderation/user-ban-modal.component.html 25 + + <x id="INTERPOLATION" equiv-text="{{ menuEntry.label }}"/> + + app/shared/menu/top-menu-dropdown.component.html + 11 + Login @@ -520,7 +633,7 @@ app/+my-account/my-account-settings/my-account-settings.component.html - 12 + 13 I forgot my password @@ -536,7 +649,7 @@ app/menu/menu.component.html - 38 + 36 Forgot your password @@ -544,11 +657,19 @@ app/login/login.component.html 57 + + + We are sorry, you cannot recover you password because your instance administrator did not configure the PeerTube email system. + + + app/login/login.component.html + 63 + Email app/login/login.component.html - 63 + 68 app/signup/signup.component.html @@ -570,6 +691,10 @@ app/+admin/users/user-list/user-list.component.html 41 + + app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.html + 4 + app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.html 8 @@ -578,7 +703,7 @@ Email address app/login/login.component.html - 65 + 70 app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.html @@ -588,7 +713,7 @@ Send me an email to reset my password app/login/login.component.html - 75 + 80 @@ -658,11 +783,11 @@ app/+about/about-instance/about-instance.component.html - 22 + 26 app/+admin/config/edit-custom-config/edit-custom-config.component.html - 88 + 78 Features found on this instance @@ -721,7 +846,15 @@ app/menu/menu.component.html - 88 + 86 + + + + Help to translate PeerTube! + + + app/menu/language-chooser.component.html + 8 @@ -729,7 +862,7 @@ app/menu/menu.component.html - 18 + 16 @@ -737,7 +870,7 @@ app/menu/menu.component.html - 22 + 20 @@ -745,7 +878,7 @@ app/menu/menu.component.html - 26 + 24 @@ -753,19 +886,19 @@ app/menu/menu.component.html - 30 + 28 Create an account app/menu/menu.component.html - 39 + 37 Videos app/menu/menu.component.html - 43 + 41 app/+accounts/accounts.component.html @@ -779,49 +912,49 @@ Subscriptions app/menu/menu.component.html - 47 + 45 Overview app/menu/menu.component.html - 52 + 50 Trending app/menu/menu.component.html - 57 + 55 Recently added app/menu/menu.component.html - 62 + 60 Local app/menu/menu.component.html - 67 + 65 More app/menu/menu.component.html - 72 + 70 Administration app/menu/menu.component.html - 76 + 74 About app/menu/menu.component.html - 81 + 79 app/+accounts/accounts.component.html @@ -835,13 +968,41 @@ Show keyboard shortcuts app/menu/menu.component.html - 91 + 89 Toggle dark interface app/menu/menu.component.html - 94 + 92 + + + View your notifications + + app/menu/avatar-notification.component.html + 3 + + + Notifications + + app/menu/avatar-notification.component.html + 12 + + + app/+my-account/my-account-settings/my-account-settings.component.html + 10 + + + Update your notification preferences + + app/menu/avatar-notification.component.html + 15 + + + See all your notifications + + app/menu/avatar-notification.component.html + 22 Search... @@ -1067,19 +1228,85 @@ app/+about/about.component.html 7 - + + Contact <x id="INTERPOLATION" equiv-text="{{ instanceName }}"/> administrator + + app/+about/about-instance/contact-admin-modal.component.html + 3 + + + Your name + + app/+about/about-instance/contact-admin-modal.component.html + 11 + + + Your email + + app/+about/about-instance/contact-admin-modal.component.html + 20 + + + Your message + + app/+about/about-instance/contact-admin-modal.component.html + 29 + + - About <x id="INTERPOLATION" equiv-text="{{ instanceName }}"/> instance - + Cancel + + + app/+about/about-instance/contact-admin-modal.component.html + 38 + + + app/videos/+video-watch/modal/video-report.component.html + 24 + + + app/videos/+video-watch/modal/video-blacklist.component.html + 19 + + + Submit + + app/+about/about-instance/contact-admin-modal.component.html + 43 + + + app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html + 25 + + + app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html + 28 + + + app/videos/+video-watch/modal/video-report.component.html + 29 + + + app/videos/+video-watch/modal/video-blacklist.component.html + 24 + + + About <x id="INTERPOLATION" equiv-text="{{ instanceName }}"/> instance app/+about/about-instance/about-instance.component.html - 1 + 4 + + + Contact administrator + + app/+about/about-instance/about-instance.component.html + 6 Description app/+about/about-instance/about-instance.component.html - 10 + 14 app/+accounts/account-about/account-about.component.html @@ -1087,7 +1314,7 @@ app/+admin/config/edit-custom-config/edit-custom-config.component.html - 33 + 30 app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html @@ -1113,41 +1340,41 @@ Terms app/+about/about-instance/about-instance.component.html - 16 + 20 app/+admin/config/edit-custom-config/edit-custom-config.component.html - 44 + 39 User registration is allowed and app/+about/about-instance/about-instance.component.html - 25 + 29 - + - this instance provides a baseline quota of <x id="INTERPOLATION" equiv-text="{{ userVideoQuota | bytes: 0 }}"/> space for the videos of its users. - - - app/+about/about-instance/about-instance.component.html - 27 - - - - this instance provides unlimited space for the videos of its users. - + this instance provides a baseline quota of <x id="INTERPOLATION" equiv-text="{{ userVideoQuota | bytes: 0 }}"/> space for the videos of its users. + app/+about/about-instance/about-instance.component.html 31 - + - User registration is currently not allowed. - + this instance provides unlimited space for the videos of its users. + app/+about/about-instance/about-instance.component.html - 36 + 35 + + + + User registration is currently not allowed. + + + app/+about/about-instance/about-instance.component.html + 40 @@ -1433,7 +1660,7 @@ Name app/+admin/config/edit-custom-config/edit-custom-config.component.html - 11 + 12 app/+admin/follows/followers-list/followers-list.component.html @@ -1451,49 +1678,49 @@ Short description app/+admin/config/edit-custom-config/edit-custom-config.component.html - 22 + 21 Default client route app/+admin/config/edit-custom-config/edit-custom-config.component.html - 55 + 48 Videos Overview app/+admin/config/edit-custom-config/edit-custom-config.component.html - 58 + 51 Videos Trending app/+admin/config/edit-custom-config/edit-custom-config.component.html - 59 + 52 Videos Recently Added app/+admin/config/edit-custom-config/edit-custom-config.component.html - 60 + 53 Local videos app/+admin/config/edit-custom-config/edit-custom-config.component.html - 61 + 54 Policy on videos containing sensitive content app/+admin/config/edit-custom-config/edit-custom-config.component.html - 70 + 61 With <strong>Do not list</strong> or <strong>Blur thumbnails</strong>, a confirmation will be requested to watch the video. app/+admin/config/edit-custom-config/edit-custom-config.component.html - 73 + 64 app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html @@ -1503,7 +1730,7 @@ Do not list app/+admin/config/edit-custom-config/edit-custom-config.component.html - 78 + 69 app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html @@ -1513,7 +1740,7 @@ Blur thumbnails app/+admin/config/edit-custom-config/edit-custom-config.component.html - 79 + 70 app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html @@ -1523,7 +1750,7 @@ Display app/+admin/config/edit-custom-config/edit-custom-config.component.html - 80 + 71 app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html @@ -1533,25 +1760,43 @@ Signup enabled app/+admin/config/edit-custom-config/edit-custom-config.component.html - 93 + 84 Signup requires email verification app/+admin/config/edit-custom-config/edit-custom-config.component.html - 100 + 91 Signup limit + + app/+admin/config/edit-custom-config/edit-custom-config.component.html + 96 + + + Users app/+admin/config/edit-custom-config/edit-custom-config.component.html 105 + + User default video quota + + app/+admin/config/edit-custom-config/edit-custom-config.component.html + 109 + + + User default daily upload limit + + app/+admin/config/edit-custom-config/edit-custom-config.component.html + 121 + Import app/+admin/config/edit-custom-config/edit-custom-config.component.html - 115 + 133 app/videos/+video-edit/video-add-components/video-import-url.component.html @@ -1565,43 +1810,31 @@ Video import with HTTP URL (i.e. YouTube) enabled app/+admin/config/edit-custom-config/edit-custom-config.component.html - 120 + 141 Video import with a torrent file or a magnet URI enabled app/+admin/config/edit-custom-config/edit-custom-config.component.html - 127 + 148 Administrator app/+admin/config/edit-custom-config/edit-custom-config.component.html - 131 + 155 Admin email app/+admin/config/edit-custom-config/edit-custom-config.component.html - 134 + 158 - - Users + + Enable contact form app/+admin/config/edit-custom-config/edit-custom-config.component.html - 144 - - - User default video quota - - app/+admin/config/edit-custom-config/edit-custom-config.component.html - 147 - - - User default daily upload limit - - app/+admin/config/edit-custom-config/edit-custom-config.component.html - 161 + 169 Basic configuration @@ -1619,27 +1852,27 @@ Your Twitter username app/+admin/config/edit-custom-config/edit-custom-config.component.html - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. app/+admin/config/edit-custom-config/edit-custom-config.component.html - 184 + 187 Instance whitelisted by Twitter app/+admin/config/edit-custom-config/edit-custom-config.component.html - 198 + 199 - + If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br /> - If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.<br /><br /> - Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> to see if you instance is whitelisted. + If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.<br /><br /> + Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> to see if you instance is whitelisted. app/+admin/config/edit-custom-config/edit-custom-config.component.html - 199 + 200 Services @@ -1651,31 +1884,43 @@ Transcoding app/+admin/config/edit-custom-config/edit-custom-config.component.html - 210 + 215 Transcoding enabled app/+admin/config/edit-custom-config/edit-custom-config.component.html - 215 + 221 If you disable transcoding, many videos from your users will not work! app/+admin/config/edit-custom-config/edit-custom-config.component.html - 216 + 222 + + + Allow additional extensions + + app/+admin/config/edit-custom-config/edit-custom-config.component.html + 231 + + + Allow your users to upload .mkv, .mov, .avi, .flv videos + + app/+admin/config/edit-custom-config/edit-custom-config.component.html + 232 Transcoding threads app/+admin/config/edit-custom-config/edit-custom-config.component.html - 223 + 237 Resolution <x id="INTERPOLATION" equiv-text="{{resolution}}"/> enabled app/+admin/config/edit-custom-config/edit-custom-config.component.html - 239 + 252 @@ -1685,81 +1930,81 @@ app/+admin/config/edit-custom-config/edit-custom-config.component.html - 244 + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. app/+admin/config/edit-custom-config/edit-custom-config.component.html - 249 + 265 Previews cache size app/+admin/config/edit-custom-config/edit-custom-config.component.html - 254 + 271 Video captions cache size app/+admin/config/edit-custom-config/edit-custom-config.component.html - 265 + 280 Customizations app/+admin/config/edit-custom-config/edit-custom-config.component.html - 275 + 289 JavaScript app/+admin/config/edit-custom-config/edit-custom-config.component.html - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> app/+admin/config/edit-custom-config/edit-custom-config.component.html - 281 + 297 - + - Write directly CSS code. Example:<br /> - <pre> - body <x id="INTERPOLATION" equiv-text="{{ '{' }}"/> - background-color: red; - <x id="INTERPOLATION_1" equiv-text="{{ '}' }}"/> - </pre> + Write directly CSS code. Example:<br /> + <pre> + body <x id="INTERPOLATION" equiv-text="{{ '{' }}"/> + background-color: red; + <x id="INTERPOLATION_1" equiv-text="{{ '}' }}"/> + </pre> - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email <x id="INTERPOLATION" equiv-text="{{ '{' }}"/> - color: red; - <x id="INTERPOLATION_1" equiv-text="{{ '}' }}"/> - </pre> - + Prepend with <em>#custom-css</em> to override styles. Example: + <pre> + #custom-css .logged-in-email <x id="INTERPOLATION" equiv-text="{{ '{' }}"/> + color: red; + <x id="INTERPOLATION_1" equiv-text="{{ '}' }}"/> + </pre> + app/+admin/config/edit-custom-config/edit-custom-config.component.html - 297 + 311 Advanced configuration app/+admin/config/edit-custom-config/edit-custom-config.component.html - 207 + 212 Update configuration app/+admin/config/edit-custom-config/edit-custom-config.component.html - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. app/+admin/config/edit-custom-config/edit-custom-config.component.html - 326 + 341 @@ -2256,10 +2501,6 @@ app/+admin/moderation/moderation.component.html 9 - - app/+my-account/my-account.component.html - 29 - app/+my-account/my-account-blocklist/my-account-blocklist.component.html 2 @@ -2316,64 +2557,6 @@ app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html 23 - - My settings - - app/+my-account/my-account.component.html - 3 - - - My library - - app/+my-account/my-account.component.html - 7 - - - My channels - - app/+my-account/my-account.component.html - 12 - - - My videos - - app/+my-account/my-account.component.html - 14 - - - My subscriptions - - app/+my-account/my-account.component.html - 16 - - - My imports - - app/+my-account/my-account.component.html - 18 - - - Misc - - app/+my-account/my-account.component.html - 24 - - - Muted instances - - app/+my-account/my-account.component.html - 31 - - - app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html - 2 - - - Ownership changes - - app/+my-account/my-account.component.html - 33 - Video quota: @@ -2384,19 +2567,19 @@ Profile app/+my-account/my-account-settings/my-account-settings.component.html - 8 + 7 Video settings app/+my-account/my-account-settings/my-account-settings.component.html - 15 + 16 Danger zone app/+my-account/my-account-settings/my-account-settings.component.html - 18 + 19 Change ownership @@ -2430,24 +2613,6 @@ app/videos/+video-edit/shared/video-caption-add-modal.component.html 35 - - Submit - - app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html - 25 - - - app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html - 28 - - - app/videos/+video-watch/modal/video-report.component.html - 24 - - - app/videos/+video-watch/modal/video-blacklist.component.html - 24 - <x id="INTERPOLATION" equiv-text="{{ video.createdAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> views @@ -2612,6 +2777,48 @@ When you will upload a video in this channel, the video support field will be au app/+my-account/my-account-ownership/my-account-ownership.component.html 47 + + Muted instances + + app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html + 2 + + + History enabled + + app/+my-account/my-account-history/my-account-history.component.html + 4 + + + Delete history + + app/+my-account/my-account-history/my-account-history.component.html + 8 + + + You don't have videos history yet. + + app/+my-account/my-account-history/my-account-history.component.html + 13 + + + <x id="INTERPOLATION" equiv-text="{{ video.views | myNumberFormatter }}"/> views + + app/+my-account/my-account-history/my-account-history.component.html + 22 + + + Notification preferences + + app/+my-account/my-account-notifications/my-account-notifications.component.html + 2 + + + Mark all as read + + app/+my-account/my-account-notifications/my-account-notifications.component.html + 4 + Change password @@ -2700,6 +2907,18 @@ When you will upload a video in this channel, the video support field will be au app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.html 4 + + Activities + + app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.html + 2 + + + Web + + app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.html + 3 + Sorry, but we couldn't find the page you were looking for. @@ -2874,13 +3093,13 @@ When you will upload a video in this channel, the video support field will be au Publish will be available when upload is finished app/videos/+video-edit/video-add-components/video-upload.component.html - 53 + 54 Publish app/videos/+video-edit/video-add-components/video-upload.component.html - 60 + 61 Select the torrent to import @@ -3038,13 +3257,13 @@ When you will upload a video in this channel, the video support field will be au Wait transcoding before publishing the video app/videos/+video-edit/shared/video-edit.component.html - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. app/videos/+video-edit/shared/video-edit.component.html - 131 + 132 Basic info @@ -3056,43 +3275,43 @@ When you will upload a video in this channel, the video support field will be au Add another caption app/videos/+video-edit/shared/video-edit.component.html - 146 + 147 See the subtitle file app/videos/+video-edit/shared/video-edit.component.html - 155 + 156 Already uploaded ✔ app/videos/+video-edit/shared/video-edit.component.html - 159 + 160 Will be created on update app/videos/+video-edit/shared/video-edit.component.html - 167 + 168 Cancel create app/videos/+video-edit/shared/video-edit.component.html - 169 + 170 Will be deleted on update app/videos/+video-edit/shared/video-edit.component.html - 175 + 176 Cancel deletion app/videos/+video-edit/shared/video-edit.component.html - 177 + 178 @@ -3100,31 +3319,31 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-edit/shared/video-edit.component.html - 182 + 183 Captions app/videos/+video-edit/shared/video-edit.component.html - 139 + 140 Upload thumbnail app/videos/+video-edit/shared/video-edit.component.html - 195 + 196 Upload preview app/videos/+video-edit/shared/video-edit.component.html - 202 + 203 Support app/videos/+video-edit/shared/video-edit.component.html - 208 + 209 app/videos/+video-watch/modal/video-support.component.html @@ -3138,13 +3357,13 @@ When you will upload a video in this channel, the video support field will be au Short text to tell people how they can support you (membership platform...). app/videos/+video-edit/shared/video-edit.component.html - 209 + 210 Advanced settings app/videos/+video-edit/shared/video-edit.component.html - 190 + 191 @@ -3206,17 +3425,14 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-watch/modal/video-report.component.html 3 - + - Cancel - + Your report will be sent to moderators of <x id="INTERPOLATION" equiv-text="{{ currentHost }}"/>. + <x id="START_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="<ng-container>"/> It will be forwarded to origin instance <x id="INTERPOLATION_1" equiv-text="{{ originHost }}"/> too.<x id="CLOSE_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="</ng-container>"/> + app/videos/+video-watch/modal/video-report.component.html - 19 - - - app/videos/+video-watch/modal/video-blacklist.component.html - 19 + 9 Share @@ -3531,13 +3747,27 @@ When you will upload a video in this channel, the video support field will be au 14 - - Error getting about from server + + Cannot get about information from server src/app/+about/about-instance/about-instance.component.ts 1 + + Your message has been sent. + + src/app/+about/about-instance/contact-admin-modal.component.ts + 1 + + + + You already sent this form recently + + src/app/+about/about-instance/contact-admin-modal.component.ts + 1 + + No description @@ -3571,345 +3801,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Error - - src/app/+accounts/accounts.component.ts - 1 - - - src/app/+accounts/accounts.component.ts - 1 - - - src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts - 1 - - - src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts - 1 - - - src/app/+admin/follows/followers-list/followers-list.component.ts - 1 - - - src/app/+admin/follows/following-add/following-add.component.ts - 1 - - - src/app/+admin/follows/following-list/following-list.component.ts - 1 - - - src/app/+admin/follows/following-list/following-list.component.ts - 1 - - - src/app/+admin/follows/shared/redundancy-checkbox.component.ts - 1 - - - src/app/+admin/jobs/jobs-list/jobs-list.component.ts - 1 - - - src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts - 1 - - - src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts - 1 - - - src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts - 1 - - - src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts - 1 - - - src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts - 1 - - - src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts - 1 - - - src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts - 1 - - - src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts - 1 - - - src/app/+admin/users/user-list/user-list.component.ts - 1 - - - src/app/+admin/users/user-list/user-list.component.ts - 1 - - - src/app/+admin/users/user-list/user-list.component.ts - 1 - - - src/app/+admin/users/user-list/user-list.component.ts - 1 - - - src/app/+admin/users/user-list/user-list.component.ts - 1 - - - src/app/+admin/users/user-list/user-list.component.ts - 1 - - - src/app/+my-account/my-account-blocklist/my-account-blocklist.component.ts - 1 - - - src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts - 1 - - - src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.ts - 1 - - - src/app/+my-account/my-account-ownership/my-account-ownership.component.ts - 1 - - - src/app/+my-account/my-account-ownership/my-account-ownership.component.ts - 1 - - - src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts - 1 - - - src/app/+my-account/my-account-settings/my-account-settings.component.ts - 1 - - - src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts - 1 - - - src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.ts - 1 - - - src/app/+my-account/my-account-video-channels/my-account-video-channel-update.component.ts - 1 - - - src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts - 1 - - - src/app/+my-account/my-account-video-imports/my-account-video-imports.component.ts - 1 - - - src/app/+my-account/my-account-videos/my-account-videos.component.ts - 1 - - - src/app/+my-account/my-account-videos/my-account-videos.component.ts - 1 - - - src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.ts - 1 - - - src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts - 1 - - - src/app/+verify-account/verify-account-email/verify-account-email.component.ts - 1 - - - src/app/+verify-account/verify-account-email/verify-account-email.component.ts - 1 - - - src/app/core/auth/auth.service.ts - 1 - - - src/app/login/login.component.ts - 1 - - - src/app/reset-password/reset-password.component.ts - 1 - - - src/app/search/search.component.ts - 1 - - - src/app/shared/forms/reactive-file.component.ts - 1 - - - src/app/shared/moderation/user-ban-modal.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/user-subscription/subscribe-button.component.ts - 1 - - - src/app/shared/user-subscription/subscribe-button.component.ts - 1 - - - src/app/shared/user-subscription/subscribe-button.component.ts - 1 - - - src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts - 1 - - - src/app/videos/+video-edit/video-add-components/video-import-url.component.ts - 1 - - - src/app/videos/+video-edit/video-add-components/video-upload.component.ts - 1 - - - src/app/videos/+video-edit/video-add-components/video-upload.component.ts - 1 - - - src/app/videos/+video-edit/video-add-components/video-upload.component.ts - 1 - - - src/app/videos/+video-edit/video-add-components/video-upload.component.ts - 1 - - - src/app/videos/+video-edit/video-update.component.ts - 1 - - - src/app/videos/+video-edit/video-update.component.ts - 1 - - - src/app/videos/+video-watch/comment/video-comment-add.component.ts - 1 - - - src/app/videos/+video-watch/comment/video-comments.component.ts - 1 - - - src/app/videos/+video-watch/comment/video-comments.component.ts - 1 - - - src/app/videos/+video-watch/comment/video-comments.component.ts - 1 - - - src/app/videos/+video-watch/modal/video-blacklist.component.ts - 1 - - - src/app/videos/+video-watch/modal/video-report.component.ts - 1 - - - src/app/videos/+video-watch/video-watch.component.ts - 1 - - - src/app/videos/+video-watch/video-watch.component.ts - 1 - - - src/app/videos/+video-watch/video-watch.component.ts - 1 - - - src/app/videos/+video-watch/video-watch.component.ts - 1 - - - src/app/videos/+video-watch/video-watch.component.ts - 1 - - - src/app/videos/+video-watch/video-watch.component.ts - 1 - - 240p @@ -3952,229 +3843,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Success - - src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts - 1 - - - src/app/+admin/follows/following-add/following-add.component.ts - 1 - - - src/app/+admin/follows/following-list/following-list.component.ts - 1 - - - src/app/+admin/follows/shared/redundancy-checkbox.component.ts - 1 - - - src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts - 1 - - - src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts - 1 - - - src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts - 1 - - - src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts - 1 - - - src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts - 1 - - - src/app/+admin/users/user-edit/user-create.component.ts - 1 - - - src/app/+admin/users/user-edit/user-update.component.ts - 1 - - - src/app/+admin/users/user-list/user-list.component.ts - 1 - - - src/app/+admin/users/user-list/user-list.component.ts - 1 - - - src/app/+admin/users/user-list/user-list.component.ts - 1 - - - src/app/+my-account/my-account-blocklist/my-account-blocklist.component.ts - 1 - - - src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts - 1 - - - src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.ts - 1 - - - src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts - 1 - - - src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts - 1 - - - src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts - 1 - - - src/app/+my-account/my-account-settings/my-account-settings.component.ts - 1 - - - src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts - 1 - - - src/app/+my-account/my-account-video-channels/my-account-video-channel-create.component.ts - 1 - - - src/app/+my-account/my-account-video-channels/my-account-video-channel-update.component.ts - 1 - - - src/app/+my-account/my-account-video-channels/my-account-video-channel-update.component.ts - 1 - - - src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts - 1 - - - src/app/+my-account/my-account-videos/my-account-videos.component.ts - 1 - - - src/app/+my-account/my-account-videos/my-account-videos.component.ts - 1 - - - src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.ts - 1 - - - src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts - 1 - - - src/app/login/login.component.ts - 1 - - - src/app/reset-password/reset-password.component.ts - 1 - - - src/app/shared/moderation/user-ban-modal.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/signup/signup.component.ts - 1 - - - src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts - 1 - - - src/app/videos/+video-edit/video-add-components/video-import-url.component.ts - 1 - - - src/app/videos/+video-edit/video-add-components/video-upload.component.ts - 1 - - - src/app/videos/+video-edit/video-update.component.ts - 1 - - - src/app/videos/+video-watch/modal/video-blacklist.component.ts - 1 - - - src/app/videos/+video-watch/modal/video-download.component.ts - 1 - - - src/app/videos/+video-watch/modal/video-report.component.ts - 1 - - - src/app/videos/+video-watch/modal/video-share.component.ts - 1 - - - src/app/videos/+video-watch/video-watch.component.ts - 1 - - - src/app/videos/+video-watch/video-watch.component.ts - 1 - - Configuration updated. @@ -4575,6 +4243,48 @@ When you will upload a video in this channel, the video support field will be au 1 + + My videos history + + src/app/+my-account/my-account-history/my-account-history.component.ts + 1 + + + + Videos history is enabled + + src/app/+my-account/my-account-history/my-account-history.component.ts + 1 + + + + Videos history is disabled + + src/app/+my-account/my-account-history/my-account-history.component.ts + 1 + + + + Delete videos history + + src/app/+my-account/my-account-history/my-account-history.component.ts + 1 + + + + Are you sure you want to delete all your videos history? + + src/app/+my-account/my-account-history/my-account-history.component.ts + 1 + + + + Videos history deleted + + src/app/+my-account/my-account-history/my-account-history.component.ts + 1 + + Ownership accepted @@ -4624,6 +4334,76 @@ When you will upload a video in this channel, the video support field will be au 1 + + New video from your subscriptions + + src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts + 1 + + + + New comment on your video + + src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts + 1 + + + + New video abuse on local video + + src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts + 1 + + + + One of your video is blacklisted/unblacklisted + + src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts + 1 + + + + Video published (after transcoding/scheduled update) + + src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts + 1 + + + + Video import finished + + src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts + 1 + + + + A new user registered on your instance + + src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts + 1 + + + + You or your channel(s) has a new follower + + src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts + 1 + + + + Someone mentioned you in video comments + + src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts + 1 + + + + Preferences saved + + src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts + 1 + + Profile updated. @@ -4698,6 +4478,17 @@ When you will upload a video in this channel, the video support field will be au 1 + + My videos + + src/app/+my-account/my-account-videos/my-account-videos.component.ts + 1 + + + src/app/+my-account/my-account.component.ts + 1 + + Do you really want to delete <x id="INTERPOLATION" equiv-text="{{deleteLength}}"/> videos? @@ -4772,15 +4563,57 @@ When you will upload a video in this channel, the video support field will be au 1 - - Channels + + My library src/app/+my-account/my-account.component.ts 1 - - Video imports + + My channels + + src/app/+my-account/my-account.component.ts + 1 + + + + My subscriptions + + src/app/+my-account/my-account.component.ts + 1 + + + + My history + + src/app/+my-account/my-account.component.ts + 1 + + + + Misc + + src/app/+my-account/my-account.component.ts + 1 + + + + Ownership changes + + src/app/+my-account/my-account.component.ts + 1 + + + + My settings + + src/app/+my-account/my-account.component.ts + 1 + + + + My notifications src/app/+my-account/my-account.component.ts 1 @@ -4914,6 +4747,17 @@ When you will upload a video in this channel, the video support field will be au 1 + + Error + + src/app/core/auth/auth.service.ts + 1 + + + src/app/core/notification/notifier.service.ts + 1 + + You need to reconnect. @@ -4935,6 +4779,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Info + + src/app/core/notification/notifier.service.ts + 1 + + + + Success + + src/app/core/notification/notifier.service.ts + 1 + + Incorrect username or password. @@ -5156,6 +5014,70 @@ When you will upload a video in this channel, the video support field will be au 1 + + Email is required. + + src/app/shared/forms/form-validators/instance-validators.service.ts + 1 + + + src/app/shared/forms/form-validators/user-validators.service.ts + 1 + + + + Email must be valid. + + src/app/shared/forms/form-validators/instance-validators.service.ts + 1 + + + src/app/shared/forms/form-validators/user-validators.service.ts + 1 + + + + Your name is required. + + src/app/shared/forms/form-validators/instance-validators.service.ts + 1 + + + + Your name must be at least 1 character long. + + src/app/shared/forms/form-validators/instance-validators.service.ts + 1 + + + + Your name cannot be more than 120 characters long. + + src/app/shared/forms/form-validators/instance-validators.service.ts + 1 + + + + A message is required. + + src/app/shared/forms/form-validators/instance-validators.service.ts + 1 + + + + The message must be at least 3 characters long. + + src/app/shared/forms/form-validators/instance-validators.service.ts + 1 + + + + The message cannot be more than 5000 characters long. + + src/app/shared/forms/form-validators/instance-validators.service.ts + 1 + + Username is required. @@ -5185,36 +5107,22 @@ When you will upload a video in this channel, the video support field will be au 1 - - Username must be at least 3 characters long. + + Username must be at least 1 character long. src/app/shared/forms/form-validators/user-validators.service.ts 1 - - Username cannot be more than 20 characters long. + + Username cannot be more than 50 characters long. src/app/shared/forms/form-validators/user-validators.service.ts 1 - - Username should be only lowercase alphanumeric characters. - - src/app/shared/forms/form-validators/user-validators.service.ts - 1 - - - - Email is required. - - src/app/shared/forms/form-validators/user-validators.service.ts - 1 - - - - Email must be valid. + + Username should be lowercase alphanumeric; dots and underscores are allowed. src/app/shared/forms/form-validators/user-validators.service.ts 1 @@ -5287,8 +5195,8 @@ When you will upload a video in this channel, the video support field will be au 1 - - Display name must be at least 3 characters long. + + Display name must be at least 1 character long. src/app/shared/forms/form-validators/user-validators.service.ts 1 @@ -5298,8 +5206,8 @@ When you will upload a video in this channel, the video support field will be au 1 - - Display name cannot be more than 120 characters long. + + Display name cannot be more than 50 characters long. src/app/shared/forms/form-validators/user-validators.service.ts 1 @@ -5450,22 +5358,22 @@ When you will upload a video in this channel, the video support field will be au 1 - - Name must be at least 3 characters long. + + Name must be at least 1 character long. src/app/shared/forms/form-validators/video-channel-validators.service.ts 1 - - Name cannot be more than 20 characters long. + + Name cannot be more than 50 characters long. src/app/shared/forms/form-validators/video-channel-validators.service.ts 1 - - Name should be only lowercase alphanumeric characters. + + Name should be lowercase alphanumeric; dots and underscores are allowed. src/app/shared/forms/form-validators/video-channel-validators.service.ts 1 @@ -6313,13 +6221,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Subscribed - - src/app/shared/user-subscription/subscribe-button.component.ts - 1 - - Subscribed to <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> @@ -6327,8 +6228,8 @@ When you will upload a video in this channel, the video support field will be au 1 - - Unsubscribed + + Subscribed src/app/shared/user-subscription/subscribe-button.component.ts 1 @@ -6341,6 +6242,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + Unsubscribed + + src/app/shared/user-subscription/subscribe-button.component.ts + 1 + + Moderator @@ -6415,13 +6323,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Info - - src/app/videos/+video-edit/video-add-components/video-upload.component.ts - 1 - - Upload cancelled @@ -6429,13 +6330,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - We are sorry but PeerTube cannot handle videos > 8GB - - src/app/videos/+video-edit/video-add-components/video-upload.component.ts - 1 - - Your video quota is exceeded with this video (video size: <x id="INTERPOLATION" equiv-text="{{videoSize}}"/>, used: <x id="INTERPOLATION_1" equiv-text="{{videoQuotaUsed}}"/>, quota: <x id="INTERPOLATION_2" equiv-text="{{videoQuota}}"/>) diff --git a/server/tests/api/server/contact-form.ts b/server/tests/api/server/contact-form.ts index 1a165331b..93221d0a3 100644 --- a/server/tests/api/server/contact-form.ts +++ b/server/tests/api/server/contact-form.ts @@ -30,6 +30,8 @@ describe('Test contact form', function () { }) it('Should send a contact form', async function () { + this.timeout(10000) + await sendContactForm({ url: server.url, fromEmail: 'toto@example.com', From 93f85e90ffa27453e2c909406b62bef65963b8ad Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 10 Jan 2019 12:07:34 +0100 Subject: [PATCH 091/137] Update credits --- CREDITS.md | 20 ++++++++++++++++---- scripts/generate-code-contributors.ts | 10 ++++++++-- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/CREDITS.md b/CREDITS.md index ad5125227..509f9800d 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -6,25 +6,27 @@ * [Nutomic](https://github.com/Nutomic) * [Jorropo](https://github.com/Jorropo) * [BO41](https://github.com/BO41) + * [joshmorel](https://github.com/joshmorel) + * [buoyantair](https://github.com/buoyantair) * [bnjbvr](https://github.com/bnjbvr) * [DavidLibeau](https://github.com/DavidLibeau) * [jankeromnes](https://github.com/jankeromnes) - * [joshmorel](https://github.com/joshmorel) * [JohnXLivingston](https://github.com/JohnXLivingston) * [kaiyou](https://github.com/kaiyou) + * [McFlat](https://github.com/McFlat) * [DimitriGilbert](https://github.com/DimitriGilbert) * [floSoX](https://github.com/floSoX) * [Green-Star](https://github.com/Green-Star) + * [thomaskuntzz](https://github.com/thomaskuntzz) * [rezonant](https://github.com/rezonant) * [ldidry](https://github.com/ldidry) - * [McFlat](https://github.com/McFlat) * [okhin](https://github.com/okhin) * [daftaupe](https://github.com/daftaupe) - * [thomaskuntzz](https://github.com/thomaskuntzz) * [LecygneNoir](https://github.com/LecygneNoir) * [fflorent](https://github.com/fflorent) * [dedesite](https://github.com/dedesite) * [Nautigsam](https://github.com/Nautigsam) + * [scanlime](https://github.com/scanlime) * [tcitworld](https://github.com/tcitworld) * [am97](https://github.com/am97) * [dadall](https://github.com/dadall) @@ -35,7 +37,6 @@ * [jocelynj](https://github.com/jocelynj) * [lucas-dclrcq](https://github.com/lucas-dclrcq) * [lucaspontoexe](https://github.com/lucaspontoexe) - * [scanlime](https://github.com/scanlime) * [flyingrub](https://github.com/flyingrub) * [SerCom-KC](https://github.com/SerCom-KC) * [valvin1](https://github.com/valvin1) @@ -43,6 +44,7 @@ * [sticmac](https://github.com/sticmac) * [barbeque](https://github.com/barbeque) * [luzpaz](https://github.com/luzpaz) + * [acid-chicken](https://github.com/acid-chicken) * [louistio](https://github.com/louistio) * [qsypoq](https://github.com/qsypoq) * [daker](https://github.com/daker) @@ -65,6 +67,7 @@ * [grizio](https://github.com/grizio) * [Glandos](https://github.com/Glandos) * [lanodan](https://github.com/lanodan) + * [HesioZ](https://github.com/HesioZ) * [jagannathBhat](https://github.com/jagannathBhat) * [jlebras](https://github.com/jlebras) * [alcalyn](https://github.com/alcalyn) @@ -73,7 +76,9 @@ * [zapashcanon](https://github.com/zapashcanon) * [mart-e](https://github.com/mart-e) * [0mp](https://github.com/0mp) + * [mkoppmann](https://github.com/mkoppmann) * [1000i100](https://github.com/1000i100) + * [roipoussiere](https://github.com/roipoussiere) * [zeograd](https://github.com/zeograd) * [PhieF](https://github.com/PhieF) * [Quenty31](https://github.com/Quenty31) @@ -125,11 +130,14 @@ * [h3zjp](https://trad.framasoft.org/zanata/profile/view/h3zjp) * [jfblanc](https://trad.framasoft.org/zanata/profile/view/jfblanc) * [jhertel](https://trad.framasoft.org/zanata/profile/view/jhertel) + * [jmf](https://trad.framasoft.org/zanata/profile/view/jmf) * [jorropo](https://trad.framasoft.org/zanata/profile/view/jorropo) + * [kairozen](https://trad.framasoft.org/zanata/profile/view/kairozen) * [kedemferre](https://trad.framasoft.org/zanata/profile/view/kedemferre) * [kousha](https://trad.framasoft.org/zanata/profile/view/kousha) * [krkk](https://trad.framasoft.org/zanata/profile/view/krkk) * [landrok](https://trad.framasoft.org/zanata/profile/view/landrok) + * [leeroyepold48](https://trad.framasoft.org/zanata/profile/view/leeroyepold48) * [m4sk1n](https://trad.framasoft.org/zanata/profile/view/m4sk1n) * [matograine](https://trad.framasoft.org/zanata/profile/view/matograine) * [medow](https://trad.framasoft.org/zanata/profile/view/medow) @@ -167,6 +175,10 @@ * [xinayder](https://trad.framasoft.org/zanata/profile/view/xinayder) * [xosem](https://trad.framasoft.org/zanata/profile/view/xosem) * [zveryok](https://trad.framasoft.org/zanata/profile/view/zveryok) + * [aditoo](https://trad.framasoft.org/zanata/profile/view/aditoo) + * [autom](https://trad.framasoft.org/zanata/profile/view/autom) + * [curupira](https://trad.framasoft.org/zanata/profile/view/curupira) + * [leeroyepold48](https://trad.framasoft.org/zanata/profile/view/leeroyepold48) # Design diff --git a/scripts/generate-code-contributors.ts b/scripts/generate-code-contributors.ts index 3d37372d1..9824bc2f5 100755 --- a/scripts/generate-code-contributors.ts +++ b/scripts/generate-code-contributors.ts @@ -70,11 +70,17 @@ async function fetchGithub (url: string) { async function fetchZanata (zanataUsername: string, zanataPassword: string) { const today = new Date().toISOString().split('T')[0] - const url = `https://trad.framasoft.org/zanata/rest/project/peertube/version/develop/contributors/2018-01-01..${today}` + const year2018 = `https://trad.framasoft.org/zanata/rest/project/peertube/version/develop/contributors/2018-01-01..2019-01-01` + const year2019 = `https://trad.framasoft.org/zanata/rest/project/peertube/version/develop/contributors/2019-01-01..${today}` const headers = { 'X-Auth-User': zanataUsername, 'X-Auth-Token': zanataPassword } - return get(url, headers) + const [ results2018, results2019 ] = await Promise.all([ + get(year2018, headers), + get(year2019, headers) + ]) + + return results2018.concat(results2019) } From 5abb9fbbd12e7097e348d6a38622d364b1fa47ed Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 10 Jan 2019 15:39:51 +0100 Subject: [PATCH 092/137] Add ability to unfederate a local video (on blacklist) --- .../video-blacklist-list.component.html | 6 +- .../video-blacklist-list.component.ts | 6 + .../users/user-list/user-list.component.html | 3 + .../video-blacklist.service.ts | 7 +- .../modal/video-blacklist.component.html | 7 + .../modal/video-blacklist.component.ts | 10 +- server/controllers/api/videos/blacklist.ts | 17 +- server/controllers/api/videos/index.ts | 6 +- server/initializers/constants.ts | 2 +- .../migrations/0320-blacklist-unfederate.ts | 27 ++ server/lib/activitypub/share.ts | 16 +- .../validators/videos/video-blacklist.ts | 15 +- server/models/video/video-blacklist.ts | 21 +- .../tests/api/check-params/video-blacklist.ts | 118 ++++--- server/tests/api/videos/index.ts | 1 - .../api/videos/video-blacklist-management.ts | 192 ----------- server/tests/api/videos/video-blacklist.ts | 303 +++++++++++++++--- .../blacklist/video-blacklist-create.model.ts | 1 + .../videos/blacklist/video-blacklist.model.ts | 1 + shared/utils/server/servers.ts | 4 + shared/utils/videos/video-blacklist.ts | 11 +- 21 files changed, 456 insertions(+), 318 deletions(-) create mode 100644 server/initializers/migrations/0320-blacklist-unfederate.ts delete mode 100644 server/tests/api/videos/video-blacklist-management.ts diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html index 7cef787d2..6398af218 100644 --- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html +++ b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html @@ -7,6 +7,7 @@ Video name Sensitive + Unfederated Date @@ -26,7 +27,8 @@ - {{ videoBlacklist.video.nsfw }} + {{ booleanToText(videoBlacklist.video.nsfw) }} + {{ booleanToText(videoBlacklist.unfederated) }} {{ videoBlacklist.createdAt }} @@ -37,7 +39,7 @@ - + Blacklist reason: {{ videoBlacklist.reason }} diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts index a02e84f67..6c6f17f0c 100644 --- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts +++ b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts @@ -46,6 +46,12 @@ export class VideoBlacklistListComponent extends RestTable implements OnInit { return Video.buildClientUrl(videoBlacklist.video.uuid) } + booleanToText (value: boolean) { + if (value === true) return this.i18n('yes') + + return this.i18n('no') + } + async removeVideoFromBlacklist (entry: VideoBlacklist) { const confirmMessage = this.i18n( 'Do you really want to remove this video from the blacklist? It will be available again in the videos list.' diff --git a/client/src/app/+admin/users/user-list/user-list.component.html b/client/src/app/+admin/users/user-list/user-list.component.html index 556ab3c5d..8c03a924b 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.html +++ b/client/src/app/+admin/users/user-list/user-list.component.html @@ -65,7 +65,9 @@ (banned) + {{ user.email }} + ? {{ user.email }} @@ -76,6 +78,7 @@ + {{ user.videoQuotaUsed }} / {{ user.videoQuota }} {{ user.roleLabel }} {{ user.createdAt }} diff --git a/client/src/app/shared/video-blacklist/video-blacklist.service.ts b/client/src/app/shared/video-blacklist/video-blacklist.service.ts index 7d39fd4f2..94e46d7c2 100644 --- a/client/src/app/shared/video-blacklist/video-blacklist.service.ts +++ b/client/src/app/shared/video-blacklist/video-blacklist.service.ts @@ -36,8 +36,11 @@ export class VideoBlacklistService { ) } - blacklistVideo (videoId: number, reason?: string) { - const body = reason ? { reason } : {} + blacklistVideo (videoId: number, reason: string, unfederate: boolean) { + const body = { + unfederate, + reason + } return this.authHttp.post(VideoBlacklistService.BASE_VIDEOS_URL + videoId + '/blacklist', body) .pipe( diff --git a/client/src/app/videos/+video-watch/modal/video-blacklist.component.html b/client/src/app/videos/+video-watch/modal/video-blacklist.component.html index c436501b4..83600fa81 100644 --- a/client/src/app/videos/+video-watch/modal/video-blacklist.component.html +++ b/client/src/app/videos/+video-watch/modal/video-blacklist.component.html @@ -15,6 +15,13 @@
+
+ +
+
Cancel diff --git a/client/src/app/videos/+video-watch/modal/video-blacklist.component.ts b/client/src/app/videos/+video-watch/modal/video-blacklist.component.ts index 357ce39ce..50a7cadd1 100644 --- a/client/src/app/videos/+video-watch/modal/video-blacklist.component.ts +++ b/client/src/app/videos/+video-watch/modal/video-blacklist.component.ts @@ -34,9 +34,12 @@ export class VideoBlacklistComponent extends FormReactive implements OnInit { } ngOnInit () { + const defaultValues = { unfederate: 'true' } + this.buildForm({ - reason: this.videoBlacklistValidatorsService.VIDEO_BLACKLIST_REASON - }) + reason: this.videoBlacklistValidatorsService.VIDEO_BLACKLIST_REASON, + unfederate: null + }, defaultValues) } show () { @@ -50,8 +53,9 @@ export class VideoBlacklistComponent extends FormReactive implements OnInit { blacklist () { const reason = this.form.value[ 'reason' ] || undefined + const unfederate = this.video.isLocal ? this.form.value[ 'unfederate' ] : undefined - this.videoBlacklistService.blacklistVideo(this.video.id, reason) + this.videoBlacklistService.blacklistVideo(this.video.id, reason, unfederate) .subscribe( () => { this.notifier.success(this.i18n('Video blacklisted.')) diff --git a/server/controllers/api/videos/blacklist.ts b/server/controllers/api/videos/blacklist.ts index 9ef08812b..43b0516e7 100644 --- a/server/controllers/api/videos/blacklist.ts +++ b/server/controllers/api/videos/blacklist.ts @@ -18,6 +18,8 @@ import { VideoBlacklistModel } from '../../../models/video/video-blacklist' import { sequelizeTypescript } from '../../../initializers' import { Notifier } from '../../../lib/notifier' import { VideoModel } from '../../../models/video/video' +import { sendCreateVideo, sendDeleteVideo, sendUpdateVideo } from '../../../lib/activitypub/send' +import { federateVideoIfNeeded } from '../../../lib/activitypub' const blacklistRouter = express.Router() @@ -66,12 +68,17 @@ async function addVideoToBlacklist (req: express.Request, res: express.Response) const toCreate = { videoId: videoInstance.id, + unfederated: body.unfederate === true, reason: body.reason } const blacklist = await VideoBlacklistModel.create(toCreate) blacklist.Video = videoInstance + if (body.unfederate === true) { + await sendDeleteVideo(videoInstance, undefined) + } + Notifier.Instance.notifyOnVideoBlacklist(blacklist) logger.info('Video %s blacklisted.', res.locals.video.uuid) @@ -101,8 +108,14 @@ async function removeVideoFromBlacklistController (req: express.Request, res: ex const videoBlacklist = res.locals.videoBlacklist as VideoBlacklistModel const video: VideoModel = res.locals.video - await sequelizeTypescript.transaction(t => { - return videoBlacklist.destroy({ transaction: t }) + await sequelizeTypescript.transaction(async t => { + const unfederated = videoBlacklist.unfederated + await videoBlacklist.destroy({ transaction: t }) + + // Re federate the video + if (unfederated === true) { + await federateVideoIfNeeded(video, true, t) + } }) Notifier.Instance.notifyOnVideoUnblacklist(video) diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index 33521a8c1..28ac26598 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts @@ -364,7 +364,11 @@ async function updateVideo (req: express.Request, res: express.Response) { } const isNewVideo = wasPrivateVideo && videoInstanceUpdated.privacy !== VideoPrivacy.PRIVATE - await federateVideoIfNeeded(videoInstanceUpdated, isNewVideo, t) + + // Don't send update if the video was unfederated + if (!videoInstanceUpdated.VideoBlacklist || videoInstanceUpdated.VideoBlacklist.unfederated === false) { + await federateVideoIfNeeded(videoInstanceUpdated, isNewVideo, t) + } auditLogger.update( getAuditIdFromRes(res), diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 4a88aef87..b18884eeb 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -16,7 +16,7 @@ let config: IConfig = require('config') // --------------------------------------------------------------------------- -const LAST_MIGRATION_VERSION = 315 +const LAST_MIGRATION_VERSION = 320 // --------------------------------------------------------------------------- diff --git a/server/initializers/migrations/0320-blacklist-unfederate.ts b/server/initializers/migrations/0320-blacklist-unfederate.ts new file mode 100644 index 000000000..6fb7bbb90 --- /dev/null +++ b/server/initializers/migrations/0320-blacklist-unfederate.ts @@ -0,0 +1,27 @@ +import * as Sequelize from 'sequelize' + +async function up (utils: { + transaction: Sequelize.Transaction, + queryInterface: Sequelize.QueryInterface, + sequelize: Sequelize.Sequelize +}): Promise { + + { + const data = { + type: Sequelize.BOOLEAN, + allowNull: false, + defaultValue: false + } + + await utils.queryInterface.addColumn('videoBlacklist', 'unfederated', data) + } +} + +function down (options) { + throw new Error('Not implemented.') +} + +export { + up, + down +} diff --git a/server/lib/activitypub/share.ts b/server/lib/activitypub/share.ts index 5dcba778c..170e49238 100644 --- a/server/lib/activitypub/share.ts +++ b/server/lib/activitypub/share.ts @@ -78,7 +78,7 @@ async function shareByServer (video: VideoModel, t: Transaction) { const serverActor = await getServerActor() const serverShareUrl = getVideoAnnounceActivityPubUrl(serverActor, video) - return VideoShareModel.findOrCreate({ + const [ serverShare ] = await VideoShareModel.findOrCreate({ defaults: { actorId: serverActor.id, videoId: video.id, @@ -88,16 +88,14 @@ async function shareByServer (video: VideoModel, t: Transaction) { url: serverShareUrl }, transaction: t - }).then(([ serverShare, created ]) => { - if (created) return sendVideoAnnounce(serverActor, serverShare, video, t) - - return undefined }) + + return sendVideoAnnounce(serverActor, serverShare, video, t) } async function shareByVideoChannel (video: VideoModel, t: Transaction) { const videoChannelShareUrl = getVideoAnnounceActivityPubUrl(video.VideoChannel.Actor, video) - return VideoShareModel.findOrCreate({ + const [ videoChannelShare ] = await VideoShareModel.findOrCreate({ defaults: { actorId: video.VideoChannel.actorId, videoId: video.id, @@ -107,11 +105,9 @@ async function shareByVideoChannel (video: VideoModel, t: Transaction) { url: videoChannelShareUrl }, transaction: t - }).then(([ videoChannelShare, created ]) => { - if (created) return sendVideoAnnounce(video.VideoChannel.Actor, videoChannelShare, video, t) - - return undefined }) + + return sendVideoAnnounce(video.VideoChannel.Actor, videoChannelShare, video, t) } async function undoShareByVideoChannel (video: VideoModel, oldVideoChannel: VideoChannelModel, t: Transaction) { diff --git a/server/middlewares/validators/videos/video-blacklist.ts b/server/middlewares/validators/videos/video-blacklist.ts index 13da7acff..2688f63ae 100644 --- a/server/middlewares/validators/videos/video-blacklist.ts +++ b/server/middlewares/validators/videos/video-blacklist.ts @@ -1,10 +1,11 @@ import * as express from 'express' import { body, param } from 'express-validator/check' -import { isIdOrUUIDValid } from '../../../helpers/custom-validators/misc' +import { isBooleanValid, isIdOrUUIDValid } from '../../../helpers/custom-validators/misc' import { isVideoExist } from '../../../helpers/custom-validators/videos' import { logger } from '../../../helpers/logger' import { areValidationErrors } from '../utils' import { isVideoBlacklistExist, isVideoBlacklistReasonValid } from '../../../helpers/custom-validators/video-blacklist' +import { VideoModel } from '../../../models/video/video' const videosBlacklistRemoveValidator = [ param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid videoId'), @@ -22,6 +23,10 @@ const videosBlacklistRemoveValidator = [ const videosBlacklistAddValidator = [ param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid videoId'), + body('unfederate') + .optional() + .toBoolean() + .custom(isBooleanValid).withMessage('Should have a valid unfederate boolean'), body('reason') .optional() .custom(isVideoBlacklistReasonValid).withMessage('Should have a valid reason'), @@ -32,6 +37,14 @@ const videosBlacklistAddValidator = [ if (areValidationErrors(req, res)) return if (!await isVideoExist(req.params.videoId, res)) return + const video: VideoModel = res.locals.video + if (req.body.unfederate === true && video.remote === true) { + return res + .status(409) + .send({ error: 'You cannot unfederate a remote video.' }) + .end() + } + return next() } ] diff --git a/server/models/video/video-blacklist.ts b/server/models/video/video-blacklist.ts index 23e992685..3b567e488 100644 --- a/server/models/video/video-blacklist.ts +++ b/server/models/video/video-blacklist.ts @@ -1,21 +1,7 @@ -import { - AfterCreate, - AfterDestroy, - AllowNull, - BelongsTo, - Column, - CreatedAt, - DataType, - ForeignKey, - Is, - Model, - Table, - UpdatedAt -} from 'sequelize-typescript' +import { AllowNull, BelongsTo, Column, CreatedAt, DataType, ForeignKey, Is, Model, Table, UpdatedAt } from 'sequelize-typescript' import { getSortOnModel, SortType, throwIfNotValid } from '../utils' import { VideoModel } from './video' import { isVideoBlacklistReasonValid } from '../../helpers/custom-validators/video-blacklist' -import { Emailer } from '../../lib/emailer' import { VideoBlacklist } from '../../../shared/models/videos' import { CONSTRAINTS_FIELDS } from '../../initializers' @@ -35,6 +21,10 @@ export class VideoBlacklistModel extends Model { @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEO_BLACKLIST.REASON.max)) reason: string + @AllowNull(false) + @Column + unfederated: boolean + @CreatedAt createdAt: Date @@ -93,6 +83,7 @@ export class VideoBlacklistModel extends Model { createdAt: this.createdAt, updatedAt: this.updatedAt, reason: this.reason, + unfederated: this.unfederated, video: { id: video.id, diff --git a/server/tests/api/check-params/video-blacklist.ts b/server/tests/api/check-params/video-blacklist.ts index 8e1206db3..6b82643f4 100644 --- a/server/tests/api/check-params/video-blacklist.ts +++ b/server/tests/api/check-params/video-blacklist.ts @@ -4,17 +4,20 @@ import 'mocha' import { createUser, + doubleFollow, + flushAndRunMultipleServers, flushTests, - getBlacklistedVideosList, getVideo, getVideoWithToken, + getBlacklistedVideosList, + getVideo, + getVideoWithToken, killallServers, makePostBodyRequest, makePutBodyRequest, removeVideoFromBlacklist, - runServer, ServerInfo, setAccessTokensToServers, uploadVideo, - userLogin + userLogin, waitJobs } from '../../../../shared/utils' import { checkBadCountPagination, @@ -25,8 +28,9 @@ import { VideoDetails } from '../../../../shared/models/videos' import { expect } from 'chai' describe('Test video blacklist API validators', function () { - let server: ServerInfo + let servers: ServerInfo[] let notBlacklistedVideoId: number + let remoteVideoUUID: string let userAccessToken1 = '' let userAccessToken2 = '' @@ -36,75 +40,89 @@ describe('Test video blacklist API validators', function () { this.timeout(120000) await flushTests() + servers = await flushAndRunMultipleServers(2) - server = await runServer(1) - - await setAccessTokensToServers([ server ]) + await setAccessTokensToServers(servers) + await doubleFollow(servers[0], servers[1]) { const username = 'user1' const password = 'my super password' - await createUser(server.url, server.accessToken, username, password) - userAccessToken1 = await userLogin(server, { username, password }) + await createUser(servers[0].url, servers[0].accessToken, username, password) + userAccessToken1 = await userLogin(servers[0], { username, password }) } { const username = 'user2' const password = 'my super password' - await createUser(server.url, server.accessToken, username, password) - userAccessToken2 = await userLogin(server, { username, password }) + await createUser(servers[0].url, servers[0].accessToken, username, password) + userAccessToken2 = await userLogin(servers[0], { username, password }) } { - const res = await uploadVideo(server.url, userAccessToken1, {}) - server.video = res.body.video + const res = await uploadVideo(servers[0].url, userAccessToken1, {}) + servers[0].video = res.body.video } { - const res = await uploadVideo(server.url, server.accessToken, {}) + const res = await uploadVideo(servers[0].url, servers[0].accessToken, {}) notBlacklistedVideoId = res.body.video.uuid } + + { + const res = await uploadVideo(servers[1].url, servers[1].accessToken, {}) + remoteVideoUUID = res.body.video.uuid + } + + await waitJobs(servers) }) describe('When adding a video in blacklist', function () { const basePath = '/api/v1/videos/' it('Should fail with nothing', async function () { - const path = basePath + server.video + '/blacklist' + const path = basePath + servers[0].video + '/blacklist' const fields = {} - await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) + await makePostBodyRequest({ url: servers[0].url, path, token: servers[0].accessToken, fields }) }) it('Should fail with a wrong video', async function () { const wrongPath = '/api/v1/videos/blabla/blacklist' const fields = {} - await makePostBodyRequest({ url: server.url, path: wrongPath, token: server.accessToken, fields }) + await makePostBodyRequest({ url: servers[0].url, path: wrongPath, token: servers[0].accessToken, fields }) }) it('Should fail with a non authenticated user', async function () { - const path = basePath + server.video + '/blacklist' + const path = basePath + servers[0].video + '/blacklist' const fields = {} - await makePostBodyRequest({ url: server.url, path, token: 'hello', fields, statusCodeExpected: 401 }) + await makePostBodyRequest({ url: servers[0].url, path, token: 'hello', fields, statusCodeExpected: 401 }) }) it('Should fail with a non admin user', async function () { - const path = basePath + server.video + '/blacklist' + const path = basePath + servers[0].video + '/blacklist' const fields = {} - await makePostBodyRequest({ url: server.url, path, token: userAccessToken2, fields, statusCodeExpected: 403 }) + await makePostBodyRequest({ url: servers[0].url, path, token: userAccessToken2, fields, statusCodeExpected: 403 }) }) it('Should fail with an invalid reason', async function () { - const path = basePath + server.video.uuid + '/blacklist' + const path = basePath + servers[0].video.uuid + '/blacklist' const fields = { reason: 'a'.repeat(305) } - await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) + await makePostBodyRequest({ url: servers[0].url, path, token: servers[0].accessToken, fields }) + }) + + it('Should fail to unfederate a remote video', async function () { + const path = basePath + remoteVideoUUID + '/blacklist' + const fields = { unfederate: true } + + await makePostBodyRequest({ url: servers[0].url, path, token: servers[0].accessToken, fields, statusCodeExpected: 409 }) }) it('Should succeed with the correct params', async function () { - const path = basePath + server.video.uuid + '/blacklist' + const path = basePath + servers[0].video.uuid + '/blacklist' const fields = { } - await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields, statusCodeExpected: 204 }) + await makePostBodyRequest({ url: servers[0].url, path, token: servers[0].accessToken, fields, statusCodeExpected: 204 }) }) }) @@ -114,61 +132,61 @@ describe('Test video blacklist API validators', function () { it('Should fail with a wrong video', async function () { const wrongPath = '/api/v1/videos/blabla/blacklist' const fields = {} - await makePutBodyRequest({ url: server.url, path: wrongPath, token: server.accessToken, fields }) + await makePutBodyRequest({ url: servers[0].url, path: wrongPath, token: servers[0].accessToken, fields }) }) it('Should fail with a video not blacklisted', async function () { const path = '/api/v1/videos/' + notBlacklistedVideoId + '/blacklist' const fields = {} - await makePutBodyRequest({ url: server.url, path, token: server.accessToken, fields, statusCodeExpected: 404 }) + await makePutBodyRequest({ url: servers[0].url, path, token: servers[0].accessToken, fields, statusCodeExpected: 404 }) }) it('Should fail with a non authenticated user', async function () { - const path = basePath + server.video + '/blacklist' + const path = basePath + servers[0].video + '/blacklist' const fields = {} - await makePutBodyRequest({ url: server.url, path, token: 'hello', fields, statusCodeExpected: 401 }) + await makePutBodyRequest({ url: servers[0].url, path, token: 'hello', fields, statusCodeExpected: 401 }) }) it('Should fail with a non admin user', async function () { - const path = basePath + server.video + '/blacklist' + const path = basePath + servers[0].video + '/blacklist' const fields = {} - await makePutBodyRequest({ url: server.url, path, token: userAccessToken2, fields, statusCodeExpected: 403 }) + await makePutBodyRequest({ url: servers[0].url, path, token: userAccessToken2, fields, statusCodeExpected: 403 }) }) it('Should fail with an invalid reason', async function () { - const path = basePath + server.video.uuid + '/blacklist' + const path = basePath + servers[0].video.uuid + '/blacklist' const fields = { reason: 'a'.repeat(305) } - await makePutBodyRequest({ url: server.url, path, token: server.accessToken, fields }) + await makePutBodyRequest({ url: servers[0].url, path, token: servers[0].accessToken, fields }) }) it('Should succeed with the correct params', async function () { - const path = basePath + server.video.uuid + '/blacklist' + const path = basePath + servers[0].video.uuid + '/blacklist' const fields = { reason: 'hello' } - await makePutBodyRequest({ url: server.url, path, token: server.accessToken, fields, statusCodeExpected: 204 }) + await makePutBodyRequest({ url: servers[0].url, path, token: servers[0].accessToken, fields, statusCodeExpected: 204 }) }) }) describe('When getting blacklisted video', function () { it('Should fail with a non authenticated user', async function () { - await getVideo(server.url, server.video.uuid, 401) + await getVideo(servers[0].url, servers[0].video.uuid, 401) }) it('Should fail with another user', async function () { - await getVideoWithToken(server.url, userAccessToken2, server.video.uuid, 403) + await getVideoWithToken(servers[0].url, userAccessToken2, servers[0].video.uuid, 403) }) it('Should succeed with the owner authenticated user', async function () { - const res = await getVideoWithToken(server.url, userAccessToken1, server.video.uuid, 200) + const res = await getVideoWithToken(servers[0].url, userAccessToken1, servers[0].video.uuid, 200) const video: VideoDetails = res.body expect(video.blacklisted).to.be.true }) it('Should succeed with an admin', async function () { - const res = await getVideoWithToken(server.url, server.accessToken, server.video.uuid, 200) + const res = await getVideoWithToken(servers[0].url, servers[0].accessToken, servers[0].video.uuid, 200) const video: VideoDetails = res.body expect(video.blacklisted).to.be.true @@ -177,24 +195,24 @@ describe('Test video blacklist API validators', function () { describe('When removing a video in blacklist', function () { it('Should fail with a non authenticated user', async function () { - await removeVideoFromBlacklist(server.url, 'fake token', server.video.uuid, 401) + await removeVideoFromBlacklist(servers[0].url, 'fake token', servers[0].video.uuid, 401) }) it('Should fail with a non admin user', async function () { - await removeVideoFromBlacklist(server.url, userAccessToken2, server.video.uuid, 403) + await removeVideoFromBlacklist(servers[0].url, userAccessToken2, servers[0].video.uuid, 403) }) it('Should fail with an incorrect id', async function () { - await removeVideoFromBlacklist(server.url, server.accessToken, 'hello', 400) + await removeVideoFromBlacklist(servers[0].url, servers[0].accessToken, 'hello', 400) }) it('Should fail with a not blacklisted video', async function () { // The video was not added to the blacklist so it should fail - await removeVideoFromBlacklist(server.url, server.accessToken, notBlacklistedVideoId, 404) + await removeVideoFromBlacklist(servers[0].url, servers[0].accessToken, notBlacklistedVideoId, 404) }) it('Should succeed with the correct params', async function () { - await removeVideoFromBlacklist(server.url, server.accessToken, server.video.uuid, 204) + await removeVideoFromBlacklist(servers[0].url, servers[0].accessToken, servers[0].video.uuid, 204) }) }) @@ -202,28 +220,28 @@ describe('Test video blacklist API validators', function () { const basePath = '/api/v1/videos/blacklist/' it('Should fail with a non authenticated user', async function () { - await getBlacklistedVideosList(server.url, 'fake token', 401) + await getBlacklistedVideosList(servers[0].url, 'fake token', 401) }) it('Should fail with a non admin user', async function () { - await getBlacklistedVideosList(server.url, userAccessToken2, 403) + await getBlacklistedVideosList(servers[0].url, userAccessToken2, 403) }) it('Should fail with a bad start pagination', async function () { - await checkBadStartPagination(server.url, basePath, server.accessToken) + await checkBadStartPagination(servers[0].url, basePath, servers[0].accessToken) }) it('Should fail with a bad count pagination', async function () { - await checkBadCountPagination(server.url, basePath, server.accessToken) + await checkBadCountPagination(servers[0].url, basePath, servers[0].accessToken) }) it('Should fail with an incorrect sort', async function () { - await checkBadSortPagination(server.url, basePath, server.accessToken) + await checkBadSortPagination(servers[0].url, basePath, servers[0].accessToken) }) }) after(async function () { - killallServers([ server ]) + killallServers(servers) // Keep the logs if the test failed if (this['ok']) { diff --git a/server/tests/api/videos/index.ts b/server/tests/api/videos/index.ts index 9bdb78491..97f467aae 100644 --- a/server/tests/api/videos/index.ts +++ b/server/tests/api/videos/index.ts @@ -3,7 +3,6 @@ import './services' import './single-server' import './video-abuse' import './video-blacklist' -import './video-blacklist-management' import './video-captions' import './video-change-ownership' import './video-channels' diff --git a/server/tests/api/videos/video-blacklist-management.ts b/server/tests/api/videos/video-blacklist-management.ts deleted file mode 100644 index 61411e30d..000000000 --- a/server/tests/api/videos/video-blacklist-management.ts +++ /dev/null @@ -1,192 +0,0 @@ -/* tslint:disable:no-unused-expression */ - -import * as chai from 'chai' -import { orderBy } from 'lodash' -import 'mocha' -import { - addVideoToBlacklist, - flushAndRunMultipleServers, - getBlacklistedVideosList, - getMyVideos, - getSortedBlacklistedVideosList, - getVideosList, - killallServers, - removeVideoFromBlacklist, - ServerInfo, - setAccessTokensToServers, - updateVideoBlacklist, - uploadVideo -} from '../../../../shared/utils/index' -import { doubleFollow } from '../../../../shared/utils/server/follows' -import { waitJobs } from '../../../../shared/utils/server/jobs' -import { VideoAbuse } from '../../../../shared/models/videos' - -const expect = chai.expect - -describe('Test video blacklist management', function () { - let servers: ServerInfo[] = [] - let videoId: number - - async function blacklistVideosOnServer (server: ServerInfo) { - const res = await getVideosList(server.url) - - const videos = res.body.data - for (let video of videos) { - await addVideoToBlacklist(server.url, server.accessToken, video.id, 'super reason') - } - } - - before(async function () { - this.timeout(50000) - - // Run servers - servers = await flushAndRunMultipleServers(2) - - // Get the access tokens - await setAccessTokensToServers(servers) - - // Server 1 and server 2 follow each other - await doubleFollow(servers[0], servers[1]) - - // Upload 2 videos on server 2 - await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'My 1st video', description: 'A video on server 2' }) - await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'My 2nd video', description: 'A video on server 2' }) - - // Wait videos propagation, server 2 has transcoding enabled - await waitJobs(servers) - - // Blacklist the two videos on server 1 - await blacklistVideosOnServer(servers[0]) - }) - - describe('When listing blacklisted videos', function () { - it('Should display all the blacklisted videos', async function () { - const res = await getBlacklistedVideosList(servers[0].url, servers[0].accessToken) - - expect(res.body.total).to.equal(2) - - const blacklistedVideos = res.body.data - expect(blacklistedVideos).to.be.an('array') - expect(blacklistedVideos.length).to.equal(2) - - for (const blacklistedVideo of blacklistedVideos) { - expect(blacklistedVideo.reason).to.equal('super reason') - videoId = blacklistedVideo.video.id - } - }) - - it('Should get the correct sort when sorting by descending id', async function () { - const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, '-id') - expect(res.body.total).to.equal(2) - - const blacklistedVideos = res.body.data - expect(blacklistedVideos).to.be.an('array') - expect(blacklistedVideos.length).to.equal(2) - - const result = orderBy(res.body.data, [ 'id' ], [ 'desc' ]) - - expect(blacklistedVideos).to.deep.equal(result) - }) - - it('Should get the correct sort when sorting by descending video name', async function () { - const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, '-name') - expect(res.body.total).to.equal(2) - - const blacklistedVideos = res.body.data - expect(blacklistedVideos).to.be.an('array') - expect(blacklistedVideos.length).to.equal(2) - - const result = orderBy(res.body.data, [ 'name' ], [ 'desc' ]) - - expect(blacklistedVideos).to.deep.equal(result) - }) - - it('Should get the correct sort when sorting by ascending creation date', async function () { - const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, 'createdAt') - expect(res.body.total).to.equal(2) - - const blacklistedVideos = res.body.data - expect(blacklistedVideos).to.be.an('array') - expect(blacklistedVideos.length).to.equal(2) - - const result = orderBy(res.body.data, [ 'createdAt' ]) - - expect(blacklistedVideos).to.deep.equal(result) - }) - }) - - describe('When updating blacklisted videos', function () { - it('Should change the reason', async function () { - await updateVideoBlacklist(servers[0].url, servers[0].accessToken, videoId, 'my super reason updated') - - const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, '-name') - const video = res.body.data.find(b => b.video.id === videoId) - - expect(video.reason).to.equal('my super reason updated') - }) - }) - - describe('When listing my videos', function () { - it('Should display blacklisted videos', async function () { - await blacklistVideosOnServer(servers[1]) - - const res = await getMyVideos(servers[1].url, servers[1].accessToken, 0, 5) - - expect(res.body.total).to.equal(2) - expect(res.body.data).to.have.lengthOf(2) - - for (const video of res.body.data) { - expect(video.blacklisted).to.be.true - expect(video.blacklistedReason).to.equal('super reason') - } - }) - }) - - describe('When removing a blacklisted video', function () { - let videoToRemove: VideoAbuse - let blacklist = [] - - it('Should not have any video in videos list on server 1', async function () { - const res = await getVideosList(servers[0].url) - expect(res.body.total).to.equal(0) - expect(res.body.data).to.be.an('array') - expect(res.body.data.length).to.equal(0) - }) - - it('Should remove a video from the blacklist on server 1', async function () { - // Get one video in the blacklist - const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, '-name') - videoToRemove = res.body.data[0] - blacklist = res.body.data.slice(1) - - // Remove it - await removeVideoFromBlacklist(servers[0].url, servers[0].accessToken, videoToRemove.video.id) - }) - - it('Should have the ex-blacklisted video in videos list on server 1', async function () { - const res = await getVideosList(servers[0].url) - expect(res.body.total).to.equal(1) - - const videos = res.body.data - expect(videos).to.be.an('array') - expect(videos.length).to.equal(1) - - expect(videos[0].name).to.equal(videoToRemove.video.name) - expect(videos[0].id).to.equal(videoToRemove.video.id) - }) - - it('Should not have the ex-blacklisted video in videos blacklist list on server 1', async function () { - const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, '-name') - expect(res.body.total).to.equal(1) - - const videos = res.body.data - expect(videos).to.be.an('array') - expect(videos.length).to.equal(1) - expect(videos).to.deep.equal(blacklist) - }) - }) - - after(async function () { - killallServers(servers) - }) -}) diff --git a/server/tests/api/videos/video-blacklist.ts b/server/tests/api/videos/video-blacklist.ts index 1cce82d2a..d39ad63b4 100644 --- a/server/tests/api/videos/video-blacklist.ts +++ b/server/tests/api/videos/video-blacklist.ts @@ -1,24 +1,43 @@ /* tslint:disable:no-unused-expression */ import * as chai from 'chai' +import { orderBy } from 'lodash' import 'mocha' import { addVideoToBlacklist, flushAndRunMultipleServers, + getBlacklistedVideosList, + getMyVideos, + getSortedBlacklistedVideosList, getVideosList, killallServers, + removeVideoFromBlacklist, searchVideo, ServerInfo, setAccessTokensToServers, - uploadVideo + updateVideo, + updateVideoBlacklist, + uploadVideo, + viewVideo } from '../../../../shared/utils/index' import { doubleFollow } from '../../../../shared/utils/server/follows' import { waitJobs } from '../../../../shared/utils/server/jobs' +import { VideoBlacklist } from '../../../../shared/models/videos' const expect = chai.expect -describe('Test video blacklists', function () { +describe('Test video blacklist management', function () { let servers: ServerInfo[] = [] + let videoId: number + + async function blacklistVideosOnServer (server: ServerInfo) { + const res = await getVideosList(server.url) + + const videos = res.body.data + for (let video of videos) { + await addVideoToBlacklist(server.url, server.accessToken, video.id, 'super reason') + } + } before(async function () { this.timeout(50000) @@ -32,58 +51,270 @@ describe('Test video blacklists', function () { // Server 1 and server 2 follow each other await doubleFollow(servers[0], servers[1]) - // Upload a video on server 2 - const videoAttributes = { - name: 'my super name for server 2', - description: 'my super description for server 2' - } - await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributes) + // Upload 2 videos on server 2 + await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'My 1st video', description: 'A video on server 2' }) + await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'My 2nd video', description: 'A video on server 2' }) // Wait videos propagation, server 2 has transcoding enabled await waitJobs(servers) - const res = await getVideosList(servers[0].url) - const videos = res.body.data - - expect(videos.length).to.equal(1) - - servers[0].remoteVideo = videos.find(video => video.name === 'my super name for server 2') + // Blacklist the two videos on server 1 + await blacklistVideosOnServer(servers[0]) }) - it('Should blacklist a remote video on server 1', async function () { - await addVideoToBlacklist(servers[0].url, servers[0].accessToken, servers[0].remoteVideo.id) + describe('When listing/searching videos', function () { + + it('Should not have the video blacklisted in videos list/search on server 1', async function () { + { + const res = await getVideosList(servers[ 0 ].url) + + expect(res.body.total).to.equal(0) + expect(res.body.data).to.be.an('array') + expect(res.body.data.length).to.equal(0) + } + + { + const res = await searchVideo(servers[ 0 ].url, 'name') + + expect(res.body.total).to.equal(0) + expect(res.body.data).to.be.an('array') + expect(res.body.data.length).to.equal(0) + } + }) + + it('Should have the blacklisted video in videos list/search on server 2', async function () { + { + const res = await getVideosList(servers[ 1 ].url) + + expect(res.body.total).to.equal(2) + expect(res.body.data).to.be.an('array') + expect(res.body.data.length).to.equal(2) + } + + { + const res = await searchVideo(servers[ 1 ].url, 'video') + + expect(res.body.total).to.equal(2) + expect(res.body.data).to.be.an('array') + expect(res.body.data.length).to.equal(2) + } + }) }) - it('Should not have the video blacklisted in videos list on server 1', async function () { - const res = await getVideosList(servers[0].url) + describe('When listing blacklisted videos', function () { + it('Should display all the blacklisted videos', async function () { + const res = await getBlacklistedVideosList(servers[0].url, servers[0].accessToken) - expect(res.body.total).to.equal(0) - expect(res.body.data).to.be.an('array') - expect(res.body.data.length).to.equal(0) + expect(res.body.total).to.equal(2) + + const blacklistedVideos = res.body.data + expect(blacklistedVideos).to.be.an('array') + expect(blacklistedVideos.length).to.equal(2) + + for (const blacklistedVideo of blacklistedVideos) { + expect(blacklistedVideo.reason).to.equal('super reason') + videoId = blacklistedVideo.video.id + } + }) + + it('Should get the correct sort when sorting by descending id', async function () { + const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, '-id') + expect(res.body.total).to.equal(2) + + const blacklistedVideos = res.body.data + expect(blacklistedVideos).to.be.an('array') + expect(blacklistedVideos.length).to.equal(2) + + const result = orderBy(res.body.data, [ 'id' ], [ 'desc' ]) + + expect(blacklistedVideos).to.deep.equal(result) + }) + + it('Should get the correct sort when sorting by descending video name', async function () { + const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, '-name') + expect(res.body.total).to.equal(2) + + const blacklistedVideos = res.body.data + expect(blacklistedVideos).to.be.an('array') + expect(blacklistedVideos.length).to.equal(2) + + const result = orderBy(res.body.data, [ 'name' ], [ 'desc' ]) + + expect(blacklistedVideos).to.deep.equal(result) + }) + + it('Should get the correct sort when sorting by ascending creation date', async function () { + const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, 'createdAt') + expect(res.body.total).to.equal(2) + + const blacklistedVideos = res.body.data + expect(blacklistedVideos).to.be.an('array') + expect(blacklistedVideos.length).to.equal(2) + + const result = orderBy(res.body.data, [ 'createdAt' ]) + + expect(blacklistedVideos).to.deep.equal(result) + }) }) - it('Should not have the video blacklisted in videos search on server 1', async function () { - const res = await searchVideo(servers[0].url, 'name') + describe('When updating blacklisted videos', function () { + it('Should change the reason', async function () { + await updateVideoBlacklist(servers[0].url, servers[0].accessToken, videoId, 'my super reason updated') - expect(res.body.total).to.equal(0) - expect(res.body.data).to.be.an('array') - expect(res.body.data.length).to.equal(0) + const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, '-name') + const video = res.body.data.find(b => b.video.id === videoId) + + expect(video.reason).to.equal('my super reason updated') + }) }) - it('Should have the blacklisted video in videos list on server 2', async function () { - const res = await getVideosList(servers[1].url) + describe('When listing my videos', function () { + it('Should display blacklisted videos', async function () { + await blacklistVideosOnServer(servers[1]) - expect(res.body.total).to.equal(1) - expect(res.body.data).to.be.an('array') - expect(res.body.data.length).to.equal(1) + const res = await getMyVideos(servers[1].url, servers[1].accessToken, 0, 5) + + expect(res.body.total).to.equal(2) + expect(res.body.data).to.have.lengthOf(2) + + for (const video of res.body.data) { + expect(video.blacklisted).to.be.true + expect(video.blacklistedReason).to.equal('super reason') + } + }) }) - it('Should have the video blacklisted in videos search on server 2', async function () { - const res = await searchVideo(servers[1].url, 'name') + describe('When removing a blacklisted video', function () { + let videoToRemove: VideoBlacklist + let blacklist = [] + + it('Should not have any video in videos list on server 1', async function () { + const res = await getVideosList(servers[0].url) + expect(res.body.total).to.equal(0) + expect(res.body.data).to.be.an('array') + expect(res.body.data.length).to.equal(0) + }) + + it('Should remove a video from the blacklist on server 1', async function () { + // Get one video in the blacklist + const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, '-name') + videoToRemove = res.body.data[0] + blacklist = res.body.data.slice(1) + + // Remove it + await removeVideoFromBlacklist(servers[0].url, servers[0].accessToken, videoToRemove.video.id) + }) + + it('Should have the ex-blacklisted video in videos list on server 1', async function () { + const res = await getVideosList(servers[0].url) + expect(res.body.total).to.equal(1) + + const videos = res.body.data + expect(videos).to.be.an('array') + expect(videos.length).to.equal(1) + + expect(videos[0].name).to.equal(videoToRemove.video.name) + expect(videos[0].id).to.equal(videoToRemove.video.id) + }) + + it('Should not have the ex-blacklisted video in videos blacklist list on server 1', async function () { + const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, '-name') + expect(res.body.total).to.equal(1) + + const videos = res.body.data + expect(videos).to.be.an('array') + expect(videos.length).to.equal(1) + expect(videos).to.deep.equal(blacklist) + }) + }) + + describe('When blacklisting local videos', function () { + let video3UUID: string + let video4UUID: string + + before(async function () { + this.timeout(10000) + + { + const res = await uploadVideo(servers[0].url, servers[0].accessToken, { name: 'Video 3' }) + video3UUID = res.body.video.uuid + } + { + const res = await uploadVideo(servers[ 0 ].url, servers[ 0 ].accessToken, { name: 'Video 4' }) + video4UUID = res.body.video.uuid + } + + await waitJobs(servers) + }) + + it('Should blacklist video 3 and keep it federated', async function () { + this.timeout(10000) + + await addVideoToBlacklist(servers[ 0 ].url, servers[ 0 ].accessToken, video3UUID, 'super reason', false) + + await waitJobs(servers) + + { + const res = await getVideosList(servers[ 0 ].url) + expect(res.body.data.find(v => v.uuid === video3UUID)).to.be.undefined + } + + { + const res = await getVideosList(servers[ 1 ].url) + expect(res.body.data.find(v => v.uuid === video3UUID)).to.not.be.undefined + } + }) + + it('Should unfederate the video', async function () { + this.timeout(10000) + + await addVideoToBlacklist(servers[ 0 ].url, servers[ 0 ].accessToken, video4UUID, 'super reason', true) + + await waitJobs(servers) + + for (const server of servers) { + const res = await getVideosList(server.url) + expect(res.body.data.find(v => v.uuid === video4UUID)).to.be.undefined + } + }) + + it('Should have the video unfederated even after an Update AP message', async function () { + this.timeout(10000) + + await updateVideo(servers[ 0 ].url, servers[ 0 ].accessToken, video4UUID, { description: 'super description' }) + + await waitJobs(servers) + + for (const server of servers) { + const res = await getVideosList(server.url) + expect(res.body.data.find(v => v.uuid === video4UUID)).to.be.undefined + } + }) + + it('Should have the correct video blacklist unfederate attribute', async function () { + const res = await getSortedBlacklistedVideosList(servers[0].url, servers[0].accessToken, 'createdAt') + + const blacklistedVideos: VideoBlacklist[] = res.body.data + const video3Blacklisted = blacklistedVideos.find(b => b.video.uuid === video3UUID) + const video4Blacklisted = blacklistedVideos.find(b => b.video.uuid === video4UUID) + + expect(video3Blacklisted.unfederated).to.be.false + expect(video4Blacklisted.unfederated).to.be.true + }) + + it('Should remove the video from blacklist and refederate the video', async function () { + this.timeout(10000) + + await removeVideoFromBlacklist(servers[ 0 ].url, servers[ 0 ].accessToken, video4UUID) + + await waitJobs(servers) + + for (const server of servers) { + const res = await getVideosList(server.url) + expect(res.body.data.find(v => v.uuid === video4UUID)).to.not.be.undefined + } + }) - expect(res.body.total).to.equal(1) - expect(res.body.data).to.be.an('array') - expect(res.body.data.length).to.equal(1) }) after(async function () { diff --git a/shared/models/videos/blacklist/video-blacklist-create.model.ts b/shared/models/videos/blacklist/video-blacklist-create.model.ts index 89c69cb56..6e7d36421 100644 --- a/shared/models/videos/blacklist/video-blacklist-create.model.ts +++ b/shared/models/videos/blacklist/video-blacklist-create.model.ts @@ -1,3 +1,4 @@ export interface VideoBlacklistCreate { reason?: string + unfederate?: boolean } diff --git a/shared/models/videos/blacklist/video-blacklist.model.ts b/shared/models/videos/blacklist/video-blacklist.model.ts index ef4e5e3a2..4bd976190 100644 --- a/shared/models/videos/blacklist/video-blacklist.model.ts +++ b/shared/models/videos/blacklist/video-blacklist.model.ts @@ -2,6 +2,7 @@ export interface VideoBlacklist { id: number createdAt: Date updatedAt: Date + unfederated: boolean reason?: string video: { diff --git a/shared/utils/server/servers.ts b/shared/utils/server/servers.ts index 568385a41..1e9c83c72 100644 --- a/shared/utils/server/servers.ts +++ b/shared/utils/server/servers.ts @@ -145,8 +145,12 @@ function runServer (serverNumber: number, configOverride?: Object, args = []) { if (dontContinue === true) return server.app.stdout.removeListener('data', onStdout) + + process.on('exit', () => process.kill(server.app.pid)) + res(server) }) + }) } diff --git a/shared/utils/videos/video-blacklist.ts b/shared/utils/videos/video-blacklist.ts index 2c176fde0..f2ae0ed26 100644 --- a/shared/utils/videos/video-blacklist.ts +++ b/shared/utils/videos/video-blacklist.ts @@ -1,11 +1,18 @@ import * as request from 'supertest' -function addVideoToBlacklist (url: string, token: string, videoId: number | string, reason?: string, specialStatus = 204) { +function addVideoToBlacklist ( + url: string, + token: string, + videoId: number | string, + reason?: string, + unfederate?: boolean, + specialStatus = 204 +) { const path = '/api/v1/videos/' + videoId + '/blacklist' return request(url) .post(path) - .send({ reason }) + .send({ reason, unfederate }) .set('Accept', 'application/json') .set('Authorization', 'Bearer ' + token) .expect(specialStatus) From c04eb647db4f543a31a8100c1ec9a86c700bca6a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 10 Jan 2019 16:00:23 +0100 Subject: [PATCH 093/137] Use origin video url in canonical tag --- server/lib/client-html.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/lib/client-html.ts b/server/lib/client-html.ts index 1875ec1fc..b2c376e20 100644 --- a/server/lib/client-html.ts +++ b/server/lib/client-html.ts @@ -1,7 +1,7 @@ import * as express from 'express' import * as Bluebird from 'bluebird' import { buildFileLocale, getDefaultLocale, is18nLocale, POSSIBLE_LOCALES } from '../../shared/models/i18n/i18n' -import { CONFIG, CUSTOM_HTML_TAG_COMMENTS, EMBED_SIZE, STATIC_PATHS } from '../initializers' +import { CONFIG, CUSTOM_HTML_TAG_COMMENTS, EMBED_SIZE } from '../initializers' import { join } from 'path' import { escapeHTML } from '../helpers/core-utils' import { VideoModel } from '../models/video/video' @@ -187,8 +187,8 @@ export class ClientHtml { // Schema.org tagsString += `` - // SEO - tagsString += `` + // SEO, use origin video url so Google does not index remote videos + tagsString += `` return htmlStringPage.replace(CUSTOM_HTML_TAG_COMMENTS.OPENGRAPH_AND_OEMBED, tagsString) } From e902e03f0fd2eded99d635b1f9d2c59f417c4721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?victor=20h=C3=A9ry?= Date: Sun, 13 Jan 2019 14:21:58 +0100 Subject: [PATCH 094/137] Patch docker entrypoint to speed up the chown at startup --- support/docker/production/docker-entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/docker/production/docker-entrypoint.sh b/support/docker/production/docker-entrypoint.sh index 6dbbfddf6..7dd626b9f 100755 --- a/support/docker/production/docker-entrypoint.sh +++ b/support/docker/production/docker-entrypoint.sh @@ -9,7 +9,7 @@ fi # Always copy default and custom env configuration file, in cases where new keys were added cp /app/config/default.yaml /config cp /app/support/docker/production/config/custom-environment-variables.yaml /config -chown -R peertube:peertube /config +find /config ! -user peertube -exec chown peertube:peertube {} \; # first arg is `-f` or `--some-option` # or first arg is `something.conf` @@ -19,7 +19,7 @@ fi # allow the container to be started with `--user` if [ "$1" = 'npm' -a "$(id -u)" = '0' ]; then - chown -R peertube:peertube /data + find /data ! -user peertube -exec chown peertube:peertube {} \; exec gosu peertube "$0" "$@" fi From 9b4b15f91c485f9a7fe2ed314b4101f4b7506b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20B=C3=A9ranger?= <43744761+auberanger@users.noreply.github.com> Date: Mon, 14 Jan 2019 09:06:48 +0100 Subject: [PATCH 095/137] WIP : Indicate to users how "trending" works (#1458) * Get the INTERVAL_DAYS const in the video-trending component * Change Trending section title * Add a tooltip to explain how trending section works * Minor CSS fix for the my-feed popover next to the titlepage --- client/src/app/core/server/server.service.ts | 5 +++++ client/src/app/shared/video/abstract-video-list.html | 5 ++++- client/src/app/shared/video/abstract-video-list.scss | 2 +- client/src/app/shared/video/abstract-video-list.ts | 2 ++ .../videos/video-list/video-trending.component.ts | 12 ++++++++++-- server/controllers/api/config.ts | 5 +++++ shared/models/server/server-config.model.ts | 6 ++++++ 7 files changed, 33 insertions(+), 4 deletions(-) diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts index f33e6f20c..4ae72427b 100644 --- a/client/src/app/core/server/server.service.ts +++ b/client/src/app/core/server/server.service.ts @@ -87,6 +87,11 @@ export class ServerService { enabled: false } } + }, + trending: { + videos: { + intervalDays: 0 + } } } private videoCategories: Array> = [] diff --git a/client/src/app/shared/video/abstract-video-list.html b/client/src/app/shared/video/abstract-video-list.html index 29492351b..1f97bc389 100644 --- a/client/src/app/shared/video/abstract-video-list.html +++ b/client/src/app/shared/video/abstract-video-list.html @@ -1,8 +1,11 @@
- {{ titlePage }} +
+ {{ titlePage }} +
+
diff --git a/client/src/app/shared/video/abstract-video-list.scss b/client/src/app/shared/video/abstract-video-list.scss index 9fb3fd4d6..292ede698 100644 --- a/client/src/app/shared/video/abstract-video-list.scss +++ b/client/src/app/shared/video/abstract-video-list.scss @@ -19,8 +19,8 @@ my-feed { display: inline-block; - position: relative; top: 1px; + min-width: 60px; } .moderation-block { diff --git a/client/src/app/shared/video/abstract-video-list.ts b/client/src/app/shared/video/abstract-video-list.ts index d234c8bfa..d74384293 100644 --- a/client/src/app/shared/video/abstract-video-list.ts +++ b/client/src/app/shared/video/abstract-video-list.ts @@ -39,6 +39,8 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy { ownerDisplayType: OwnerDisplayType = 'account' firstLoadedPage: number displayModerationBlock = false + trendingDays: number + titleTooltip: string protected baseVideoWidth = 215 protected baseVideoHeight = 205 diff --git a/client/src/app/videos/video-list/video-trending.component.ts b/client/src/app/videos/video-list/video-trending.component.ts index accc5bfe5..d3c0f5316 100644 --- a/client/src/app/videos/video-list/video-trending.component.ts +++ b/client/src/app/videos/video-list/video-trending.component.ts @@ -8,7 +8,7 @@ import { VideoSortField } from '../../shared/video/sort-field.type' import { VideoService } from '../../shared/video/video.service' import { I18n } from '@ngx-translate/i18n-polyfill' import { ScreenService } from '@app/shared/misc/screen.service' -import { Notifier } from '@app/core' +import { Notifier, ServerService } from '@app/core' @Component({ selector: 'my-videos-trending', @@ -19,6 +19,7 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit, titlePage: string currentRoute = '/videos/trending' defaultSort: VideoSortField = '-trending' + trendingDays: number constructor ( protected router: Router, @@ -27,12 +28,19 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit, protected authService: AuthService, protected location: Location, protected screenService: ScreenService, + private serverService: ServerService, protected i18n: I18n, private videoService: VideoService ) { super() - this.titlePage = i18n('Trending') + this.trendingDays = this.serverService.getConfig().trending.videos.intervalDays + + this.titlePage = this.i18n('Trending for the last ') + this.trendingDays === 1 ? this.titlePage += '24 hours' : this.titlePage += this.trendingDays + ' days' + + this.titleTooltip = this.i18n('trending videos are those totalizing the greatest number of views during the last ') + this.trendingDays === 1 ? this.titleTooltip += '24 hours.' : this.titleTooltip += this.trendingDays + ' days.' } ngOnInit () { diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts index dd06a0597..255026f46 100644 --- a/server/controllers/api/config.ts +++ b/server/controllers/api/config.ts @@ -120,6 +120,11 @@ async function getConfig (req: express.Request, res: express.Response) { user: { videoQuota: CONFIG.USER.VIDEO_QUOTA, videoQuotaDaily: CONFIG.USER.VIDEO_QUOTA_DAILY + }, + trending: { + videos: { + intervalDays: CONFIG.TRENDING.VIDEOS.INTERVAL_DAYS + } } } diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts index 7031009d9..f4245ed4d 100644 --- a/shared/models/server/server-config.model.ts +++ b/shared/models/server/server-config.model.ts @@ -78,4 +78,10 @@ export interface ServerConfig { videoQuota: number videoQuotaDaily: number } + + trending: { + videos: { + intervalDays: number + } + } } From f242c2e01e3423ad63a9a6d904062256d60b6971 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 10 Jan 2019 16:28:31 +0100 Subject: [PATCH 096/137] Improve "no notifications" message --- client/src/app/menu/avatar-notification.component.scss | 1 + .../src/app/shared/users/user-notifications.component.scss | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/client/src/app/menu/avatar-notification.component.scss b/client/src/app/menu/avatar-notification.component.scss index c86667469..47d04ace3 100644 --- a/client/src/app/menu/avatar-notification.component.scss +++ b/client/src/app/menu/avatar-notification.component.scss @@ -11,6 +11,7 @@ font-family: $main-fonts; overflow-y: auto; max-height: 500px; + min-width: 200px; box-shadow: 0 6px 14px rgba(0, 0, 0, 0.30); .notifications-header { diff --git a/client/src/app/shared/users/user-notifications.component.scss b/client/src/app/shared/users/user-notifications.component.scss index 0493b10d9..0ae26ea39 100644 --- a/client/src/app/shared/users/user-notifications.component.scss +++ b/client/src/app/shared/users/user-notifications.component.scss @@ -1,3 +1,10 @@ +.no-notification { + display: flex; + justify-content: center; + align-items: center; + padding: 20px 0; +} + .notification { display: flex; justify-content: space-between; From c32bf839c11557cac527ca5f181d1ce39fc80974 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 11 Jan 2019 16:44:45 +0100 Subject: [PATCH 097/137] Fix captions in HTTP fallback --- client/src/assets/player/peertube-player.ts | 8 ++++++++ client/src/assets/player/peertube-videojs-plugin.ts | 5 +++++ client/src/assets/player/settings-menu-item.ts | 13 +++++++++++++ 3 files changed, 26 insertions(+) diff --git a/client/src/assets/player/peertube-player.ts b/client/src/assets/player/peertube-player.ts index e0e063838..2de6d7fef 100644 --- a/client/src/assets/player/peertube-player.ts +++ b/client/src/assets/player/peertube-player.ts @@ -254,6 +254,10 @@ function loadLocaleInVideoJS (serverUrl: string, videojs: any, locale: string) { loadLocaleInVideoJS.cache[path] = json return json }) + .catch(err => { + console.error('Cannot get player translations', err) + return undefined + }) } const completeLocale = getCompleteLocale(locale) @@ -270,6 +274,10 @@ function getServerTranslations (serverUrl: string, locale: string) { return fetch(path + '/server.json') .then(res => res.json()) + .catch(err => { + console.error('Cannot get server translations', err) + return undefined + }) } // ############################################################################ diff --git a/client/src/assets/player/peertube-videojs-plugin.ts b/client/src/assets/player/peertube-videojs-plugin.ts index 4a280b7ef..e9fb90c61 100644 --- a/client/src/assets/player/peertube-videojs-plugin.ts +++ b/client/src/assets/player/peertube-videojs-plugin.ts @@ -620,6 +620,9 @@ class PeerTubePlugin extends Plugin { this.player.src = this.savePlayerSrcFunction this.player.src(httpUrl) + // We changed the source, so reinit captions + this.initCaptions() + return this.tryToPlay(err => { if (err && done) return done(err) @@ -720,6 +723,8 @@ class PeerTubePlugin extends Plugin { default: this.defaultSubtitle === caption.language }, false) } + + this.player.trigger('captionsChanged') } // Thanks: https://github.com/videojs/video.js/issues/4460#issuecomment-312861657 diff --git a/client/src/assets/player/settings-menu-item.ts b/client/src/assets/player/settings-menu-item.ts index 698f4627a..2a3460ae5 100644 --- a/client/src/assets/player/settings-menu-item.ts +++ b/client/src/assets/player/settings-menu-item.ts @@ -48,6 +48,19 @@ class SettingsMenuItem extends MenuItem { // Update on rate change player.on('ratechange', this.submenuClickHandler) + if (subMenuName === 'CaptionsButton') { + // Hack to regenerate captions on HTTP fallback + player.on('captionsChanged', () => { + setTimeout(() => { + this.settingsSubMenuEl_.innerHTML = '' + this.settingsSubMenuEl_.appendChild(this.subMenu.menu.el_) + this.update() + this.bindClickEvents() + + }, 0) + }) + } + this.reset() }, 0) }) From 033bc0efc2ab2c517b4d7d53d09930b85f092b50 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 11 Jan 2019 16:58:33 +0100 Subject: [PATCH 098/137] Fix NSFW blur on search --- client/src/app/search/search.component.html | 2 +- client/src/app/search/search.component.ts | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/client/src/app/search/search.component.html b/client/src/app/search/search.component.html index 3a87ea1de..82a5f0f26 100644 --- a/client/src/app/search/search.component.html +++ b/client/src/app/search/search.component.html @@ -48,7 +48,7 @@
- +
{{ result.name }} diff --git a/client/src/app/search/search.component.ts b/client/src/app/search/search.component.ts index 474b72824..c4a4b1fde 100644 --- a/client/src/app/search/search.component.ts +++ b/client/src/app/search/search.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core' import { ActivatedRoute, Router } from '@angular/router' -import { AuthService, Notifier } from '@app/core' +import { AuthService, Notifier, ServerService } from '@app/core' import { forkJoin, Subscription } from 'rxjs' import { SearchService } from '@app/search/search.service' import { ComponentPagination } from '@app/shared/rest/component-pagination.model' @@ -41,7 +41,8 @@ export class SearchComponent implements OnInit, OnDestroy { private metaService: MetaService, private notifier: Notifier, private searchService: SearchService, - private authService: AuthService + private authService: AuthService, + private serverService: ServerService ) { } ngOnInit () { @@ -75,6 +76,10 @@ export class SearchComponent implements OnInit, OnDestroy { if (this.subActivatedRoute) this.subActivatedRoute.unsubscribe() } + isVideoBlur (video: Video) { + return video.isVideoNSFWForUser(this.authService.getUser(), this.serverService.getConfig()) + } + isVideoChannel (d: VideoChannel | Video): d is VideoChannel { return d instanceof VideoChannel } From 7b95f31385eca59ac18197539de30268acc18986 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Jan 2019 09:11:28 +0100 Subject: [PATCH 099/137] Help translators to translate trending title/tooltip --- .../app/shared/video/abstract-video-list.ts | 1 - .../video-list/video-trending.component.ts | 22 +++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/client/src/app/shared/video/abstract-video-list.ts b/client/src/app/shared/video/abstract-video-list.ts index d74384293..b0633be4a 100644 --- a/client/src/app/shared/video/abstract-video-list.ts +++ b/client/src/app/shared/video/abstract-video-list.ts @@ -39,7 +39,6 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy { ownerDisplayType: OwnerDisplayType = 'account' firstLoadedPage: number displayModerationBlock = false - trendingDays: number titleTooltip: string protected baseVideoWidth = 215 diff --git a/client/src/app/videos/video-list/video-trending.component.ts b/client/src/app/videos/video-list/video-trending.component.ts index d3c0f5316..881ab2174 100644 --- a/client/src/app/videos/video-list/video-trending.component.ts +++ b/client/src/app/videos/video-list/video-trending.component.ts @@ -19,7 +19,6 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit, titlePage: string currentRoute = '/videos/trending' defaultSort: VideoSortField = '-trending' - trendingDays: number constructor ( protected router: Router, @@ -33,20 +32,25 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit, private videoService: VideoService ) { super() - - this.trendingDays = this.serverService.getConfig().trending.videos.intervalDays - - this.titlePage = this.i18n('Trending for the last ') - this.trendingDays === 1 ? this.titlePage += '24 hours' : this.titlePage += this.trendingDays + ' days' - - this.titleTooltip = this.i18n('trending videos are those totalizing the greatest number of views during the last ') - this.trendingDays === 1 ? this.titleTooltip += '24 hours.' : this.titleTooltip += this.trendingDays + ' days.' } ngOnInit () { super.ngOnInit() this.generateSyndicationList() + + const trendingDays = this.serverService.getConfig().trending.videos.intervalDays + + if (trendingDays === 1) { + this.titlePage = this.i18n('Trending for the last 24 hours') + this.titleTooltip = this.i18n('Trending videos are those totalizing the greatest number of views during the last 24 hours.') + } else { + this.titlePage = this.i18n('Trending for the last {{days}} days', { days: trendingDays }) + this.titleTooltip = this.i18n( + 'Trending videos are those totalizing the greatest number of views during the last {{days}} days.', + { days: trendingDays } + ) + } } ngOnDestroy () { From b4593cd7ff34b94b60f6bfa0b57e371d74d63aa2 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Jan 2019 10:24:49 +0100 Subject: [PATCH 100/137] Warn user when they want to delete a channel Because they will not be able to create another channel with the same actor name --- .../my-account-video-channels.component.ts | 10 +++++++--- server/lib/activitypub/actor.ts | 2 +- server/lib/activitypub/process/process.ts | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts index 0ab3e2067..da2c5bcd3 100644 --- a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts +++ b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts @@ -35,10 +35,14 @@ export class MyAccountVideoChannelsComponent implements OnInit { async deleteVideoChannel (videoChannel: VideoChannel) { const res = await this.confirmService.confirmWithInput( this.i18n( - 'Do you really want to delete {{videoChannelName}}? It will delete all videos uploaded in this channel too.', - { videoChannelName: videoChannel.displayName } + 'Do you really want to delete {{channelDisplayName}}? It will delete all videos uploaded in this channel, ' + + 'and you will not be able to create another channel with the same name ({{channelName}})!', + { channelDisplayName: videoChannel.displayName, channelName: videoChannel.name } + ), + this.i18n( + 'Please type the display name of the video channel ({{displayName}}) to confirm', + { displayName: videoChannel.displayName } ), - this.i18n('Please type the name of the video channel to confirm'), videoChannel.displayName, this.i18n('Delete') ) diff --git a/server/lib/activitypub/actor.ts b/server/lib/activitypub/actor.ts index f7bf7c65a..f80296725 100644 --- a/server/lib/activitypub/actor.ts +++ b/server/lib/activitypub/actor.ts @@ -296,7 +296,7 @@ async function fetchRemoteActor (actorUrl: string): Promise<{ statusCode?: numbe const actorJSON: ActivityPubActor = requestResult.body if (isActorObjectValid(actorJSON) === false) { - logger.debug('Remote actor JSON is not valid.', { actorJSON: actorJSON }) + logger.debug('Remote actor JSON is not valid.', { actorJSON }) return { result: undefined, statusCode: requestResult.response.statusCode } } diff --git a/server/lib/activitypub/process/process.ts b/server/lib/activitypub/process/process.ts index bcc5cac7a..2479d5da2 100644 --- a/server/lib/activitypub/process/process.ts +++ b/server/lib/activitypub/process/process.ts @@ -35,7 +35,7 @@ async function processActivities ( const actorsCache: { [ url: string ]: ActorModel } = {} for (const activity of activities) { - if (!options.signatureActor && [ 'Create', 'Announce', 'Like' ].indexOf(activity.type) === -1) { + if (!options.signatureActor && [ 'Create', 'Announce', 'Like' ].includes(activity.type) === false) { logger.error('Cannot process activity %s (type: %s) without the actor signature.', activity.id, activity.type) continue } From cf405589f06a9ac9d5a05b09bf2183fbf88d56d7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Jan 2019 10:44:59 +0100 Subject: [PATCH 101/137] Move subscriptions controllers in its own file --- server/controllers/api/users/index.ts | 2 + server/controllers/api/users/me.ts | 156 +--------------- .../controllers/api/users/my-subscriptions.ts | 170 ++++++++++++++++++ 3 files changed, 174 insertions(+), 154 deletions(-) create mode 100644 server/controllers/api/users/my-subscriptions.ts diff --git a/server/controllers/api/users/index.ts b/server/controllers/api/users/index.ts index 9e6a019f6..dbe0718d4 100644 --- a/server/controllers/api/users/index.ts +++ b/server/controllers/api/users/index.ts @@ -41,6 +41,7 @@ import { myBlocklistRouter } from './my-blocklist' import { myVideosHistoryRouter } from './my-history' import { myNotificationsRouter } from './my-notifications' import { Notifier } from '../../../lib/notifier' +import { mySubscriptionsRouter } from './my-subscriptions' const auditLogger = auditLoggerFactory('users') @@ -58,6 +59,7 @@ const askSendEmailLimiter = new RateLimit({ const usersRouter = express.Router() usersRouter.use('/', myNotificationsRouter) +usersRouter.use('/', mySubscriptionsRouter) usersRouter.use('/', myBlocklistRouter) usersRouter.use('/', myVideosHistoryRouter) usersRouter.use('/', meRouter) diff --git a/server/controllers/api/users/me.ts b/server/controllers/api/users/me.ts index 8a3208160..94a2b8732 100644 --- a/server/controllers/api/users/me.ts +++ b/server/controllers/api/users/me.ts @@ -8,36 +8,23 @@ import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate, - commonVideosFiltersValidator, paginationValidator, setDefaultPagination, setDefaultSort, - userSubscriptionAddValidator, - userSubscriptionGetValidator, usersUpdateMeValidator, usersVideoRatingValidator } from '../../../middlewares' -import { - areSubscriptionsExistValidator, - deleteMeValidator, - userSubscriptionsSortValidator, - videoImportsSortValidator, - videosSortValidator -} from '../../../middlewares/validators' +import { deleteMeValidator, videoImportsSortValidator, videosSortValidator } from '../../../middlewares/validators' import { AccountVideoRateModel } from '../../../models/account/account-video-rate' import { UserModel } from '../../../models/account/user' import { VideoModel } from '../../../models/video/video' import { VideoSortField } from '../../../../client/src/app/shared/video/sort-field.type' -import { buildNSFWFilter, createReqFiles } from '../../../helpers/express-utils' +import { createReqFiles } from '../../../helpers/express-utils' import { UserVideoQuota } from '../../../../shared/models/users/user-video-quota.model' import { updateAvatarValidator } from '../../../middlewares/validators/avatar' import { updateActorAvatarFile } from '../../../lib/avatar' import { auditLoggerFactory, getAuditIdFromRes, UserAuditView } from '../../../helpers/audit-logger' import { VideoImportModel } from '../../../models/video/video-import' -import { VideoFilter } from '../../../../shared/models/videos/video-query.type' -import { ActorFollowModel } from '../../../models/activitypub/actor-follow' -import { JobQueue } from '../../../lib/job-queue' -import { logger } from '../../../helpers/logger' import { AccountModel } from '../../../models/account/account' const auditLogger = auditLoggerFactory('users-me') @@ -98,51 +85,6 @@ meRouter.post('/me/avatar/pick', asyncRetryTransactionMiddleware(updateMyAvatar) ) -// ##### Subscriptions part ##### - -meRouter.get('/me/subscriptions/videos', - authenticate, - paginationValidator, - videosSortValidator, - setDefaultSort, - setDefaultPagination, - commonVideosFiltersValidator, - asyncMiddleware(getUserSubscriptionVideos) -) - -meRouter.get('/me/subscriptions/exist', - authenticate, - areSubscriptionsExistValidator, - asyncMiddleware(areSubscriptionsExist) -) - -meRouter.get('/me/subscriptions', - authenticate, - paginationValidator, - userSubscriptionsSortValidator, - setDefaultSort, - setDefaultPagination, - asyncMiddleware(getUserSubscriptions) -) - -meRouter.post('/me/subscriptions', - authenticate, - userSubscriptionAddValidator, - asyncMiddleware(addUserSubscription) -) - -meRouter.get('/me/subscriptions/:uri', - authenticate, - userSubscriptionGetValidator, - getUserSubscription -) - -meRouter.delete('/me/subscriptions/:uri', - authenticate, - userSubscriptionGetValidator, - asyncRetryTransactionMiddleware(deleteUserSubscription) -) - // --------------------------------------------------------------------------- export { @@ -151,100 +93,6 @@ export { // --------------------------------------------------------------------------- -async function areSubscriptionsExist (req: express.Request, res: express.Response) { - const uris = req.query.uris as string[] - const user = res.locals.oauth.token.User as UserModel - - const handles = uris.map(u => { - let [ name, host ] = u.split('@') - if (host === CONFIG.WEBSERVER.HOST) host = null - - return { name, host, uri: u } - }) - - const results = await ActorFollowModel.listSubscribedIn(user.Account.Actor.id, handles) - - const existObject: { [id: string ]: boolean } = {} - for (const handle of handles) { - const obj = results.find(r => { - const server = r.ActorFollowing.Server - - return r.ActorFollowing.preferredUsername === handle.name && - ( - (!server && !handle.host) || - (server.host === handle.host) - ) - }) - - existObject[handle.uri] = obj !== undefined - } - - return res.json(existObject) -} - -async function addUserSubscription (req: express.Request, res: express.Response) { - const user = res.locals.oauth.token.User as UserModel - const [ name, host ] = req.body.uri.split('@') - - const payload = { - name, - host, - followerActorId: user.Account.Actor.id - } - - JobQueue.Instance.createJob({ type: 'activitypub-follow', payload }) - .catch(err => logger.error('Cannot create follow job for subscription %s.', req.body.uri, err)) - - return res.status(204).end() -} - -function getUserSubscription (req: express.Request, res: express.Response) { - const subscription: ActorFollowModel = res.locals.subscription - - return res.json(subscription.ActorFollowing.VideoChannel.toFormattedJSON()) -} - -async function deleteUserSubscription (req: express.Request, res: express.Response) { - const subscription: ActorFollowModel = res.locals.subscription - - await sequelizeTypescript.transaction(async t => { - return subscription.destroy({ transaction: t }) - }) - - return res.type('json').status(204).end() -} - -async function getUserSubscriptions (req: express.Request, res: express.Response) { - const user = res.locals.oauth.token.User as UserModel - const actorId = user.Account.Actor.id - - const resultList = await ActorFollowModel.listSubscriptionsForApi(actorId, req.query.start, req.query.count, req.query.sort) - - return res.json(getFormattedObjects(resultList.data, resultList.total)) -} - -async function getUserSubscriptionVideos (req: express.Request, res: express.Response, next: express.NextFunction) { - const user = res.locals.oauth.token.User as UserModel - const resultList = await VideoModel.listForApi({ - start: req.query.start, - count: req.query.count, - sort: req.query.sort, - includeLocalVideos: false, - categoryOneOf: req.query.categoryOneOf, - licenceOneOf: req.query.licenceOneOf, - languageOneOf: req.query.languageOneOf, - tagsOneOf: req.query.tagsOneOf, - tagsAllOf: req.query.tagsAllOf, - nsfw: buildNSFWFilter(res, req.query.nsfw), - filter: req.query.filter as VideoFilter, - withFiles: false, - followerActorId: user.Account.Actor.id, - user - }) - - return res.json(getFormattedObjects(resultList.data, resultList.total)) -} - async function getUserVideos (req: express.Request, res: express.Response, next: express.NextFunction) { const user = res.locals.oauth.token.User as UserModel const resultList = await VideoModel.listUserVideosForApi( diff --git a/server/controllers/api/users/my-subscriptions.ts b/server/controllers/api/users/my-subscriptions.ts new file mode 100644 index 000000000..accca6d52 --- /dev/null +++ b/server/controllers/api/users/my-subscriptions.ts @@ -0,0 +1,170 @@ +import * as express from 'express' +import 'multer' +import { getFormattedObjects } from '../../../helpers/utils' +import { CONFIG, sequelizeTypescript } from '../../../initializers' +import { + asyncMiddleware, + asyncRetryTransactionMiddleware, + authenticate, + commonVideosFiltersValidator, + paginationValidator, + setDefaultPagination, + setDefaultSort, + userSubscriptionAddValidator, + userSubscriptionGetValidator +} from '../../../middlewares' +import { areSubscriptionsExistValidator, userSubscriptionsSortValidator, videosSortValidator } from '../../../middlewares/validators' +import { UserModel } from '../../../models/account/user' +import { VideoModel } from '../../../models/video/video' +import { buildNSFWFilter } from '../../../helpers/express-utils' +import { VideoFilter } from '../../../../shared/models/videos/video-query.type' +import { ActorFollowModel } from '../../../models/activitypub/actor-follow' +import { JobQueue } from '../../../lib/job-queue' +import { logger } from '../../../helpers/logger' + +const mySubscriptionsRouter = express.Router() + +mySubscriptionsRouter.get('/me/subscriptions/videos', + authenticate, + paginationValidator, + videosSortValidator, + setDefaultSort, + setDefaultPagination, + commonVideosFiltersValidator, + asyncMiddleware(getUserSubscriptionVideos) +) + +mySubscriptionsRouter.get('/me/subscriptions/exist', + authenticate, + areSubscriptionsExistValidator, + asyncMiddleware(areSubscriptionsExist) +) + +mySubscriptionsRouter.get('/me/subscriptions', + authenticate, + paginationValidator, + userSubscriptionsSortValidator, + setDefaultSort, + setDefaultPagination, + asyncMiddleware(getUserSubscriptions) +) + +mySubscriptionsRouter.post('/me/subscriptions', + authenticate, + userSubscriptionAddValidator, + asyncMiddleware(addUserSubscription) +) + +mySubscriptionsRouter.get('/me/subscriptions/:uri', + authenticate, + userSubscriptionGetValidator, + getUserSubscription +) + +mySubscriptionsRouter.delete('/me/subscriptions/:uri', + authenticate, + userSubscriptionGetValidator, + asyncRetryTransactionMiddleware(deleteUserSubscription) +) + +// --------------------------------------------------------------------------- + +export { + mySubscriptionsRouter +} + +// --------------------------------------------------------------------------- + +async function areSubscriptionsExist (req: express.Request, res: express.Response) { + const uris = req.query.uris as string[] + const user = res.locals.oauth.token.User as UserModel + + const handles = uris.map(u => { + let [ name, host ] = u.split('@') + if (host === CONFIG.WEBSERVER.HOST) host = null + + return { name, host, uri: u } + }) + + const results = await ActorFollowModel.listSubscribedIn(user.Account.Actor.id, handles) + + const existObject: { [id: string ]: boolean } = {} + for (const handle of handles) { + const obj = results.find(r => { + const server = r.ActorFollowing.Server + + return r.ActorFollowing.preferredUsername === handle.name && + ( + (!server && !handle.host) || + (server.host === handle.host) + ) + }) + + existObject[handle.uri] = obj !== undefined + } + + return res.json(existObject) +} + +async function addUserSubscription (req: express.Request, res: express.Response) { + const user = res.locals.oauth.token.User as UserModel + const [ name, host ] = req.body.uri.split('@') + + const payload = { + name, + host, + followerActorId: user.Account.Actor.id + } + + JobQueue.Instance.createJob({ type: 'activitypub-follow', payload }) + .catch(err => logger.error('Cannot create follow job for subscription %s.', req.body.uri, err)) + + return res.status(204).end() +} + +function getUserSubscription (req: express.Request, res: express.Response) { + const subscription: ActorFollowModel = res.locals.subscription + + return res.json(subscription.ActorFollowing.VideoChannel.toFormattedJSON()) +} + +async function deleteUserSubscription (req: express.Request, res: express.Response) { + const subscription: ActorFollowModel = res.locals.subscription + + await sequelizeTypescript.transaction(async t => { + return subscription.destroy({ transaction: t }) + }) + + return res.type('json').status(204).end() +} + +async function getUserSubscriptions (req: express.Request, res: express.Response) { + const user = res.locals.oauth.token.User as UserModel + const actorId = user.Account.Actor.id + + const resultList = await ActorFollowModel.listSubscriptionsForApi(actorId, req.query.start, req.query.count, req.query.sort) + + return res.json(getFormattedObjects(resultList.data, resultList.total)) +} + +async function getUserSubscriptionVideos (req: express.Request, res: express.Response, next: express.NextFunction) { + const user = res.locals.oauth.token.User as UserModel + const resultList = await VideoModel.listForApi({ + start: req.query.start, + count: req.query.count, + sort: req.query.sort, + includeLocalVideos: false, + categoryOneOf: req.query.categoryOneOf, + licenceOneOf: req.query.licenceOneOf, + languageOneOf: req.query.languageOneOf, + tagsOneOf: req.query.tagsOneOf, + tagsAllOf: req.query.tagsAllOf, + nsfw: buildNSFWFilter(res, req.query.nsfw), + filter: req.query.filter as VideoFilter, + withFiles: false, + followerActorId: user.Account.Actor.id, + user + }) + + return res.json(getFormattedObjects(resultList.data, resultList.total)) +} From bb8f7872f5a473c47a688b0c282ff34cd78a9835 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Jan 2019 11:01:40 +0100 Subject: [PATCH 102/137] Fix peertube CLI documentation --- server/tools/peertube-import-videos.ts | 14 +++++++++++--- support/doc/tools.md | 3 ++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/server/tools/peertube-import-videos.ts b/server/tools/peertube-import-videos.ts index 2874a2131..f50aafc35 100644 --- a/server/tools/peertube-import-videos.ts +++ b/server/tools/peertube-import-videos.ts @@ -78,7 +78,11 @@ getSettings() password: program['password'] } - run(user, program['url']).catch(err => console.error(err)) + run(user, program['url']) + .catch(err => { + console.error(err) + process.exit(-1) + }) }) async function promptPassword () { @@ -112,8 +116,12 @@ async function run (user, url: string) { secret: res.body.client_secret } - const res2 = await login(url, client, user) - accessToken = res2.body.access_token + try { + const res = await login(program[ 'url' ], client, user) + accessToken = res.body.access_token + } catch (err) { + throw new Error('Cannot authenticate. Please check your username/password.') + } const youtubeDL = await safeGetYoutubeDL() diff --git a/support/doc/tools.md b/support/doc/tools.md index 4f806a9db..1a9ba7d2b 100644 --- a/support/doc/tools.md +++ b/support/doc/tools.md @@ -59,7 +59,8 @@ $ npm run build:server ### CLI wrapper -The wrapper provides a convenient interface to the following scripts. You can access it as `peertube` via an alias in your `.bashrc` like `alias peertube="node /your/peertube/directory/dist/server/tools/peertube.js"`: +The wrapper provides a convenient interface to the following scripts. +You can access it as `peertube` via an alias in your `.bashrc` like `alias peertube="cd /your/peertube/directory/ && node ./dist/server/tools/peertube.js"` (you have to keep the `cd` command): ``` Usage: peertube [command] [options] From 744d0eca195bce7dafeb4a958d0eb3c0046be32d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Jan 2019 11:30:15 +0100 Subject: [PATCH 103/137] Refresh remote actors on GET enpoints --- server/controllers/api/accounts.ts | 7 ++ server/controllers/api/video-channel.ts | 6 + server/controllers/api/videos/index.ts | 2 +- server/lib/activitypub/actor.ts | 111 +++++++++--------- server/lib/activitypub/videos.ts | 2 +- .../handlers/activitypub-refresher.ts | 25 +++- server/models/account/account.ts | 4 + server/models/video/video-channel.ts | 4 + 8 files changed, 99 insertions(+), 62 deletions(-) diff --git a/server/controllers/api/accounts.ts b/server/controllers/api/accounts.ts index a69a83acf..8c0237203 100644 --- a/server/controllers/api/accounts.ts +++ b/server/controllers/api/accounts.ts @@ -14,6 +14,8 @@ import { AccountModel } from '../../models/account/account' import { VideoModel } from '../../models/video/video' import { buildNSFWFilter, isUserAbleToSearchRemoteURI } from '../../helpers/express-utils' import { VideoChannelModel } from '../../models/video/video-channel' +import { JobQueue } from '../../lib/job-queue' +import { logger } from '../../helpers/logger' const accountsRouter = express.Router() @@ -57,6 +59,11 @@ export { function getAccount (req: express.Request, res: express.Response, next: express.NextFunction) { const account: AccountModel = res.locals.account + if (account.isOutdated()) { + JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'actor', url: account.Actor.url } }) + .catch(err => logger.error('Cannot create AP refresher job for actor %s.', account.Actor.url, { err })) + } + return res.json(account.toFormattedJSON()) } diff --git a/server/controllers/api/video-channel.ts b/server/controllers/api/video-channel.ts index 3d6a6af7f..db7602139 100644 --- a/server/controllers/api/video-channel.ts +++ b/server/controllers/api/video-channel.ts @@ -30,6 +30,7 @@ import { updateActorAvatarFile } from '../../lib/avatar' import { auditLoggerFactory, getAuditIdFromRes, VideoChannelAuditView } from '../../helpers/audit-logger' import { resetSequelizeInstance } from '../../helpers/database-utils' import { UserModel } from '../../models/account/user' +import { JobQueue } from '../../lib/job-queue' const auditLogger = auditLoggerFactory('channels') const reqAvatarFile = createReqFiles([ 'avatarfile' ], MIMETYPES.IMAGE.MIMETYPE_EXT, { avatarfile: CONFIG.STORAGE.TMP_DIR }) @@ -197,6 +198,11 @@ async function removeVideoChannel (req: express.Request, res: express.Response) async function getVideoChannel (req: express.Request, res: express.Response, next: express.NextFunction) { const videoChannelWithVideos = await VideoChannelModel.loadAndPopulateAccountAndVideos(res.locals.videoChannel.id) + if (videoChannelWithVideos.isOutdated()) { + JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'actor', url: videoChannelWithVideos.Actor.url } }) + .catch(err => logger.error('Cannot create AP refresher job for actor %s.', videoChannelWithVideos.Actor.url, { err })) + } + return res.json(videoChannelWithVideos.toFormattedJSON()) } diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index 28ac26598..2b2dfa7ca 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts @@ -399,7 +399,7 @@ function getVideo (req: express.Request, res: express.Response) { const videoInstance = res.locals.video if (videoInstance.isOutdated()) { - JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'video', videoUrl: videoInstance.url } }) + JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'video', url: videoInstance.url } }) .catch(err => logger.error('Cannot create AP refresher job for video %s.', videoInstance.url, { err })) } diff --git a/server/lib/activitypub/actor.ts b/server/lib/activitypub/actor.ts index f80296725..d728c81d1 100644 --- a/server/lib/activitypub/actor.ts +++ b/server/lib/activitypub/actor.ts @@ -201,6 +201,62 @@ async function addFetchOutboxJob (actor: ActorModel) { return JobQueue.Instance.createJob({ type: 'activitypub-http-fetcher', payload }) } +async function refreshActorIfNeeded ( + actorArg: ActorModel, + fetchedType: ActorFetchByUrlType +): Promise<{ actor: ActorModel, refreshed: boolean }> { + if (!actorArg.isOutdated()) return { actor: actorArg, refreshed: false } + + // We need more attributes + const actor = fetchedType === 'all' ? actorArg : await ActorModel.loadByUrlAndPopulateAccountAndChannel(actorArg.url) + + try { + const actorUrl = await getUrlFromWebfinger(actor.preferredUsername + '@' + actor.getHost()) + const { result, statusCode } = await fetchRemoteActor(actorUrl) + + if (statusCode === 404) { + logger.info('Deleting actor %s because there is a 404 in refresh actor.', actor.url) + actor.Account ? actor.Account.destroy() : actor.VideoChannel.destroy() + return { actor: undefined, refreshed: false } + } + + if (result === undefined) { + logger.warn('Cannot fetch remote actor in refresh actor.') + return { actor, refreshed: false } + } + + return sequelizeTypescript.transaction(async t => { + updateInstanceWithAnother(actor, result.actor) + + if (result.avatarName !== undefined) { + await updateActorAvatarInstance(actor, result.avatarName, t) + } + + // Force update + actor.setDataValue('updatedAt', new Date()) + await actor.save({ transaction: t }) + + if (actor.Account) { + actor.Account.set('name', result.name) + actor.Account.set('description', result.summary) + + await actor.Account.save({ transaction: t }) + } else if (actor.VideoChannel) { + actor.VideoChannel.set('name', result.name) + actor.VideoChannel.set('description', result.summary) + actor.VideoChannel.set('support', result.support) + + await actor.VideoChannel.save({ transaction: t }) + } + + return { refreshed: true, actor } + }) + } catch (err) { + logger.warn('Cannot refresh actor.', { err }) + return { actor, refreshed: false } + } +} + export { getOrCreateActorAndServerAndModel, buildActorInstance, @@ -208,6 +264,7 @@ export { fetchActorTotalItems, fetchAvatarIfExists, updateActorInstance, + refreshActorIfNeeded, updateActorAvatarInstance, addFetchOutboxJob } @@ -373,58 +430,4 @@ async function saveVideoChannel (actor: ActorModel, result: FetchRemoteActorResu return videoChannelCreated } -async function refreshActorIfNeeded ( - actorArg: ActorModel, - fetchedType: ActorFetchByUrlType -): Promise<{ actor: ActorModel, refreshed: boolean }> { - if (!actorArg.isOutdated()) return { actor: actorArg, refreshed: false } - // We need more attributes - const actor = fetchedType === 'all' ? actorArg : await ActorModel.loadByUrlAndPopulateAccountAndChannel(actorArg.url) - - try { - const actorUrl = await getUrlFromWebfinger(actor.preferredUsername + '@' + actor.getHost()) - const { result, statusCode } = await fetchRemoteActor(actorUrl) - - if (statusCode === 404) { - logger.info('Deleting actor %s because there is a 404 in refresh actor.', actor.url) - actor.Account ? actor.Account.destroy() : actor.VideoChannel.destroy() - return { actor: undefined, refreshed: false } - } - - if (result === undefined) { - logger.warn('Cannot fetch remote actor in refresh actor.') - return { actor, refreshed: false } - } - - return sequelizeTypescript.transaction(async t => { - updateInstanceWithAnother(actor, result.actor) - - if (result.avatarName !== undefined) { - await updateActorAvatarInstance(actor, result.avatarName, t) - } - - // Force update - actor.setDataValue('updatedAt', new Date()) - await actor.save({ transaction: t }) - - if (actor.Account) { - actor.Account.set('name', result.name) - actor.Account.set('description', result.summary) - - await actor.Account.save({ transaction: t }) - } else if (actor.VideoChannel) { - actor.VideoChannel.set('name', result.name) - actor.VideoChannel.set('description', result.summary) - actor.VideoChannel.set('support', result.support) - - await actor.VideoChannel.save({ transaction: t }) - } - - return { refreshed: true, actor } - }) - } catch (err) { - logger.warn('Cannot refresh actor.', { err }) - return { actor, refreshed: false } - } -} diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts index 893768769..cbdd981c5 100644 --- a/server/lib/activitypub/videos.ts +++ b/server/lib/activitypub/videos.ts @@ -179,7 +179,7 @@ async function getOrCreateVideoAndAccountAndChannel (options: { } if (syncParam.refreshVideo === true) videoFromDatabase = await refreshVideoIfNeeded(refreshOptions) - else await JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'video', videoUrl: videoFromDatabase.url } }) + else await JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'video', url: videoFromDatabase.url } }) } return { video: videoFromDatabase, created: false } diff --git a/server/lib/job-queue/handlers/activitypub-refresher.ts b/server/lib/job-queue/handlers/activitypub-refresher.ts index 671b0f487..454b975fe 100644 --- a/server/lib/job-queue/handlers/activitypub-refresher.ts +++ b/server/lib/job-queue/handlers/activitypub-refresher.ts @@ -1,30 +1,33 @@ import * as Bull from 'bull' import { logger } from '../../../helpers/logger' import { fetchVideoByUrl } from '../../../helpers/video' -import { refreshVideoIfNeeded } from '../../activitypub' +import { refreshVideoIfNeeded, refreshActorIfNeeded } from '../../activitypub' +import { ActorModel } from '../../../models/activitypub/actor' export type RefreshPayload = { - videoUrl: string - type: 'video' + type: 'video' | 'actor' + url: string } async function refreshAPObject (job: Bull.Job) { const payload = job.data as RefreshPayload - logger.info('Processing AP refresher in job %d for video %s.', job.id, payload.videoUrl) + logger.info('Processing AP refresher in job %d for %s.', job.id, payload.url) - if (payload.type === 'video') return refreshAPVideo(payload.videoUrl) + if (payload.type === 'video') return refreshVideo(payload.url) + if (payload.type === 'actor') return refreshActor(payload.url) } // --------------------------------------------------------------------------- export { + refreshActor, refreshAPObject } // --------------------------------------------------------------------------- -async function refreshAPVideo (videoUrl: string) { +async function refreshVideo (videoUrl: string) { const fetchType = 'all' as 'all' const syncParam = { likes: true, dislikes: true, shares: true, comments: true, thumbnail: true } @@ -39,3 +42,13 @@ async function refreshAPVideo (videoUrl: string) { await refreshVideoIfNeeded(refreshOptions) } } + +async function refreshActor (actorUrl: string) { + const fetchType = 'all' as 'all' + const actor = await ActorModel.loadByUrlAndPopulateAccountAndChannel(actorUrl) + + if (actor) { + await refreshActorIfNeeded(actor, fetchType) + } + +} diff --git a/server/models/account/account.ts b/server/models/account/account.ts index a99e9b1ad..84ef0b30d 100644 --- a/server/models/account/account.ts +++ b/server/models/account/account.ts @@ -288,6 +288,10 @@ export class AccountModel extends Model { return this.Actor.isOwned() } + isOutdated () { + return this.Actor.isOutdated() + } + getDisplayName () { return this.name } diff --git a/server/models/video/video-channel.ts b/server/models/video/video-channel.ts index 86bf0461a..5598d80f6 100644 --- a/server/models/video/video-channel.ts +++ b/server/models/video/video-channel.ts @@ -470,4 +470,8 @@ export class VideoChannelModel extends Model { getDisplayName () { return this.name } + + isOutdated () { + return this.Actor.isOutdated() + } } From b5487ff4a5c0bb2acaca79ee00df26a83886c889 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Jan 2019 11:52:15 +0100 Subject: [PATCH 104/137] Add error message when trying to upload .ass subtitles --- .../src/app/shared/forms/reactive-file.component.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/client/src/app/shared/forms/reactive-file.component.ts b/client/src/app/shared/forms/reactive-file.component.ts index c3986838f..f60c38e8d 100644 --- a/client/src/app/shared/forms/reactive-file.component.ts +++ b/client/src/app/shared/forms/reactive-file.component.ts @@ -53,6 +53,17 @@ export class ReactiveFileComponent implements OnInit, ControlValueAccessor { return } + const extension = '.' + file.name.split('.').pop() + if (this.extensions.includes(extension) === false) { + const message = this.i18n( + 'PeerTube cannot handle this kind of file. Accepted extensions are {{extensions}}.', + { extensions: this.allowedExtensionsMessage } + ) + this.notifier.error(message) + + return + } + this.file = file this.propagateChange(this.file) From 699b059e2d6cdd09685a69261f2ca5cf63053a71 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Jan 2019 12:11:06 +0100 Subject: [PATCH 105/137] Fix deleting not found remote actors --- server/lib/activitypub/actor.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/server/lib/activitypub/actor.ts b/server/lib/activitypub/actor.ts index d728c81d1..edf38bc0a 100644 --- a/server/lib/activitypub/actor.ts +++ b/server/lib/activitypub/actor.ts @@ -211,7 +211,14 @@ async function refreshActorIfNeeded ( const actor = fetchedType === 'all' ? actorArg : await ActorModel.loadByUrlAndPopulateAccountAndChannel(actorArg.url) try { - const actorUrl = await getUrlFromWebfinger(actor.preferredUsername + '@' + actor.getHost()) + let actorUrl: string + try { + actorUrl = await getUrlFromWebfinger(actor.preferredUsername + '@' + actor.getHost()) + } catch (err) { + logger.warn('Cannot get actor URL from webfinger, keeping the old one.', err) + actorUrl = actor.url + } + const { result, statusCode } = await fetchRemoteActor(actorUrl) if (statusCode === 404) { @@ -429,5 +436,3 @@ async function saveVideoChannel (actor: ActorModel, result: FetchRemoteActorResu return videoChannelCreated } - - From 674a66bbda7ceb7aed3c2e6aefddc2793207d94b Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Jan 2019 14:55:43 +0100 Subject: [PATCH 106/137] Add unload listener on video upload/update --- .../video-upload.component.html | 4 ++++ .../videos/+video-edit/video-add.component.ts | 14 +++++++++++-- .../+video-edit/video-update.component.ts | 20 +++++++++++++++---- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html index 289a28c66..826e54d25 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html +++ b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html @@ -42,6 +42,10 @@ {{ error }}
+
+ Congratulations! Your video is now available in your private library. +
+
Date: Mon, 14 Jan 2019 15:12:20 +0100 Subject: [PATCH 107/137] Fix scroll in notifications page --- client/src/app/menu/avatar-notification.component.scss | 1 + client/src/app/shared/users/user-notifications.component.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/app/menu/avatar-notification.component.scss b/client/src/app/menu/avatar-notification.component.scss index 47d04ace3..807385022 100644 --- a/client/src/app/menu/avatar-notification.component.scss +++ b/client/src/app/menu/avatar-notification.component.scss @@ -13,6 +13,7 @@ max-height: 500px; min-width: 200px; box-shadow: 0 6px 14px rgba(0, 0, 0, 0.30); + overflow-y: auto; .notifications-header { display: flex; diff --git a/client/src/app/shared/users/user-notifications.component.ts b/client/src/app/shared/users/user-notifications.component.ts index 682116226..50c495a9a 100644 --- a/client/src/app/shared/users/user-notifications.component.ts +++ b/client/src/app/shared/users/user-notifications.component.ts @@ -21,7 +21,7 @@ export class UserNotificationsComponent implements OnInit { componentPagination: ComponentPagination = { currentPage: 1, - itemsPerPage: 10, + itemsPerPage: 20, totalItems: null } From 9a39392a7e6b3f180104856a4ea893e5baf86a02 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Jan 2019 15:32:09 +0100 Subject: [PATCH 108/137] Fix notification socket Should be in core module to share the same subject to all the app --- client/src/app/core/auth/auth.service.ts | 4 +- client/src/app/core/core.module.ts | 4 +- client/src/app/core/notification/index.ts | 1 + .../user-notification-socket.service.ts | 41 ++++++++++++++++++ .../menu/avatar-notification.component.html | 2 +- .../app/menu/avatar-notification.component.ts | 5 ++- .../shared/users/user-notification.service.ts | 42 +++++-------------- .../users/user-notifications.component.ts | 3 +- 8 files changed, 63 insertions(+), 39 deletions(-) create mode 100644 client/src/app/core/notification/user-notification-socket.service.ts diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts index 79ea32ced..eaa822e0f 100644 --- a/client/src/app/core/auth/auth.service.ts +++ b/client/src/app/core/auth/auth.service.ts @@ -3,12 +3,12 @@ import { catchError, map, mergeMap, share, tap } from 'rxjs/operators' import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' import { Router } from '@angular/router' -import { Notifier } from '@app/core/notification' +import { Notifier } from '@app/core/notification/notifier.service' import { OAuthClientLocal, User as UserServerModel, UserRefreshToken } from '../../../../../shared' import { User } from '../../../../../shared/models/users' import { UserLogin } from '../../../../../shared/models/users/user-login.model' import { environment } from '../../../environments/environment' -import { RestExtractor } from '../../shared/rest' +import { RestExtractor } from '../../shared/rest/rest-extractor.service' import { AuthStatus } from './auth-status.model' import { AuthUser } from './auth-user.model' import { objectToUrlEncoded } from '@app/shared/misc/utils' diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts index 7c0d4ac8f..3bc0e2885 100644 --- a/client/src/app/core/core.module.ts +++ b/client/src/app/core/core.module.ts @@ -18,6 +18,7 @@ import { CheatSheetComponent } from './hotkeys' import { ToastModule } from 'primeng/toast' import { Notifier } from './notification' import { MessageService } from 'primeng/api' +import { UserNotificationSocket } from '@app/core/notification/user-notification-socket.service' @NgModule({ imports: [ @@ -60,7 +61,8 @@ import { MessageService } from 'primeng/api' UserRightGuard, RedirectService, Notifier, - MessageService + MessageService, + UserNotificationSocket ] }) export class CoreModule { diff --git a/client/src/app/core/notification/index.ts b/client/src/app/core/notification/index.ts index 8b0cfde5f..3e8d9ea65 100644 --- a/client/src/app/core/notification/index.ts +++ b/client/src/app/core/notification/index.ts @@ -1 +1,2 @@ export * from './notifier.service' +export * from './user-notification-socket.service' diff --git a/client/src/app/core/notification/user-notification-socket.service.ts b/client/src/app/core/notification/user-notification-socket.service.ts new file mode 100644 index 000000000..f367d9ae4 --- /dev/null +++ b/client/src/app/core/notification/user-notification-socket.service.ts @@ -0,0 +1,41 @@ +import { Injectable } from '@angular/core' +import { environment } from '../../../environments/environment' +import { UserNotification as UserNotificationServer } from '../../../../../shared' +import { Subject } from 'rxjs' +import * as io from 'socket.io-client' +import { AuthService } from '../auth' + +export type NotificationEvent = 'new' | 'read' | 'read-all' + +@Injectable() +export class UserNotificationSocket { + private notificationSubject = new Subject<{ type: NotificationEvent, notification?: UserNotificationServer }>() + + private socket: SocketIOClient.Socket + + constructor ( + private auth: AuthService + ) {} + + dispatch (type: NotificationEvent, notification?: UserNotificationServer) { + this.notificationSubject.next({ type, notification }) + } + + getMyNotificationsSocket () { + const socket = this.getSocket() + + socket.on('new-notification', (n: UserNotificationServer) => this.dispatch('new', n)) + + return this.notificationSubject.asObservable() + } + + private getSocket () { + if (this.socket) return this.socket + + this.socket = io(environment.apiUrl + '/user-notifications', { + query: { accessToken: this.auth.getAccessToken() } + }) + + return this.socket + } +} diff --git a/client/src/app/menu/avatar-notification.component.html b/client/src/app/menu/avatar-notification.component.html index 2f0b7c669..4ef3f0e89 100644 --- a/client/src/app/menu/avatar-notification.component.html +++ b/client/src/app/menu/avatar-notification.component.html @@ -17,7 +17,7 @@ >
- + See all your notifications diff --git a/client/src/app/menu/avatar-notification.component.ts b/client/src/app/menu/avatar-notification.component.ts index 60e090726..f1af08096 100644 --- a/client/src/app/menu/avatar-notification.component.ts +++ b/client/src/app/menu/avatar-notification.component.ts @@ -2,7 +2,7 @@ import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core' import { User } from '../shared/users/user.model' import { UserNotificationService } from '@app/shared/users/user-notification.service' import { Subscription } from 'rxjs' -import { Notifier } from '@app/core' +import { Notifier, UserNotificationSocket } from '@app/core' import { NgbPopover } from '@ng-bootstrap/ng-bootstrap' import { NavigationEnd, Router } from '@angular/router' import { filter } from 'rxjs/operators' @@ -23,6 +23,7 @@ export class AvatarNotificationComponent implements OnInit, OnDestroy { constructor ( private userNotificationService: UserNotificationService, + private userNotificationSocket: UserNotificationSocket, private notifier: Notifier, private router: Router ) {} @@ -53,7 +54,7 @@ export class AvatarNotificationComponent implements OnInit, OnDestroy { } private subscribeToNotifications () { - this.notificationSub = this.userNotificationService.getMyNotificationsSocket() + this.notificationSub = this.userNotificationSocket.getMyNotificationsSocket() .subscribe(data => { if (data.type === 'new') return this.unreadNotifications++ if (data.type === 'read') return this.unreadNotifications-- diff --git a/client/src/app/shared/users/user-notification.service.ts b/client/src/app/shared/users/user-notification.service.ts index 2dfee8060..67ed8f74e 100644 --- a/client/src/app/shared/users/user-notification.service.ts +++ b/client/src/app/shared/users/user-notification.service.ts @@ -1,30 +1,28 @@ import { Injectable } from '@angular/core' import { HttpClient, HttpParams } from '@angular/common/http' -import { RestExtractor, RestService } from '@app/shared/rest' +import { RestExtractor, RestService } from '../rest' import { catchError, map, tap } from 'rxjs/operators' import { environment } from '../../../environments/environment' import { ResultList, UserNotification as UserNotificationServer, UserNotificationSetting } from '../../../../../shared' -import { UserNotification } from '@app/shared/users/user-notification.model' -import { Subject } from 'rxjs' -import * as io from 'socket.io-client' -import { AuthService } from '@app/core' -import { ComponentPagination } from '@app/shared/rest/component-pagination.model' -import { User } from '@app/shared' +import { UserNotification } from './user-notification.model' +import { AuthService } from '../../core' +import { ComponentPagination } from '../rest/component-pagination.model' +import { User } from '..' +import { UserNotificationSocket } from '@app/core/notification/user-notification-socket.service' @Injectable() export class UserNotificationService { static BASE_NOTIFICATIONS_URL = environment.apiUrl + '/api/v1/users/me/notifications' static BASE_NOTIFICATION_SETTINGS = environment.apiUrl + '/api/v1/users/me/notification-settings' - private notificationSubject = new Subject<{ type: 'new' | 'read' | 'read-all', notification?: UserNotification }>() - private socket: SocketIOClient.Socket constructor ( private auth: AuthService, private authHttp: HttpClient, private restExtractor: RestExtractor, - private restService: RestService + private restService: RestService, + private userNotificationSocket: UserNotificationSocket ) {} listMyNotifications (pagination: ComponentPagination, unread?: boolean, ignoreLoadingBar = false) { @@ -48,16 +46,6 @@ export class UserNotificationService { .pipe(map(n => n.total)) } - getMyNotificationsSocket () { - const socket = this.getSocket() - - socket.on('new-notification', (n: UserNotificationServer) => { - this.notificationSubject.next({ type: 'new', notification: new UserNotification(n) }) - }) - - return this.notificationSubject.asObservable() - } - markAsRead (notification: UserNotification) { const url = UserNotificationService.BASE_NOTIFICATIONS_URL + '/read' @@ -67,7 +55,7 @@ export class UserNotificationService { return this.authHttp.post(url, body, { headers }) .pipe( map(this.restExtractor.extractDataBool), - tap(() => this.notificationSubject.next({ type: 'read' })), + tap(() => this.userNotificationSocket.dispatch('read')), catchError(res => this.restExtractor.handleError(res)) ) } @@ -79,7 +67,7 @@ export class UserNotificationService { return this.authHttp.post(url, {}, { headers }) .pipe( map(this.restExtractor.extractDataBool), - tap(() => this.notificationSubject.next({ type: 'read-all' })), + tap(() => this.userNotificationSocket.dispatch('read-all')), catchError(res => this.restExtractor.handleError(res)) ) } @@ -94,16 +82,6 @@ export class UserNotificationService { ) } - private getSocket () { - if (this.socket) return this.socket - - this.socket = io(environment.apiUrl + '/user-notifications', { - query: { accessToken: this.auth.getAccessToken() } - }) - - return this.socket - } - private formatNotification (notification: UserNotificationServer) { return new UserNotification(notification) } diff --git a/client/src/app/shared/users/user-notifications.component.ts b/client/src/app/shared/users/user-notifications.component.ts index 50c495a9a..e3913ba56 100644 --- a/client/src/app/shared/users/user-notifications.component.ts +++ b/client/src/app/shared/users/user-notifications.component.ts @@ -13,6 +13,7 @@ import { UserNotification } from '@app/shared/users/user-notification.model' export class UserNotificationsComponent implements OnInit { @Input() ignoreLoadingBar = false @Input() infiniteScroll = true + @Input() itemsPerPage = 20 notifications: UserNotification[] = [] @@ -21,7 +22,7 @@ export class UserNotificationsComponent implements OnInit { componentPagination: ComponentPagination = { currentPage: 1, - itemsPerPage: 20, + itemsPerPage: this.itemsPerPage, totalItems: null } From 1506307f2f903ce0f80155072a33345c702b7c76 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Jan 2019 16:48:38 +0100 Subject: [PATCH 109/137] Increase abuse length to 3000 And correctly handle new lines --- .../about-instance.component.ts | 2 +- .../account-about/account-about.component.ts | 4 +- .../moderation/moderation.component.scss | 1 + .../video-abuse-list.component.html | 4 +- .../video-abuse-list.component.ts | 8 +++- .../video-blacklist-list.component.html | 2 +- .../video-blacklist-list.component.ts | 6 +++ .../video-channel-about.component.ts | 2 +- .../video-abuse-validators.service.ts | 8 ++-- .../forms/markdown-textarea.component.ts | 2 +- client/src/app/shared/misc/help.component.ts | 2 +- client/src/app/shared/misc/utils.ts | 13 +++++-- .../shared/renderer/html-renderer.service.ts | 35 ++++++++++++++++++ client/src/app/shared/renderer/index.ts | 3 ++ .../renderer}/linkifier.service.ts | 0 .../renderer}/markdown.service.ts | 0 client/src/app/shared/shared.module.ts | 9 +++-- .../shared/video-abuse/video-abuse.service.ts | 4 +- .../comment/video-comment.component.ts | 27 ++------------ .../comment/video-comment.service.ts | 6 +-- .../modal/video-support.component.ts | 3 +- .../+video-watch/video-watch.component.ts | 2 +- .../videos/+video-watch/video-watch.module.ts | 4 -- client/src/app/videos/shared/index.ts | 1 - server/initializers/constants.ts | 6 +-- .../migrations/0325-video-abuse-fields.ts | 37 +++++++++++++++++++ server/models/video/video-abuse.ts | 19 ++-------- server/tests/api/check-params/video-abuses.ts | 6 +-- 28 files changed, 136 insertions(+), 80 deletions(-) create mode 100644 client/src/app/shared/renderer/html-renderer.service.ts create mode 100644 client/src/app/shared/renderer/index.ts rename client/src/app/{videos/+video-watch/comment => shared/renderer}/linkifier.service.ts (100%) rename client/src/app/{videos/shared => shared/renderer}/markdown.service.ts (100%) delete mode 100644 client/src/app/videos/shared/index.ts create mode 100644 server/initializers/migrations/0325-video-abuse-fields.ts diff --git a/client/src/app/+about/about-instance/about-instance.component.ts b/client/src/app/+about/about-instance/about-instance.component.ts index d3ee8a1e4..a1b30fa8c 100644 --- a/client/src/app/+about/about-instance/about-instance.component.ts +++ b/client/src/app/+about/about-instance/about-instance.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit, ViewChild } from '@angular/core' import { Notifier, ServerService } from '@app/core' -import { MarkdownService } from '@app/videos/shared' import { I18n } from '@ngx-translate/i18n-polyfill' import { ContactAdminModalComponent } from '@app/+about/about-instance/contact-admin-modal.component' import { InstanceService } from '@app/shared/instance/instance.service' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-about-instance', diff --git a/client/src/app/+accounts/account-about/account-about.component.ts b/client/src/app/+accounts/account-about/account-about.component.ts index 6f3e6caa0..13890a0ee 100644 --- a/client/src/app/+accounts/account-about/account-about.component.ts +++ b/client/src/app/+accounts/account-about/account-about.component.ts @@ -1,9 +1,9 @@ -import { Component, OnInit, OnDestroy } from '@angular/core' +import { Component, OnDestroy, OnInit } from '@angular/core' import { Account } from '@app/shared/account/account.model' import { AccountService } from '@app/shared/account/account.service' import { I18n } from '@ngx-translate/i18n-polyfill' import { Subscription } from 'rxjs' -import { MarkdownService } from '@app/videos/shared' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-account-about', diff --git a/client/src/app/+admin/moderation/moderation.component.scss b/client/src/app/+admin/moderation/moderation.component.scss index 02ccfc8ca..13b019c5b 100644 --- a/client/src/app/+admin/moderation/moderation.component.scss +++ b/client/src/app/+admin/moderation/moderation.component.scss @@ -10,6 +10,7 @@ font-weight: $font-semibold; min-width: 200px; display: inline-block; + vertical-align: top; } .moderation-expanded-text { diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html index e862d5162..05b549de6 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html @@ -51,11 +51,11 @@
Reason: - {{ videoAbuse.reason }} +
Moderation comment: - {{ videoAbuse.moderationComment }} +
diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts index f64234b74..00c871659 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts @@ -9,6 +9,7 @@ import { DropdownAction } from '../../../shared/buttons/action-dropdown.componen import { ConfirmService } from '../../../core/index' import { ModerationCommentModalComponent } from './moderation-comment-modal.component' import { Video } from '../../../shared/video/video.model' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-video-abuse-list', @@ -30,7 +31,8 @@ export class VideoAbuseListComponent extends RestTable implements OnInit { private notifier: Notifier, private videoAbuseService: VideoAbuseService, private confirmService: ConfirmService, - private i18n: I18n + private i18n: I18n, + private markdownRenderer: MarkdownService ) { super() @@ -108,6 +110,10 @@ export class VideoAbuseListComponent extends RestTable implements OnInit { } + toHtml (text: string) { + return this.markdownRenderer.textMarkdownToHTML(text) + } + protected loadData () { return this.videoAbuseService.getVideoAbuses(this.pagination, this.sort) .subscribe( diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html index 6398af218..247f441c1 100644 --- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html +++ b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html @@ -41,7 +41,7 @@ Blacklist reason: - {{ videoBlacklist.reason }} + diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts index 6c6f17f0c..b27bbbfef 100644 --- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts +++ b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts @@ -7,6 +7,7 @@ import { VideoBlacklist } from '../../../../../../shared' import { I18n } from '@ngx-translate/i18n-polyfill' import { DropdownAction } from '../../../shared/buttons/action-dropdown.component' import { Video } from '../../../shared/video/video.model' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-video-blacklist-list', @@ -26,6 +27,7 @@ export class VideoBlacklistListComponent extends RestTable implements OnInit { private notifier: Notifier, private confirmService: ConfirmService, private videoBlacklistService: VideoBlacklistService, + private markdownRenderer: MarkdownService, private i18n: I18n ) { super() @@ -52,6 +54,10 @@ export class VideoBlacklistListComponent extends RestTable implements OnInit { return this.i18n('no') } + toHtml (text: string) { + return this.markdownRenderer.textMarkdownToHTML(text) + } + async removeVideoFromBlacklist (entry: VideoBlacklist) { const confirmMessage = this.i18n( 'Do you really want to remove this video from the blacklist? It will be available again in the videos list.' diff --git a/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts b/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts index ea7b0e118..895b19064 100644 --- a/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts +++ b/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts @@ -3,7 +3,7 @@ import { VideoChannelService } from '@app/shared/video-channel/video-channel.ser import { VideoChannel } from '@app/shared/video-channel/video-channel.model' import { I18n } from '@ngx-translate/i18n-polyfill' import { Subscription } from 'rxjs' -import { MarkdownService } from '@app/videos/shared' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-video-channel-about', diff --git a/client/src/app/shared/forms/form-validators/video-abuse-validators.service.ts b/client/src/app/shared/forms/form-validators/video-abuse-validators.service.ts index 6e9806611..fcc966b84 100644 --- a/client/src/app/shared/forms/form-validators/video-abuse-validators.service.ts +++ b/client/src/app/shared/forms/form-validators/video-abuse-validators.service.ts @@ -10,20 +10,20 @@ export class VideoAbuseValidatorsService { constructor (private i18n: I18n) { this.VIDEO_ABUSE_REASON = { - VALIDATORS: [ Validators.required, Validators.minLength(2), Validators.maxLength(300) ], + VALIDATORS: [ Validators.required, Validators.minLength(2), Validators.maxLength(3000) ], MESSAGES: { 'required': this.i18n('Report reason is required.'), 'minlength': this.i18n('Report reason must be at least 2 characters long.'), - 'maxlength': this.i18n('Report reason cannot be more than 300 characters long.') + 'maxlength': this.i18n('Report reason cannot be more than 3000 characters long.') } } this.VIDEO_ABUSE_MODERATION_COMMENT = { - VALIDATORS: [ Validators.required, Validators.minLength(2), Validators.maxLength(300) ], + VALIDATORS: [ Validators.required, Validators.minLength(2), Validators.maxLength(3000) ], MESSAGES: { 'required': this.i18n('Moderation comment is required.'), 'minlength': this.i18n('Moderation comment must be at least 2 characters long.'), - 'maxlength': this.i18n('Moderation comment cannot be more than 300 characters long.') + 'maxlength': this.i18n('Moderation comment cannot be more than 3000 characters long.') } } } diff --git a/client/src/app/shared/forms/markdown-textarea.component.ts b/client/src/app/shared/forms/markdown-textarea.component.ts index b99169ed2..e87aca0d4 100644 --- a/client/src/app/shared/forms/markdown-textarea.component.ts +++ b/client/src/app/shared/forms/markdown-textarea.component.ts @@ -1,10 +1,10 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators' import { Component, forwardRef, Input, OnInit } from '@angular/core' import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms' -import { MarkdownService } from '@app/videos/shared' import { Subject } from 'rxjs' import truncate from 'lodash-es/truncate' import { ScreenService } from '@app/shared/misc/screen.service' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-markdown-textarea', diff --git a/client/src/app/shared/misc/help.component.ts b/client/src/app/shared/misc/help.component.ts index ba0452e77..f3426f70f 100644 --- a/client/src/app/shared/misc/help.component.ts +++ b/client/src/app/shared/misc/help.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnChanges, OnInit } from '@angular/core' -import { MarkdownService } from '@app/videos/shared' import { I18n } from '@ngx-translate/i18n-polyfill' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-help', diff --git a/client/src/app/shared/misc/utils.ts b/client/src/app/shared/misc/utils.ts index 78e8e9682..7cc6055c2 100644 --- a/client/src/app/shared/misc/utils.ts +++ b/client/src/app/shared/misc/utils.ts @@ -102,12 +102,18 @@ function objectToFormData (obj: any, form?: FormData, namespace?: string) { return fd } -function lineFeedToHtml (obj: any, keyToNormalize: string) { +function objectLineFeedToHtml (obj: any, keyToNormalize: string) { return immutableAssign(obj, { - [keyToNormalize]: obj[keyToNormalize].replace(/\r?\n|\r/g, '
') + [keyToNormalize]: lineFeedToHtml(obj[keyToNormalize]) }) } +function lineFeedToHtml (text: string) { + if (!text) return text + + return text.replace(/\r?\n|\r/g, '
') +} + function removeElementFromArray (arr: T[], elem: T) { const index = arr.indexOf(elem) if (index !== -1) arr.splice(index, 1) @@ -131,6 +137,7 @@ function scrollToTop () { export { sortBy, durationToString, + lineFeedToHtml, objectToUrlEncoded, getParameterByName, populateAsyncUserVideoChannels, @@ -138,7 +145,7 @@ export { dateToHuman, immutableAssign, objectToFormData, - lineFeedToHtml, + objectLineFeedToHtml, removeElementFromArray, scrollToTop } diff --git a/client/src/app/shared/renderer/html-renderer.service.ts b/client/src/app/shared/renderer/html-renderer.service.ts new file mode 100644 index 000000000..d49df9b6d --- /dev/null +++ b/client/src/app/shared/renderer/html-renderer.service.ts @@ -0,0 +1,35 @@ +import { Injectable } from '@angular/core' +import { LinkifierService } from '@app/shared/renderer/linkifier.service' +import * as sanitizeHtml from 'sanitize-html' + +@Injectable() +export class HtmlRendererService { + + constructor (private linkifier: LinkifierService) { + + } + + toSafeHtml (text: string) { + // Convert possible markdown to html + const html = this.linkifier.linkify(text) + + return sanitizeHtml(html, { + allowedTags: [ 'a', 'p', 'span', 'br' ], + allowedSchemes: [ 'http', 'https' ], + allowedAttributes: { + 'a': [ 'href', 'class', 'target' ] + }, + transformTags: { + a: (tagName, attribs) => { + return { + tagName, + attribs: Object.assign(attribs, { + target: '_blank', + rel: 'noopener noreferrer' + }) + } + } + } + }) + } +} diff --git a/client/src/app/shared/renderer/index.ts b/client/src/app/shared/renderer/index.ts new file mode 100644 index 000000000..39202b385 --- /dev/null +++ b/client/src/app/shared/renderer/index.ts @@ -0,0 +1,3 @@ +export * from './html-renderer.service' +export * from './linkifier.service' +export * from './markdown.service' diff --git a/client/src/app/videos/+video-watch/comment/linkifier.service.ts b/client/src/app/shared/renderer/linkifier.service.ts similarity index 100% rename from client/src/app/videos/+video-watch/comment/linkifier.service.ts rename to client/src/app/shared/renderer/linkifier.service.ts diff --git a/client/src/app/videos/shared/markdown.service.ts b/client/src/app/shared/renderer/markdown.service.ts similarity index 100% rename from client/src/app/videos/shared/markdown.service.ts rename to client/src/app/shared/renderer/markdown.service.ts diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts index d1320aeec..384f5d722 100644 --- a/client/src/app/shared/shared.module.ts +++ b/client/src/app/shared/shared.module.ts @@ -6,7 +6,6 @@ import { RouterModule } from '@angular/router' import { MarkdownTextareaComponent } from '@app/shared/forms/markdown-textarea.component' import { HelpComponent } from '@app/shared/misc/help.component' import { InfiniteScrollerDirective } from '@app/shared/video/infinite-scroller.directive' -import { MarkdownService } from '@app/videos/shared' import { BytesPipe, KeysPipe, NgPipesModule } from 'ngx-pipes' import { SharedModule as PrimeSharedModule } from 'primeng/components/common/shared' @@ -34,10 +33,10 @@ import { I18n } from '@ngx-translate/i18n-polyfill' import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' import { CustomConfigValidatorsService, + InstanceValidatorsService, LoginValidatorsService, ReactiveFileComponent, ResetPasswordValidatorsService, - InstanceValidatorsService, TextareaAutoResizeDirective, UserValidatorsService, VideoAbuseValidatorsService, @@ -67,6 +66,7 @@ import { UserHistoryService } from '@app/shared/users/user-history.service' import { UserNotificationService } from '@app/shared/users/user-notification.service' import { UserNotificationsComponent } from '@app/shared/users/user-notifications.component' import { InstanceService } from '@app/shared/instance/instance.service' +import { HtmlRendererService, LinkifierService, MarkdownService } from '@app/shared/renderer' @NgModule({ imports: [ @@ -167,7 +167,6 @@ import { InstanceService } from '@app/shared/instance/instance.service' UserService, VideoService, AccountService, - MarkdownService, VideoChannelService, VideoCaptionService, VideoImportService, @@ -192,6 +191,10 @@ import { InstanceService } from '@app/shared/instance/instance.service' UserHistoryService, InstanceService, + MarkdownService, + LinkifierService, + HtmlRendererService, + I18nPrimengCalendarService, ScreenService, diff --git a/client/src/app/shared/video-abuse/video-abuse.service.ts b/client/src/app/shared/video-abuse/video-abuse.service.ts index 61b7e1b98..b0b59ea0c 100644 --- a/client/src/app/shared/video-abuse/video-abuse.service.ts +++ b/client/src/app/shared/video-abuse/video-abuse.service.ts @@ -32,9 +32,7 @@ export class VideoAbuseService { reportVideo (id: number, reason: string) { const url = VideoAbuseService.BASE_VIDEO_ABUSE_URL + id + '/abuse' - const body = { - reason - } + const body = { reason } return this.authHttp.post(url, body) .pipe( diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.ts b/client/src/app/videos/+video-watch/comment/video-comment.component.ts index 00f0460a1..aba7f9d1c 100644 --- a/client/src/app/videos/+video-watch/comment/video-comment.component.ts +++ b/client/src/app/videos/+video-watch/comment/video-comment.component.ts @@ -1,11 +1,10 @@ import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core' -import { LinkifierService } from '@app/videos/+video-watch/comment/linkifier.service' -import * as sanitizeHtml from 'sanitize-html' import { UserRight } from '../../../../../../shared/models/users' import { VideoCommentThreadTree } from '../../../../../../shared/models/videos/video-comment.model' import { AuthService } from '../../../core/auth' import { Video } from '../../../shared/video/video.model' import { VideoComment } from './video-comment.model' +import { HtmlRendererService } from '@app/shared/renderer' @Component({ selector: 'my-video-comment', @@ -29,7 +28,7 @@ export class VideoCommentComponent implements OnInit, OnChanges { newParentComments: VideoComment[] = [] constructor ( - private linkifierService: LinkifierService, + private htmlRenderer: HtmlRendererService, private authService: AuthService ) {} @@ -87,27 +86,7 @@ export class VideoCommentComponent implements OnInit, OnChanges { } private init () { - // Convert possible markdown to html - const html = this.linkifierService.linkify(this.comment.text) - - this.sanitizedCommentHTML = sanitizeHtml(html, { - allowedTags: [ 'a', 'p', 'span', 'br' ], - allowedSchemes: [ 'http', 'https' ], - allowedAttributes: { - 'a': [ 'href', 'class', 'target' ] - }, - transformTags: { - a: (tagName, attribs) => { - return { - tagName, - attribs: Object.assign(attribs, { - target: '_blank', - rel: 'noopener noreferrer' - }) - } - } - } - }) + this.sanitizedCommentHTML = this.htmlRenderer.toSafeHtml(this.comment.text) this.newParentComments = this.parentComments.concat([ this.comment ]) } diff --git a/client/src/app/videos/+video-watch/comment/video-comment.service.ts b/client/src/app/videos/+video-watch/comment/video-comment.service.ts index 921447d5b..b8e5878c5 100644 --- a/client/src/app/videos/+video-watch/comment/video-comment.service.ts +++ b/client/src/app/videos/+video-watch/comment/video-comment.service.ts @@ -1,7 +1,7 @@ import { catchError, map } from 'rxjs/operators' import { HttpClient, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' -import { lineFeedToHtml } from '@app/shared/misc/utils' +import { objectLineFeedToHtml } from '@app/shared/misc/utils' import { Observable } from 'rxjs' import { ResultList, FeedFormat } from '../../../../../../shared/models' import { @@ -28,7 +28,7 @@ export class VideoCommentService { addCommentThread (videoId: number | string, comment: VideoCommentCreate) { const url = VideoCommentService.BASE_VIDEO_URL + videoId + '/comment-threads' - const normalizedComment = lineFeedToHtml(comment, 'text') + const normalizedComment = objectLineFeedToHtml(comment, 'text') return this.authHttp.post<{ comment: VideoCommentServerModel }>(url, normalizedComment) .pipe( @@ -39,7 +39,7 @@ export class VideoCommentService { addCommentReply (videoId: number | string, inReplyToCommentId: number, comment: VideoCommentCreate) { const url = VideoCommentService.BASE_VIDEO_URL + videoId + '/comments/' + inReplyToCommentId - const normalizedComment = lineFeedToHtml(comment, 'text') + const normalizedComment = objectLineFeedToHtml(comment, 'text') return this.authHttp.post<{ comment: VideoCommentServerModel }>(url, normalizedComment) .pipe( diff --git a/client/src/app/videos/+video-watch/modal/video-support.component.ts b/client/src/app/videos/+video-watch/modal/video-support.component.ts index 154002120..deb8fbc67 100644 --- a/client/src/app/videos/+video-watch/modal/video-support.component.ts +++ b/client/src/app/videos/+video-watch/modal/video-support.component.ts @@ -1,8 +1,7 @@ import { Component, Input, ViewChild } from '@angular/core' -import { MarkdownService } from '@app/videos/shared' - import { VideoDetails } from '../../../shared/video/video-details.model' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-video-support', diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts index 67c5254b3..ee504bc58 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.ts +++ b/client/src/app/videos/+video-watch/video-watch.component.ts @@ -19,7 +19,6 @@ import { AuthService, ConfirmService } from '../../core' import { RestExtractor, VideoBlacklistService } from '../../shared' import { VideoDetails } from '../../shared/video/video-details.model' import { VideoService } from '../../shared/video/video.service' -import { MarkdownService } from '../shared' import { VideoDownloadComponent } from './modal/video-download.component' import { VideoReportComponent } from './modal/video-report.component' import { VideoShareComponent } from './modal/video-share.component' @@ -30,6 +29,7 @@ import { I18n } from '@ngx-translate/i18n-polyfill' import { environment } from '../../../environments/environment' import { getDevLocale, isOnDevLocale } from '@app/shared/i18n/i18n-utils' import { VideoCaptionService } from '@app/shared/video-caption' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-video-watch', diff --git a/client/src/app/videos/+video-watch/video-watch.module.ts b/client/src/app/videos/+video-watch/video-watch.module.ts index 54a12c126..2f448db78 100644 --- a/client/src/app/videos/+video-watch/video-watch.module.ts +++ b/client/src/app/videos/+video-watch/video-watch.module.ts @@ -1,9 +1,7 @@ import { NgModule } from '@angular/core' -import { LinkifierService } from '@app/videos/+video-watch/comment/linkifier.service' import { VideoSupportComponent } from '@app/videos/+video-watch/modal/video-support.component' import { ClipboardModule } from 'ngx-clipboard' import { SharedModule } from '../../shared' -import { MarkdownService } from '../shared' import { VideoCommentAddComponent } from './comment/video-comment-add.component' import { VideoCommentComponent } from './comment/video-comment.component' import { VideoCommentService } from './comment/video-comment.service' @@ -46,8 +44,6 @@ import { RecommendationsModule } from '@app/videos/recommendations/recommendatio ], providers: [ - MarkdownService, - LinkifierService, VideoCommentService ] }) diff --git a/client/src/app/videos/shared/index.ts b/client/src/app/videos/shared/index.ts deleted file mode 100644 index 7a66944b9..000000000 --- a/client/src/app/videos/shared/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './markdown.service' diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index b18884eeb..93fdd3f03 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -16,7 +16,7 @@ let config: IConfig = require('config') // --------------------------------------------------------------------------- -const LAST_MIGRATION_VERSION = 320 +const LAST_MIGRATION_VERSION = 325 // --------------------------------------------------------------------------- @@ -316,8 +316,8 @@ let CONSTRAINTS_FIELDS = { BLOCKED_REASON: { min: 3, max: 250 } // Length }, VIDEO_ABUSES: { - REASON: { min: 2, max: 300 }, // Length - MODERATION_COMMENT: { min: 2, max: 300 } // Length + REASON: { min: 2, max: 3000 }, // Length + MODERATION_COMMENT: { min: 2, max: 3000 } // Length }, VIDEO_BLACKLIST: { REASON: { min: 2, max: 300 } // Length diff --git a/server/initializers/migrations/0325-video-abuse-fields.ts b/server/initializers/migrations/0325-video-abuse-fields.ts new file mode 100644 index 000000000..fca6d666f --- /dev/null +++ b/server/initializers/migrations/0325-video-abuse-fields.ts @@ -0,0 +1,37 @@ +import * as Sequelize from 'sequelize' + +async function up (utils: { + transaction: Sequelize.Transaction, + queryInterface: Sequelize.QueryInterface, + sequelize: Sequelize.Sequelize +}): Promise { + + { + const data = { + type: Sequelize.STRING(3000), + allowNull: false, + defaultValue: null + } + + await utils.queryInterface.changeColumn('videoAbuse', 'reason', data) + } + + { + const data = { + type: Sequelize.STRING(3000), + allowNull: true, + defaultValue: null + } + + await utils.queryInterface.changeColumn('videoAbuse', 'moderationComment', data) + } +} + +function down (options) { + throw new Error('Not implemented.') +} + +export { + up, + down +} diff --git a/server/models/video/video-abuse.ts b/server/models/video/video-abuse.ts index 4c9e2d05e..cc47644f2 100644 --- a/server/models/video/video-abuse.ts +++ b/server/models/video/video-abuse.ts @@ -1,17 +1,4 @@ -import { - AfterCreate, - AllowNull, - BelongsTo, - Column, - CreatedAt, - DataType, - Default, - ForeignKey, - Is, - Model, - Table, - UpdatedAt -} from 'sequelize-typescript' +import { AllowNull, BelongsTo, Column, CreatedAt, DataType, Default, ForeignKey, Is, Model, Table, UpdatedAt } from 'sequelize-typescript' import { VideoAbuseObject } from '../../../shared/models/activitypub/objects' import { VideoAbuse } from '../../../shared/models/videos' import { @@ -19,7 +6,6 @@ import { isVideoAbuseReasonValid, isVideoAbuseStateValid } from '../../helpers/custom-validators/video-abuses' -import { Emailer } from '../../lib/emailer' import { AccountModel } from '../account/account' import { getSort, throwIfNotValid } from '../utils' import { VideoModel } from './video' @@ -40,8 +26,9 @@ import { CONSTRAINTS_FIELDS, VIDEO_ABUSE_STATES } from '../../initializers' export class VideoAbuseModel extends Model { @AllowNull(false) + @Default(null) @Is('VideoAbuseReason', value => throwIfNotValid(value, isVideoAbuseReasonValid, 'reason')) - @Column + @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEO_ABUSES.REASON.max)) reason: string @AllowNull(false) diff --git a/server/tests/api/check-params/video-abuses.ts b/server/tests/api/check-params/video-abuses.ts index a79ab4201..3b8f5f14d 100644 --- a/server/tests/api/check-params/video-abuses.ts +++ b/server/tests/api/check-params/video-abuses.ts @@ -113,8 +113,8 @@ describe('Test video abuses API validators', function () { await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) }) - it('Should fail with a reason too big', async function () { - const fields = { reason: 'super'.repeat(61) } + it('Should fail with a too big reason', async function () { + const fields = { reason: 'super'.repeat(605) } await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) }) @@ -154,7 +154,7 @@ describe('Test video abuses API validators', function () { }) it('Should fail with a bad moderation comment', async function () { - const body = { moderationComment: 'b'.repeat(305) } + const body = { moderationComment: 'b'.repeat(3001) } await updateVideoAbuse(server.url, server.accessToken, server.video.uuid, videoAbuseId, body, 400) }) From ad3fa0c56715f98886b1b6400fc54ce7d568d899 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Jan 2019 17:45:02 +0100 Subject: [PATCH 110/137] Add missing translations in embed template --- client/src/locale/source/angular_en_US.xml | 141 +- client/src/locale/source/server_en_US.xml | 16 + client/src/locale/target/angular_ar_001.xml | 388 +- client/src/locale/target/angular_ca_ES.xml | 335 +- client/src/locale/target/angular_cs_CZ.xml | 713 ++- client/src/locale/target/angular_de_DE.xml | 978 ++-- client/src/locale/target/angular_eo.xml | 409 +- client/src/locale/target/angular_es_ES.xml | 2460 ++++++++- client/src/locale/target/angular_eu_ES.xml | 608 +-- client/src/locale/target/angular_fa_IR.xml | 94 +- client/src/locale/target/angular_fr_FR.xml | 1205 +++-- client/src/locale/target/angular_gl_ES.xml | 154 +- client/src/locale/target/angular_it_IT.xml | 590 +-- client/src/locale/target/angular_ja_JP.xml | 290 +- client/src/locale/target/angular_jbo.xml | 264 +- client/src/locale/target/angular_nl_NL.xml | 4535 ++++++++++++++++- client/src/locale/target/angular_oc.xml | 782 +-- client/src/locale/target/angular_pl_PL.xml | 460 +- client/src/locale/target/angular_pt_BR.xml | 571 +-- client/src/locale/target/angular_ru_RU.xml | 355 +- client/src/locale/target/angular_sv_SE.xml | 752 ++- client/src/locale/target/angular_ta.xml | 22 +- .../src/locale/target/angular_zh_Hans_CN.xml | 606 +-- .../src/locale/target/angular_zh_Hant_TW.xml | 613 +-- client/src/locale/target/iso639_nl_NL.xml | 22 +- client/src/locale/target/player_nl_NL.xml | 4 + client/src/locale/target/server_cs_CZ.json | 2 +- client/src/locale/target/server_fr_FR.json | 2 +- client/src/locale/target/server_nl_NL.xml | 34 +- client/src/standalone/videos/embed.html | 2 +- client/src/standalone/videos/embed.ts | 30 +- scripts/i18n/create-custom-files.ts | 8 +- 32 files changed, 11557 insertions(+), 5888 deletions(-) diff --git a/client/src/locale/source/angular_en_US.xml b/client/src/locale/source/angular_en_US.xml index d61d4f9f2..3aa178825 100644 --- a/client/src/locale/source/angular_en_US.xml +++ b/client/src/locale/source/angular_en_US.xml @@ -1120,45 +1120,45 @@ Display unlisted and private videos app/shared/video/abstract-video-list.html - 11 + 14 app/shared/video/abstract-video-list.html - 11 + 14 app/shared/video/abstract-video-list.html - 11 + 14 app/shared/video/abstract-video-list.html - 11 + 14 app/shared/video/abstract-video-list.html - 11 + 14 app/shared/video/abstract-video-list.html - 11 + 14 No results. app/shared/video/abstract-video-list.html - 17 + 20 app/shared/video/abstract-video-list.html - 17 + 20 app/shared/video/abstract-video-list.html - 17 + 20 app/shared/video/abstract-video-list.html - 17 + 20 app/videos/video-list/video-overview.component.html @@ -1166,7 +1166,7 @@ app/shared/video/abstract-video-list.html - 17 + 20 app/+my-account/my-account-videos/my-account-videos.component.html @@ -1174,7 +1174,7 @@ app/shared/video/abstract-video-list.html - 17 + 20 @@ -1266,7 +1266,7 @@ app/videos/+video-watch/modal/video-blacklist.component.html - 19 + 26 Submit @@ -1288,7 +1288,7 @@ app/videos/+video-watch/modal/video-blacklist.component.html - 24 + 31 About <x id="INTERPOLATION" equiv-text="{{ instanceName }}"/> instance @@ -2347,19 +2347,19 @@ User's email must be verified to login app/+admin/users/user-list/user-list.component.html - 70 + 72 User's email is verified / User can login without email verification app/+admin/users/user-list/user-list.component.html - 74 + 76 Ban reason: app/+admin/users/user-list/user-list.component.html - 92 + 95 Moderation comment @@ -2425,7 +2425,7 @@ app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html - 24 + 25 app/+my-account/my-account-ownership/my-account-ownership.component.html @@ -2439,7 +2439,7 @@ app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html - 33 + 35 Reason: @@ -2465,17 +2465,23 @@ app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html 9 + + Unfederated + + app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html + 10 + Date <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="<p-sortIcon>"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="</p-sortIcon>"/> app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html - 10 + 11 Blacklist reason: app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html - 41 + 43 Moderation @@ -3089,17 +3095,25 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-edit/video-add-components/video-upload.component.html 25 + + + Congratulations! Your video is now available in your private library. + + + app/videos/+video-edit/video-add-components/video-upload.component.html + 45 + Publish will be available when upload is finished app/videos/+video-edit/video-add-components/video-upload.component.html - 54 + 58 Publish app/videos/+video-edit/video-add-components/video-upload.component.html - 61 + 65 Select the torrent to import @@ -3476,6 +3490,12 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-watch/modal/video-blacklist.component.html 3 + + Unfederate the video (ask for its deletion from the remote instances) + + app/videos/+video-watch/modal/video-blacklist.component.html + 21 + The video is being imported, it will be available when the import is finished. @@ -4091,6 +4111,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + yes + + src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts + 1 + + + + no + + src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts + 1 + + Do you really want to remove this video from the blacklist? It will be available again in the videos list. @@ -4457,15 +4491,8 @@ When you will upload a video in this channel, the video support field will be au 1 - - Do you really want to delete <x id="INTERPOLATION" equiv-text="{{videoChannelName}}"/>? It will delete all videos uploaded in this channel too. - - src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts - 1 - - - - Please type the name of the video channel to confirm + + Please type the display name of the video channel (<x id="INTERPOLATION" equiv-text="{{displayName}}"/>) to confirm src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts 1 @@ -5274,8 +5301,8 @@ When you will upload a video in this channel, the video support field will be au 1 - - Report reason cannot be more than 300 characters long. + + Report reason cannot be more than 3000 characters long. src/app/shared/forms/form-validators/video-abuse-validators.service.ts 1 @@ -5295,8 +5322,8 @@ When you will upload a video in this channel, the video support field will be au 1 - - Moderation comment cannot be more than 300 characters long. + + Moderation comment cannot be more than 3000 characters long. src/app/shared/forms/form-validators/video-abuse-validators.service.ts 1 @@ -5505,6 +5532,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + PeerTube cannot handle this kind of file. Accepted extensions are <x id="INTERPOLATION" equiv-text="{{extensions}}"/>. + + src/app/shared/forms/reactive-file.component.ts + 1 + + All unsaved data will be lost, are you sure you want to leave this page? @@ -6351,6 +6385,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + You have unsaved changes! If you leave, your changes will be lost. + + src/app/videos/+video-edit/video-update.component.ts + 1 + + Video updated. @@ -6439,6 +6480,34 @@ When you will upload a video in this channel, the video support field will be au 1 + + Trending for the last 24 hours + + src/app/videos/video-list/video-trending.component.ts + 1 + + + + Trending videos are those totalizing the greatest number of views during the last 24 hours. + + src/app/videos/video-list/video-trending.component.ts + 1 + + + + Trending for the last <x id="INTERPOLATION" equiv-text="{{days}}"/> days + + src/app/videos/video-list/video-trending.component.ts + 1 + + + + Trending videos are those totalizing the greatest number of views during the last <x id="INTERPOLATION" equiv-text="{{days}}"/> days. + + src/app/videos/video-list/video-trending.component.ts + 1 + + Videos from your subscriptions diff --git a/client/src/locale/source/server_en_US.xml b/client/src/locale/source/server_en_US.xml index b6e62ce80..f5e125549 100644 --- a/client/src/locale/source/server_en_US.xml +++ b/client/src/locale/source/server_en_US.xml @@ -137,6 +137,22 @@ Failed undefined + + This video does not exist. + undefined + + + We cannot fetch the video. Please try again later. + undefined + + + Sorry + undefined + + + This video is not available because the remote instance is not responding. + undefined + Misc undefined diff --git a/client/src/locale/target/angular_ar_001.xml b/client/src/locale/target/angular_ar_001.xml index 894798226..978f69571 100644 --- a/client/src/locale/target/angular_ar_001.xml +++ b/client/src/locale/target/angular_ar_001.xml @@ -430,7 +430,7 @@ Password الكلمة السرية - 12 + 13 @@ -444,7 +444,7 @@ Login تسجيل الدخول - 38 + 36 @@ -472,7 +472,7 @@ Send me an email to reset my password أرسل لي رسالة لإعادة تعيين كلمتي السرية - 75 + 80 @@ -532,7 +532,7 @@ Signup سجل - 88 + 78 @@ -576,7 +576,7 @@ Change the language تغيير اللغة - 88 + 86 @@ -585,7 +585,7 @@ صفحتي العمومية - 18 + 16 @@ -594,7 +594,7 @@ حسابي - 22 + 20 @@ -603,7 +603,7 @@ فيديوهاتي - 26 + 24 @@ -612,14 +612,14 @@ الخروج - 30 + 28 Create an account إنشاء حساب - 39 + 37 @@ -633,49 +633,49 @@ Subscriptions الإشتراكات - 47 + 45 Overview نظرة شاملة - 52 + 50 Trending الشائعة - 57 + 55 Recently added التي تم إضافتها حديثًا - 62 + 60 Local المحلية - 67 + 65 More المزيد - 72 + 70 Administration الإدارة - 76 + 74 @@ -689,7 +689,7 @@ Toggle dark interface الإنتقال إلى الواجهة الداكنة - 94 + 92 @@ -794,7 +794,7 @@ No results. لا نتائج - 17 + 20 @@ -811,15 +811,20 @@ 7 - + - About instance - - - حول مثيل الخدوم - + Cancel + + إلغاء - 1 + 26 + + + + Submit + إرسال + + 31 @@ -833,44 +838,14 @@ Terms الشروط - 44 + 39 User registration is allowed and التسجيل مسموح و - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - -مثيل الخادوم هذا يوفر مساحة لفيديوهات المستخدمين. - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - -مثيل الخادوم هذا يوفر مساحة غير محددة لفيديوهات المستخدمين. - - 31 - - - - - User registration is currently not allowed. - - -التسجيل غير مسموح حاليا. - - 36 + 29 @@ -1052,42 +1027,42 @@ Short description الوصف القصير - 22 + 21 Videos Overview نظرة شاملة عن الفيديوهات - 58 + 51 Videos Trending الفيديوهات الشائعة - 59 + 52 Videos Recently Added الفيديوهات المُضافة حديثًا - 60 + 53 Local videos الفيديوهات المحلية - 61 + 54 Policy on videos containing sensitive content سياسة الفيديوهات التي تحتوي على محتوى حساس - 70 + 61 @@ -1108,23 +1083,44 @@ Signup enabled التسجيل مُفعل - 93 + 84 Signup requires email verification يتطلب التسجيل رسالة تأكيد - 100 + 91 Signup limit حد التسجيل + + 96 + + + + Users + المستخدِمون 105 + + User default video quota + حصة الفيديو الافتراضية للمستخدم + + 109 + + + + User default daily upload limit + حد الرفع الإفتراضي للمستخدِم + + 121 + + Import استيراد @@ -1136,35 +1132,14 @@ Administrator المدير - 131 + 155 Admin email البريد الإلكتروني للمدير - 134 - - - - Users - المستخدِمون - - 144 - - - - User default video quota - حصة الفيديو الافتراضية للمستخدم - - 147 - - - - User default daily upload limit - حد الرفع الإفتراضي للمستخدِم - - 161 + 158 @@ -1185,7 +1160,7 @@ Your Twitter username اسم المستخدِم الخاص بك على تويتر - 181 + 184 @@ -1199,21 +1174,21 @@ Customizations التخصيصات - 275 + 289 JavaScript الجافا سكريبت - 278 + 294 Advanced configuration الإعدادات المتقدمة - 207 + 212 @@ -1391,7 +1366,7 @@ Ban reason: سبب الحظر: - 92 + 95 @@ -1440,7 +1415,7 @@ Actions الإجراءات - 33 + 35 @@ -1468,7 +1443,7 @@ Blacklist reason: سبب الحجب: - 41 + 43 @@ -1499,62 +1474,6 @@ 23 - - My settings - إعداداتي - - 3 - - - - My library - مكتبتي - - 7 - - - - My channels - قنواتي - - 12 - - - - My videos - فيديوهاتي - - 14 - - - - My subscriptions - اشتراكاتي - - 16 - - - - My imports - وارداتي - - 18 - - - - Misc - أخرى - - 24 - - - - Muted instances - مثيلات الخوادم المكتومة - - 2 - - Video quota: تقم الفيديو: @@ -1566,21 +1485,21 @@ Profile الملف الشخصي - 8 + 7 Video settings إعدادات الفيديو - 15 + 16 Danger zone منطقة الخطر - 18 + 19 @@ -1606,13 +1525,6 @@ 35 - - Submit - إرسال - - 24 - - Blacklisted تم حجبه @@ -1699,6 +1611,13 @@ 47 + + Muted instances + مثيلات الخوادم المكتومة + + 2 + + Change password تغيير الكلمة السرية @@ -1836,7 +1755,7 @@ Publish أنشر - 60 + 65 @@ -1920,28 +1839,28 @@ Cancel create إلغاء الإنشاء - 169 + 170 Cancel deletion إلغاء الحذف - 177 + 178 Upload thumbnail تحديث الصورة المصغرة - 195 + 196 Upload preview إرسال معاينة - 202 + 203 @@ -1955,7 +1874,7 @@ Advanced settings الإعدادات المتقدمة - 190 + 191 @@ -2009,15 +1928,6 @@ 3 - - - Cancel - - إلغاء - - 19 - - Share شارك @@ -2259,13 +2169,6 @@ 1 - - Error - خطأ - - 1 - - 240p 240p @@ -2301,13 +2204,6 @@ 1 - - Success - تم بنجاح - - 1 - - Configuration updated. تم تحديث الإعدادات @@ -2490,9 +2386,9 @@ 1 - - Please type the name of the video channel to confirm - رجاء أدخل اسم القنات للتأكيد + + My videos + فيديوهاتي 1 @@ -2511,9 +2407,37 @@ 1 - - Channels - القنوات + + My library + مكتبتي + + 1 + + + + My channels + قنواتي + + 1 + + + + My subscriptions + اشتراكاتي + + 1 + + + + Misc + أخرى + + 1 + + + + My settings + إعداداتي 1 @@ -2602,6 +2526,13 @@ 1 + + Error + خطأ + + 1 + + You need to reconnect. يجب عليك إعادة الإتصال. @@ -2623,6 +2554,20 @@ 1 + + Info + معلومات + + 1 + + + + Success + تم بنجاح + + 1 + + Incorrect username or password. اسم المستخدم أو كلمة المرور خاطئة. @@ -2721,6 +2666,20 @@ 1 + + Email is required. + البريد الإلكتروني مطلوب. + + 1 + + + + Email must be valid. + يجب أن يكون عنوان البريد الإلكتروني عنوانًا صالحًا. + + 1 + + Username is required. اسم المستخدم مطلوب. @@ -2742,27 +2701,6 @@ 1 - - Username must be at least 3 characters long. - يجب أن يكون طول اسم المستخدِم أكبر مِن 3 أحرف. - - 1 - - - - Email is required. - البريد الإلكتروني مطلوب. - - 1 - - - - Email must be valid. - يجب أن يكون عنوان البريد الإلكتروني عنوانًا صالحًا. - - 1 - - User role is required. دور المستخدم مطلوب. @@ -2826,13 +2764,6 @@ 1 - - Name cannot be more than 20 characters long. - طول الاسم لا يجب أن يتجاوز 20 حرفا. - - 1 - - Comment is required. التعليق مطلوب. @@ -3288,13 +3219,6 @@ 1 - - Info - معلومات - - 1 - - Upload cancelled تم إلغاء الإرسال diff --git a/client/src/locale/target/angular_ca_ES.xml b/client/src/locale/target/angular_ca_ES.xml index 7444b71b0..15c1bbca0 100644 --- a/client/src/locale/target/angular_ca_ES.xml +++ b/client/src/locale/target/angular_ca_ES.xml @@ -116,7 +116,7 @@ Password Contrasenya - 12 + 13 @@ -130,7 +130,7 @@ Login Iniciar sessió - 38 + 36 @@ -158,7 +158,7 @@ Send me an email to reset my password Envia'm un correu per reiniciar la meva contrasenya - 75 + 80 @@ -215,7 +215,7 @@ Signup Registra't - 88 + 78 @@ -251,14 +251,14 @@ Change the language Canvia la llengua - 88 + 86 Create an account Registrar un compte - 39 + 37 @@ -272,35 +272,35 @@ Trending Tendència - 57 + 55 Recently added Afegits fa poc - 62 + 60 Local Local - 67 + 65 More Més - 72 + 70 Administration Administració - 76 + 74 @@ -412,7 +412,7 @@ No results. Sense resultats. - 17 + 20 @@ -429,15 +429,11 @@ 7 - - - About instance - - - Quant a la instància - + + Submit + Envia - 1 + 31 @@ -451,47 +447,14 @@ Terms Termes - 44 + 39 User registration is allowed and El registre d'usuaris és permès i - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - aquesta instància proporciona una quota bàsica de d''espai per els vídeos dels seus usuaris. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - aquesta instància proporciona espai il·limitat per els vídeos del seus usuaris. - - - 31 - - - - - User registration is currently not allowed. - - - El registre d'usuaris actualment no és permès. - - - 36 + 29 @@ -777,42 +740,42 @@ Short description Descripció curta - 22 + 21 Default client route Ruta per defecte del client - 55 + 48 Videos Trending Vídeos tendència - 59 + 52 Videos Recently Added Vídeos afegits fa poc - 60 + 53 Local videos Vídeos locals - 61 + 54 Policy on videos containing sensitive content Política sobre vídeos que contenen contingut sensible - 70 + 61 @@ -847,42 +810,42 @@ Signup enabled Registre activat - 93 + 84 Signup limit Limit de registres - 105 - - - - Administrator - Administrador - - 131 - - - - Admin email - Correu del Administrador - - 134 + 96 Users Usuaris - 144 + 105 User default video quota Quota de vídeo per defecte de l'usuari - 147 + 109 + + + + Administrator + Administrador + + 155 + + + + Admin email + Correu del Administrador + + 158 @@ -903,21 +866,21 @@ Your Twitter username El teu nom d'usuari de Twitter - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Indica el compte de Twitter del lloc web o plataforma en què es va publicar el contingut. - 184 + 187 Instance whitelisted by Twitter Instància a la llista blanca de Twitter - 198 + 199 @@ -931,77 +894,77 @@ Transcoding Transcodificació - 210 + 215 Transcoding enabled Transcodificació activada - 215 + 221 If you disable transcoding, many videos from your users will not work! Si desactives la transcodificació, molts vídeos dels teus usuaris no funcionaran. - 216 + 222 Transcoding threads Subprocessos per la transcodificació - 223 + 237 Previews cache size Memòria cau per a visualitzacions prèvies - 254 + 271 Customizations Personalitzacions - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Escriu directament el codi JavaScript.<br />Exemple: <pre>console.log('la meva instància és sorprenent');</pre> - 281 + 297 Advanced configuration Configuració avançada - 207 + 212 Update configuration Actualitza la configuració - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Sembla que la configuració no és vàlida. Cerca possibles errors a les diferents pestanyes. - 326 + 341 @@ -1254,20 +1217,6 @@ 7 - - My settings - La meva configuració - - 3 - - - - My videos - Els meus vídeos - - 14 - - Video quota: Quota de vídeo: @@ -1279,21 +1228,14 @@ Profile Perfil - 8 + 7 Video settings Ajustos de vídeo - 15 - - - - Submit - Envia - - 24 + 16 @@ -1485,14 +1427,14 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir Publish will be available when upload is finished La publicació estarà disponible quan finalitzi la càrrega - 53 + 58 Publish Publica - 60 + 65 @@ -1548,7 +1490,7 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir Wait transcoding before publishing the video Espera la transcodificació abans de publicar el vídeo - 130 + 131 @@ -1562,14 +1504,14 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir Upload thumbnail Puja miniatura - 195 + 196 Upload preview Previsualitza la càrrega - 202 + 203 @@ -1583,14 +1525,14 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir Short text to tell people how they can support you (membership platform...). Text breu per dir a la gent com us poden ajudar (plataforma de pertinença ...). - 209 + 210 Advanced settings Ajustos avançats - 190 + 191 @@ -1841,13 +1783,6 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 14 - - Error getting about from server - S'ha produït un error en obtenir quant a del servidor - - 1 - - No description Sense descripció @@ -1869,20 +1804,6 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 - - Error - Error - - 1 - - - - Success - Èxit - - 1 - - Configuration updated. S'ha actualitzat la configuració. @@ -2044,20 +1965,6 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Estàs segur que vols eliminar ? També s''esborraràn tots els vídeos carregats en aquest canal. - - 1 - - - - Please type the name of the video channel to confirm - Escriu el nom del canal de vídeo per confirmar - - 1 - - Video channel deleted. Canal de vídeo eliminat. @@ -2065,6 +1972,13 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 + + My videos + Els meus vídeos + + 1 + + Do you really want to delete videos? Estàs realment segur de eliminar els vídeos? @@ -2121,6 +2035,13 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 + + My settings + La meva configuració + + 1 + + Unable to find user id or verification string. No es pot trobar l'identificador d'usuari ni la cadena de verificació. @@ -2144,6 +2065,13 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 + + Error + Error + + 1 + + You need to reconnect. Necessites tornar a connectar. @@ -2158,6 +2086,20 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 + + Info + Informació + + 1 + + + + Success + Èxit + + 1 + + Your password has been successfully reset! La contrasenya s'ha restablit correctament. @@ -2263,6 +2205,20 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 + + Email is required. + Es requereix un correu electrònic. + + 1 + + + + Email must be valid. + El correu electrònic ha de ser vàlid. + + 1 + + Username is required. Es requereix nom d'usuari. @@ -2284,41 +2240,6 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 - - Username must be at least 3 characters long. - El nom d'usuari ha de tenir com a mínim 3 caràcters. - - 1 - - - - Username cannot be more than 20 characters long. - El nom d'usuari no pot tenir més de 20 caràcters. - - 1 - - - - Username should be only lowercase alphanumeric characters. - El nom d'usuari ha de ser només caràcters alfanumèrics en minúscules. - - 1 - - - - Email is required. - Es requereix un correu electrònic. - - 1 - - - - Email must be valid. - El correu electrònic ha de ser vàlid. - - 1 - - Password must be at least 6 characters long. La contrasenya ha de tenir com a mínim 6 caràcters. @@ -2368,20 +2289,6 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 - - Display name must be at least 3 characters long. - El nom de visualització ha de tenir un mínim de 3 caràcters. - - 1 - - - - Display name cannot be more than 120 characters long. - El nom de visualització no pot tenir més de 120 caràcters. - - 1 - - Description must be at least 3 characters long. La descripció ha de tenir almenys 3 caràcters de longitud. @@ -2403,13 +2310,6 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 - - Report reason cannot be more than 300 characters long. - El motiu de l'informe no pot tenir més de 300 caràcters. - - 1 - - Support text must be at least 3 characters long. El text de suport ha de tenir un mínim de 3 caràcters. @@ -3054,13 +2954,6 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 - - Info - Informació - - 1 - - Upload cancelled Pujada cancel·lada diff --git a/client/src/locale/target/angular_cs_CZ.xml b/client/src/locale/target/angular_cs_CZ.xml index 59af08639..7b6f99ddb 100644 --- a/client/src/locale/target/angular_cs_CZ.xml +++ b/client/src/locale/target/angular_cs_CZ.xml @@ -309,7 +309,8 @@ Unsubscribe -Přestat odebírat + Přestat odebírat + 18 @@ -337,14 +338,21 @@ Přestat odebírat Subscribe with a Mastodon account: - Odebírat přes Mastodon účet + Odebírat přes účet na Mastodonu: 43 + + Using a syndication feed + Použít syndikační proud + + 48 + + Subscribe via RSS - Odebírat RSS + Odebírat přes RSS 49 @@ -362,6 +370,20 @@ Přestat odebírat 10 + + You can subscribe to the channel via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type the channel URL in the search box and subscribe there. + Tento kanál můžete odebírat z jakékoliv instance na fediverse používající ActivityPub. Například u Mastodonu nebo Pleromy můžete napsat URL adresu kanálu do vyhledávacího pole a tam začít odebírat. + + 17 + + + + You can interact with this via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type the current URL in the search box and interact with it there. + S tímto videem můžete interagovat z jakékoliv instance na fediverse používající ActivityPub. Například u Mastodonu nebo Pleromy můžete napsat aktuální URL adresu do vyhledávacího pole a odtamtud interagovat. + + 22 + + Video quota Limit na videa @@ -438,7 +460,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Username or email address - Uživatelské jméno nebo email + Uživatelské jméno nebo e-mail 15 @@ -476,7 +498,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Password Heslo - 12 + 13 @@ -490,7 +512,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Login Přihlásit - 38 + 36 @@ -502,23 +524,23 @@ Blokovaný uživatel se už nebude moci přihlásit. Email - Email + E-mail 8 Email address - Emailová adresa + E-mailová adresa 10 Send me an email to reset my password - Poslat email pro resetování hesla + Poslat e-mail pro resetování hesla - 75 + 80 @@ -589,7 +611,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Signup Registrovat - 88 + 78 @@ -659,7 +681,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Change the language Změnit jazyk - 88 + 86 @@ -670,7 +692,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Můj veřejný profil - 18 + 16 @@ -681,7 +703,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Můj účet - 22 + 20 @@ -692,7 +714,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Moje videa - 26 + 24 @@ -703,14 +725,14 @@ Blokovaný uživatel se už nebude moci přihlásit. Odhlásit - 30 + 28 Create an account Vytvořit účet - 39 + 37 @@ -724,49 +746,49 @@ Blokovaný uživatel se už nebude moci přihlásit. Subscriptions Odběry - 47 + 45 Overview Přehled - 52 + 50 Trending Trendy - 57 + 55 Recently added Nedávno přidané - 62 + 60 Local Místní - 67 + 65 More Další - 72 + 70 Administration Administrace - 76 + 74 @@ -776,11 +798,18 @@ Blokovaný uživatel se už nebude moci přihlásit. 25 + + Show keyboard shortcuts + Zobrazit klávesové zkratky + + 89 + + Toggle dark interface Přepnout tmavé rozhraní - 94 + 92 @@ -811,6 +840,20 @@ Blokovaný uživatel se už nebude moci přihlásit. 15 + + Duration + Trvání + + 24 + + + + Display sensitive content + Zobrazit citlivý obsah + + 33 + + Yes Ano @@ -867,11 +910,18 @@ Blokovaný uživatel se už nebude moci přihlásit. 94 + + Display unlisted and private videos + Zobrazit neuvedená a soukromá videa + + 14 + + No results. Žádné výsledky. - 17 + 20 @@ -929,15 +979,11 @@ Blokovaný uživatel se už nebude moci přihlásit. 7 - - - About instance - - - O instanci - + + Submit + Odeslat - 1 + 31 @@ -951,47 +997,14 @@ Blokovaný uživatel se už nebude moci přihlásit. Terms Podmínky - 44 + 39 User registration is allowed and Registrace uživatelů je povolena a - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - tato instance poskytuje základní limit místa pro videa svým uživatelům. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - tato instance poskytuje neomezený prostor pro videa svých uživatelů. - - - 31 - - - - - User registration is currently not allowed. - - - Registrace uživatelů není momentálně povolena. - - - 36 + 29 @@ -1126,6 +1139,21 @@ Blokovaný uživatel se už nebude moci přihlásit. 51 + + + Web peers are not publicly accessible: because we use WebRTC inside the web browser (with the WebTorrent library), the protocol is different from classic BitTorrent. + When you are in a web browser, you send a signal containing your IP address to the tracker that will randomly choose other peers to forward the information to. + See this document for more information + + + Webové peery nejsou veřejně dostupné: jelikož používáme WebRTC v prohlížeči (s knihovnou WebTorrent), je protokol odlišný od klasického BitTorrentu. + Když jste ve webovém prohlížeči, pošlete trackeru signál obsahující vaši IP adresu. Tracker pak náhodně vybere další peery, kterým přepošle informace. + Pro více informací si přečtěte tento dokument + + + 55 + + The worst-case scenario of an average person spying on their friends is quite unlikely. @@ -1141,7 +1169,7 @@ Blokovaný uživatel se už nebude moci přihlásit. How does PeerTube compare with YouTube? - Jaký e PeerTube v porovnání s YouTube? + Jaký je PeerTube v porovnání s YouTube? 67 @@ -1153,9 +1181,9 @@ Blokovaný uživatel se už nebude moci přihlásit. Moreover, YouTube is owned by Google/Alphabet, a company that tracks you across many websites (via AdSense or Google Analytics). - Ohrožení soukromí je na YouTube odlišné od toho na PeerTube. + Ohrožení soukromí je na YouTubu odlišné od toho na PeerTubu. V případě YouTube, tato služba o vás sbírá obrovské mnžoství osobních informací (nejen vaší IP adresu), aby je poté analyzovala a sledovala vás. - Kromě toho, YouTube je vlastněn Google/Alphabet, společností, která vás sleduje napříč různými webovými stránkami (přes AdSense nebo Google Analytics). + Kromě toho je YouTube vlastněn Googlem/Alphabetem, společností, která vás sleduje napříč různými webovými stránkami (přes AdSense nebo Google Analytics). 69 @@ -1190,6 +1218,19 @@ Blokovaný uživatel se už nebude moci přihlásit. 83 + + + PeerTube is in its early stages, and want to deliver the best countermeasures possible by the time the stable is released. + In the meantime, we want to test different ideas related to this issue: + + + PeerTube je v rané fázi a chceme vám doručit ta nejlepší možná opatření, dokud nebude vydána stabilní verze. + Mezitím chceme vyzkoušet různé nápady spojené s tímto problémem: + + + 85 + + Set a limit to the number of peers sent by the tracker Nastavit limit počtu peerů odeslaných trackerem @@ -1225,6 +1266,13 @@ Blokovaný uživatel se už nebude moci přihlásit. 95 + + Banned + Zablokován + + 12 + + subscribers odběratelů @@ -1278,42 +1326,49 @@ Blokovaný uživatel se už nebude moci přihlásit. Short description Krátký popis - 22 + 21 Default client route Výchozí hlavní stránka - 55 + 48 + + + + Videos Overview + Přehled videí + + 51 Videos Trending Trendy - 59 + 52 Videos Recently Added Naposledy přidaná videa - 60 + 53 Local videos Místní videa - 61 + 54 Policy on videos containing sensitive content Pravidla pro videa obsahující citlivý obsah - 70 + 61 @@ -1348,42 +1403,63 @@ Blokovaný uživatel se už nebude moci přihlásit. Signup enabled Povolit registrace - 93 + 84 + + + + Signup requires email verification + Registrace vyžaduje ověření e-mailem. + + 91 Signup limit Limit registrací - 105 - - - - Administrator - Administrátor - - 131 - - - - Admin email - Email administrátora - - 134 + 96 Users Uživatelé - 144 + 105 User default video quota Výchozí limit na uživatele - 147 + 109 + + + + Import + Import + + 42 + + + + Video import with HTTP URL (i.e. YouTube) enabled + Import videa pomocí URL HTTP (např. YouTube) povolen + + 141 + + + + Administrator + Administrátor + + 155 + + + + Admin email + E-mail administrátora + + 158 @@ -1404,21 +1480,21 @@ Blokovaný uživatel se už nebude moci přihlásit. Your Twitter username Váš účet na Twitteru - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Uveďte Twitter účet stránky nebo služby, na které byl obsah publikován. - 184 + 187 Instance whitelisted by Twitter Twitter povolil tuto instanci - 198 + 199 @@ -1432,77 +1508,99 @@ Blokovaný uživatel se už nebude moci přihlásit. Transcoding Překódování - 210 + 215 Transcoding enabled Překódování povoleno - 215 + 221 If you disable transcoding, many videos from your users will not work! Pokud zakážete překódování, mnoho videí od vašich uživatelů nebude fungovat! - 216 + 222 Transcoding threads Vlákna na překódování - 223 + 237 + + + + Resolution enabled + Rozlišení povoleno + + 252 + + + + + Cache + + + + + Mezipaměť + + + + + 260 Previews cache size Velikost mezipaměti náhledů - 254 + 271 Customizations Přizpůsobení - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Pište přímo JavaScript kód.<br />Například: <pre>console.log('moje instance je úžasná');</pre> - 281 + 297 Advanced configuration Pokročilá nastavení - 207 + 212 Update configuration Aktualizovat nastavení - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Zdá se, že vaše konfigurace není validní. Prosím, vyhledejte potencialní chyby v jiné záložce. - 326 + 341 @@ -1527,6 +1625,17 @@ Blokovaný uživatel se už nebude moci přihlásit. 7 + + + Moderation + + + Moderace + + + 11 + + Jobs @@ -1574,6 +1683,13 @@ Blokovaný uživatel se už nebude moci přihlásit. 21 + + Filter... + Filtrovat... + + 27 + + ID ID @@ -1713,6 +1829,13 @@ Blokovaný uživatel se už nebude moci přihlásit. 40 + + (banned) + (zablokován) + + 65 + + Go to the account page Přejít na stránku kanálu @@ -1720,6 +1843,31 @@ Blokovaný uživatel se už nebude moci přihlásit. 133 + + Ban reason: + Důvod zablokování: + + 95 + + + + + This comment can only be seen by you or the other moderators. + + + Tento komentář můžete vidět pouze vy nebo ostatní moderátoři. + + + 17 + + + + Update this comment + Aktualizovat tento komentář + + 25 + + Reporter Autor nahlášení @@ -1748,6 +1896,20 @@ Blokovaný uživatel se už nebude moci přihlásit. 33 + + Actions + Akce + + 35 + + + + Reason: + Důvod: + + 53 + + Blacklisted videos Videa na černé listině @@ -1755,20 +1917,6 @@ Blokovaný uživatel se už nebude moci přihlásit. 7 - - My settings - Moje nastavení - - 3 - - - - My videos - Moje videa - - 14 - - Video quota: Limit na videa: @@ -1780,21 +1928,14 @@ Blokovaný uživatel se už nebude moci přihlásit. Profile Profil - 8 + 7 Video settings Nastavení videí - 15 - - - - Submit - Odeslat - - 24 + 16 @@ -1915,6 +2056,13 @@ When you will upload a video in this channel, the video support field will be au 27 + + subscribers + odběratelů + + 10 + + (extensions: , max size: ) (typ souboru: , maximální velikost: ) @@ -1986,14 +2134,14 @@ When you will upload a video in this channel, the video support field will be au Publish will be available when upload is finished Publikovat lze jakmile bude dokončeno nahrávání - 53 + 58 Publish Publikovat - 60 + 65 @@ -2005,11 +2153,18 @@ When you will upload a video in this channel, the video support field will be au Tags - Tagy + Štítky 191 + + Tags could be used to suggest relevant recommendations.</br>Press Enter to add a new tag. + Štítky mohou být použity pro navržení relevantních doporučení.</br>Stisknutím klávesy Enter přidáte nový štítek. + + 18 + + Video descriptions are truncated by default and require manual action to expand them. Popisy videí jsou ve výchozím stavu sbaleny a rozbalují se kliknutím. @@ -2049,7 +2204,7 @@ When you will upload a video in this channel, the video support field will be au Wait transcoding before publishing the video Čekat na překódování před publikováním videa - 130 + 131 @@ -2063,14 +2218,14 @@ When you will upload a video in this channel, the video support field will be au Upload thumbnail Nahrát miniaturu - 195 + 196 Upload preview Nahrát náhled - 202 + 203 @@ -2084,14 +2239,14 @@ When you will upload a video in this channel, the video support field will be au Short text to tell people how they can support you (membership platform...). Krátký text, co řekne lidem, jak vás mohou podpořit. - 209 + 210 Advanced settings Rozšířená nastavení - 190 + 191 @@ -2342,13 +2497,6 @@ When you will upload a video in this channel, the video support field will be au 14 - - Error getting about from server - Chyba při získávání popisu - - 1 - - No description Žádný popis @@ -2370,20 +2518,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Error - Chyba - - 1 - - - - Success - Úspěšně - - 1 - - Configuration updated. Nastavení aktualizováno. @@ -2489,6 +2623,27 @@ When you will upload a video in this channel, the video support field will be au 1 + + Unban + Odblokovat + + 1 + + + + Do you really want to unban users? + Opravdu chcete odblokovat uživatelů? + + 1 + + + + users unbanned. + uživatelů odblokováno. + + 1 + + You cannot delete root. Uživatel root nelze odstranit. @@ -2545,20 +2700,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Opravdu chcete odstranit ? Tato akce odstraní i veškerá videa na tomto kanálu. - - 1 - - - - Please type the name of the video channel to confirm - Prosím, napište název tohoto kanálu pro potvrzení - - 1 - - Video channel deleted. Video kanál odstraněn. @@ -2566,6 +2707,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + My videos + Moje videa + + 1 + + Do you really want to delete videos? Opravdu chcete odstranit videí? @@ -2622,6 +2770,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + My subscriptions + Moje odběry + + 1 + + + + My settings + Moje nastavení + + 1 + + Unable to find user id or verification string. Nelze najít uživatelovo id nebo verifikační řetězec. @@ -2629,6 +2791,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + Subscribe to the account + Odebírat účet + + 1 + + Cannot retrieve OAuth Client credentials: . @@ -2645,6 +2814,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + Error + Chyba + + 1 + + You need to reconnect. Musíte se znovu připojit. @@ -2659,6 +2835,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Info + Info + + 1 + + + + Success + Úspěšně + + 1 + + Your password has been successfully reset! Vaše heslo bylo úspěšně resetováno! @@ -2745,14 +2935,14 @@ When you will upload a video in this channel, the video support field will be au Admin email is required. - Email administrátora je vyžadován. + E-mail administrátora je vyžadován. 1 Admin email must be valid. - Email administrátora musí být platný. + E-mail administrátora musí být platný. 1 @@ -2764,6 +2954,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Email is required. + E-mail je vyžadován. + + 1 + + + + Email must be valid. + E-mail musí být platný. + + 1 + + Username is required. Uživatelské jméno je vyžadováno. @@ -2785,41 +2989,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Username must be at least 3 characters long. - Uživatelské jméno musí mít délku minimálně 3 znaky. - - 1 - - - - Username cannot be more than 20 characters long. - Uživatelské jméno nemůže být delší než 20 znaků. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Uživatelské jméno by mělo obsahovat pouze malá písmena a číslice. - - 1 - - - - Email is required. - Email je vyžadován. - - 1 - - - - Email must be valid. - Email musí být platný. - - 1 - - Password must be at least 6 characters long. Heslo musí mít délku minimálně 6 znaků. @@ -2869,20 +3038,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Display name must be at least 3 characters long. - Zobrazované jméno musí mít delku minimálně 3 znaky. - - 1 - - - - Display name cannot be more than 120 characters long. - Zobrazované jméno nesmí být delší než 120 znaků. - - 1 - - Description must be at least 3 characters long. Popis musí mít délku minimálně 3 znaky. @@ -2904,13 +3059,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Report reason cannot be more than 300 characters long. - Důvod nahlášení nesmí být delší než 300 znaků. - - 1 - - Support text must be at least 3 characters long. Text pro podporu musí mít délku minimálně 3 znaky. @@ -3506,6 +3654,34 @@ When you will upload a video in this channel, the video support field will be au 1 + + users banned. + uživatelů zablokováno. + + 1 + + + + User banned. + Uživatel zablokován. + + 1 + + + + Do you really want to unban ? + Opravdu chcete odblokovat uživatele ? + + 1 + + + + User unbanned. + Uživatel odblokován. + + 1 + + User deleted. Uživatel odstraněn. @@ -3541,16 +3717,51 @@ When you will upload a video in this channel, the video support field will be au 1 + + Subscribed to + Odebíráte kanál + + 1 + + Subscribed - Odebírám + Odebíráte + + 1 + + + + Unsubscribed from + Již neodebíráte kanál + + 1 + + + + Unsubscribed + Odběr zrušen + + 1 + + + + Anyone can see this video + Kdokoliv může vidět toto video + + 1 + + + + You are now logged in as ! + Nyní jste přihlášen/a jako ! 1 But associated data (tags, description...) will be lost, are you sure you want to leave this page? - Přiřazená data (tagy, popis...) budou ztraceny, opravdu chcete opustit tuto stránku? + Ovšem přidružená data (štítky, popis...) budou ztraceny, opravdu chcete opustit tuto stránku? 1 @@ -3562,13 +3773,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Info - Info - - 1 - - Upload cancelled Nahrávání zrušeno @@ -3611,6 +3815,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Like the video + To se mi líbí + + 1 + + + + Dislike the video + To se mi nelíbí + + 1 + + Do you really want to delete this video? Opravdu chcete odstranit toto video? @@ -3620,7 +3838,7 @@ When you will upload a video in this channel, the video support field will be au likes / dislikes - se to líbí / se to nelíbí + se to líbí / lidem se to nelíbí 1 @@ -3639,5 +3857,12 @@ When you will upload a video in this channel, the video support field will be au 1 + + Videos from your subscriptions + Videa od vašich odběrů + + 1 + + \ No newline at end of file diff --git a/client/src/locale/target/angular_de_DE.xml b/client/src/locale/target/angular_de_DE.xml index 46e622908..39610dfdb 100644 --- a/client/src/locale/target/angular_de_DE.xml +++ b/client/src/locale/target/angular_de_DE.xml @@ -499,7 +499,7 @@ Password Passwort - 12 + 13 @@ -513,7 +513,7 @@ Login Anmelden - 38 + 36 @@ -541,7 +541,7 @@ Send me an email to reset my password Mir eine E-Mail schicken, um mein Passwort zurückzusetzen - 75 + 80 @@ -600,11 +600,18 @@ Konto erstellen 17 + + I am at least 16 years old and agree to the <a href='/about/instance#terms-section' target='_blank'rel='noopener noreferrer'>Terms</a> of this instance + Ich bin mindestens 16 Jahre alt und stimme den <a href='/about/instance#terms-section' target='_blank'rel='noopener noreferrer'>Bestimmungen</a> dieser Instanz zu + + 55 + + Signup Registrieren - 88 + 78 @@ -632,6 +639,19 @@ Konto erstellen 6 + + + Filters + + + + Filter + + + + 16 + + No results found @@ -661,7 +681,7 @@ Konto erstellen Change the language Sprache wechseln - 88 + 86 @@ -672,7 +692,7 @@ Konto erstellen Mein öffentliches Profil - 18 + 16 @@ -683,7 +703,7 @@ Konto erstellen Mein Konto - 22 + 20 @@ -694,7 +714,7 @@ Konto erstellen Meine Videos - 26 + 24 @@ -705,14 +725,14 @@ Konto erstellen Abmelden - 30 + 28 Create an account Konto erstellen - 39 + 37 @@ -726,49 +746,49 @@ Konto erstellen Subscriptions Abos - 47 + 45 Overview Übersicht - 52 + 50 Trending Beliebt - 57 + 55 Recently added Kürzlich hinzugefügt - 62 + 60 Local Lokal - 67 + 65 More Mehr - 72 + 70 Administration Administration - 76 + 74 @@ -782,14 +802,14 @@ Konto erstellen Show keyboard shortcuts Zeige Tastatur-Kürzel - 91 + 89 Toggle dark interface Dunkle Oberfläche umschalten - 94 + 92 @@ -894,14 +914,14 @@ Konto erstellen Display unlisted and private videos Private und nicht gelisteten Videos aufzeigen - 11 + 14 No results. Keine Ergebnisse. - 17 + 20 @@ -959,15 +979,22 @@ Konto erstellen 7 - + - About instance - + Cancel + - Über die Instanz - + Abbrechen + - 1 + 26 + + + + Submit + Abschicken + + 31 @@ -981,47 +1008,14 @@ Konto erstellen Terms Bestimmungen - 44 + 39 User registration is allowed and Benutzerregistrierung ist möglich und - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - für die Videos ihrer Nutzer stellt diese Instanz einen Speicherplatz von zur Verfügung. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - für die Videos ihrer Nutzer stellt diese Instanz unbegrenzten Speicherplatz zur Verfügung. - - - 31 - - - - - User registration is currently not allowed. - - - Die Benutzerregistrierung ist zur Zeit nicht erlaubt. - - - 36 + 29 @@ -1037,7 +1031,7 @@ Konto erstellen PeerTube is a federated (ActivityPub) video streaming platform using P2P (WebTorrent) directly in the web browser. - PeerTube ist eine föderierte Videostreamingplattform basierend auf dem ActivityPub-Protokoll, die mit WebTorrent P2P-Technologie direkt im Browser verwendet. + PeerTube ist eine föderierte Videostreamingplattform basierend auf dem ActivityPub-Protokoll, die WebTorrent P2P-Technologie direkt im Browser verwendet. 6 @@ -1242,6 +1236,19 @@ Konto erstellen 83 + + + PeerTube is in its early stages, and want to deliver the best countermeasures possible by the time the stable is released. + In the meantime, we want to test different ideas related to this issue: + + + PeerTube ist in der frühen Entwicklungsphase und es ist geplant, die besten Gegenmaßnahmen in der nächsten stabilen Version zu implementieren. + Bis dahin wollen wir verschiedene Ideen für dieses Problem testen: + + + 85 + + Set a limit to the number of peers sent by the tracker Die Zahl der Peers, die durch einen Tracker gesendet wird, begrenzen. @@ -1278,27 +1285,37 @@ Konto erstellen - BannedBanned + Banned + Gebannt + 12 - MutedMuted + Muted + Stummgeschaltet + 13 - Muted by your instanceMuted by your instance + Muted by your instance + Von deiner Instanz stummgeschaltet + 14 - Instance mutedInstance muted + Instance muted + Instanz stummgeschaltet + 15 - Instance muted by your instanceInstance muted by your instance + Instance muted by your instance + Diese Instanz wurde deiner Instanz stummgeschaltet + 16 @@ -1355,49 +1372,49 @@ Konto erstellen Short description Kurze Beschreibung - 22 + 21 Default client route Standardpfad (Client) - 55 + 48 Videos Overview Video-Übersicht - 58 + 51 Videos Trending Beliebte Videos - 59 + 52 Videos Recently Added Kürzlich hinzugefügte Videos - 60 + 53 Local videos Lokale Videos - 61 + 54 Policy on videos containing sensitive content Verhalten bei Videos mit anstößigen Inhalten - 70 + 61 @@ -1432,23 +1449,44 @@ Konto erstellen Signup enabled Registrierung aktiviert - 93 + 84 Signup requires email verification Registrierung erfordert eine Bestätigung der E-Mail-Adresse - 100 + 91 Signup limit Obergrenze für Registrierungen + + 96 + + + + Users + Benutzer 105 + + User default video quota + Standardkontingent für die Videos eines Nutzers + + 109 + + + + User default daily upload limit + Tägliches Obergrenze eines Nutzers beim Hochladen + + 121 + + Import Importieren @@ -1460,49 +1498,28 @@ Konto erstellen Video import with HTTP URL (i.e. YouTube) enabled Video durch HTTP URL (z.b. YouTube©) import erlaubt. - 120 + 141 Video import with a torrent file or a magnet URI enabled Video-Import über eine Torrent-Datei oder einen Magnet-Link aktiviert - 127 + 148 Administrator Administrator - 131 + 155 Admin email Admin E-Mail - 134 - - - - Users - Benutzer - - 144 - - - - User default video quota - Standardkontingent für die Videos eines Nutzers - - 147 - - - - User default daily upload limit - Tägliches Obergrenze eines Nutzers beim Hochladen - - 161 + 158 @@ -1523,21 +1540,21 @@ Konto erstellen Your Twitter username Dein Twitter-Benutzername - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Zeigt den Twitter-Account für die Webseite, auf der der Inhalt veröffentlicht wurde. - 184 + 187 Instance whitelisted by Twitter Instanz von Twitter vertraut - 198 + 199 @@ -1551,35 +1568,35 @@ Konto erstellen Transcoding Transkodierung - 210 + 215 Transcoding enabled Transkodierung an - 215 + 221 If you disable transcoding, many videos from your users will not work! Wenn du die Transkodierung abschaltest, werden viele Videos nicht laufen! - 216 + 222 Transcoding threads Transcodierungsthreads - 223 + 237 Resolution enabled Eingestellte Auflösung: - 239 + 252 @@ -1594,82 +1611,47 @@ Konto erstellen - 244 + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Einige Dateien (Vorschau, Untertitel) werden nicht verteilt gespeichert. Wir laden sie direkt von der Ursprungsinstanz und speichern sie zwischen. - 249 + 265 Previews cache size Cachegröße der Vorschau - 254 + 271 Video captions cache size Cachegröße der Untertitel - 265 + 280 Customizations Personalisierung - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Füge dein JavaScript ein.<br />Beispiel: <pre>console.log('Meine Instanz ist großartig');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - Schreibe direkt CSS-Code. Beispiel:<br /> - <pre> - body - background-color: red; - - </pre> - - Stelle <em>#custom-css</em> voran, um den Stil zu überschreiben. Beispiel: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1678,21 +1660,21 @@ Konto erstellen Advanced configuration Erweiterte Einstellungen - 207 + 212 Update configuration Einstellungen aktualisieren - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Die Einstellungen sind anscheinend ungültig. Bitte suche nach potentiellen Fehlern in den verschiedenen Reitern. - 326 + 341 @@ -1963,7 +1945,9 @@ Konto erstellen - (banned)(banned) + (banned) + (gebannt) + 65 @@ -1974,11 +1958,25 @@ Konto erstellen 133 + + User's email must be verified to login + Die E-Mail-Adresse des Nutzers muss vor dem Einloggen bestätigt werden + + 72 + + + + User's email is verified / User can login without email verification + Die E-Mail-Addresse des Nutzers wurde bestätigt / Nutzer kann ohne E-Mail-Bestätigung einloggen + + 76 + + Ban reason: Grund für die Sperrung: - 92 + 95 @@ -2045,7 +2043,7 @@ Konto erstellen Actions Aktionen - 33 + 35 @@ -2080,14 +2078,14 @@ Konto erstellen Date Datum - 10 + 11 Blacklist reason: Grund für die Sperre: - 41 + 43 @@ -2112,12 +2110,16 @@ Konto erstellen - Muted accountsMuted accounts + Muted accounts + Stummgeschaltete Accounts + 2 - Muted serversMuted servers + Muted servers + Stummgeschaltete Server + 11 @@ -2129,69 +2131,19 @@ Konto erstellen - Muted at Muted at + Muted at + Stummgeschaltet am + 13 - UnmuteUnmute + Unmute + Stummschalten aufheben + 23 - - My settings - Meine Einstellungen - - 3 - - - - My library - Meine Bibliothek - - 7 - - - - My channels - Meine Kanäle - - 12 - - - - My videos - Meine Videos - - 14 - - - - My subscriptions - Meine Abos - - 16 - - - - My imports - Meine Importe - - 18 - - - - Muted instancesMuted instances - 2 - - - - Ownership changes - Besitzer ändern - - 33 - - Video quota: Videokontingent: @@ -2203,21 +2155,21 @@ Konto erstellen Profile Profil - 8 + 7 Video settings Videoeinstellungen - 15 + 16 Danger zone Gefahrenzone - 18 + 19 @@ -2245,13 +2197,6 @@ Konto erstellen 35 - - Submit - Abschicken - - 24 - - - views - Aufrufe @@ -2411,6 +2356,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 47 + + Muted instances + Stummgeschaltete Instanzen + + 2 + + Change password Passwort ändern @@ -2616,6 +2568,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 159 + + Sorry, but something went wrong + Entschuldigung, etwas ist schiefgegangen + + 49 + + Congratulations, the video behind will be imported! You can already add information about this video. @@ -2652,14 +2611,14 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa Publish will be available when upload is finished Veröffentlichung ist möglich, sobald das Hochladen abgeschlossen ist - 53 + 58 Publish Veröffentlichen - 60 + 65 @@ -2842,14 +2801,14 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa Wait transcoding before publishing the video Transkodieren abwarten, bevor das Video veröffentlicht wird - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Wenn du dich entschließt, das Transkodieren nicht abzuwarten, kann das Video unabspielbar sein, bis das Transkodieren beendet ist. - 131 + 132 @@ -2863,49 +2822,49 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa Add another caption Weitere Untertitel hinzufügen - 146 + 147 See the subtitle file Siehe in der Untertiteldatei - 155 + 156 Already uploaded ✔ Fast hochgeladen ✔ - 159 + 160 Will be created on update Wird bei einer Aktualisierung erstellt - 167 + 168 Cancel create Erstellen abbrechen - 169 + 170 Will be deleted on update Wird bei einer Aktualisierung gelöscht - 175 + 176 Cancel deletion Löschen abbrechen - 177 + 178 @@ -2916,28 +2875,28 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa Bis auf Weiteres keine Untertitel. - 182 + 183 Captions Untertitel - 139 + 140 Upload thumbnail Miniaturansicht hochladen - 195 + 196 Upload preview Vorschau hochladen - 202 + 203 @@ -2951,14 +2910,14 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa Short text to tell people how they can support you (membership platform...). Ein kurzer Text, der anderen erklärt, wie sie dich unterstützen können. - 209 + 210 Advanced settings Erweiterte Einstellungen - 190 + 191 @@ -3025,17 +2984,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 3 - - - Cancel - - - Abbrechen - - - 19 - - Share Teilen @@ -3422,13 +3370,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 14 - - Error getting about from server - Server-Fehler. - - 1 - - No description Keine Beschreibung @@ -3450,13 +3391,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Error - Fehler - - 1 - - 240p 240p @@ -3499,13 +3433,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Success - Erfolg - - 1 - - Configuration updated. Einstellungen aktualisiert. @@ -3668,7 +3595,16 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa - Account unmuted by your instance.Account unmuted by your instance. + Account unmuted by your instance. + Account ist von deiner Instanz nicht mehr stummgeschatet. + + 1 + + + + Instance unmuted by your instance. + Instance ist von deiner Instanz nicht mehr stummgeschaltet. + 1 @@ -3679,6 +3615,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Delete this report + Missbrauchsmeldung löschen + + 1 + + Update moderation comment Moderationskommentar aktualisieren @@ -3700,6 +3643,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Do you really want to delete this abuse report? + Wollen Sie wirklich diese Missbrauchsmeldung löschen? + + 1 + + Abuse deleted. Missbrauchsmeldung gelöscht. @@ -3749,6 +3699,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Set Email as Verified + E-Mail als bestätigt setzen + + 1 + + You cannot ban root. Du kannst root nicht sperren. @@ -3756,6 +3713,20 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Do you really want to unban users? + Willst du wirklich den Bann von Benutzern aufheben? + + 1 + + + + users unbanned. + Bann von Benutzern aufgehoben. + + 1 + + You cannot delete root. Du kannst die Wurzel nicht löschen. @@ -3764,7 +3735,37 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa - If you remove these users, you will not be able to create others with the same username!If you remove these users, you will not be able to create others with the same username! + If you remove these users, you will not be able to create others with the same username! + Wenn du diesen Benutzer löschst, kannst du keine neuen Benutzer mit gleichem Benutzernamen einrichten ! + + 1 + + + + users deleted. + Benutzer gelöscht. + + 1 + + + + users email set as verified. + E-Mail von Benutzern als bestätigt markiert. + + 1 + + + + Account unmuted. + Stummschaltung von Account aufgehoben. + + 1 + + + + Instance unmuted. + Stummschaltung von Instanz aufgehoben. + 1 @@ -3845,6 +3846,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + This name already exists on this instance. + Dieser Name existiert bereits auf dieser Instanz. + + 1 + + Create Erstellen @@ -3859,20 +3867,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Willst du wirklich löschen? Alle hochgeladenen Videos des Kanals werden dann ebenfalls unwiderruflich gelöscht. - - 1 - - - - Please type the name of the video channel to confirm - Bitte gib zur Bestätigung den Namen des Videokanals ein - - 1 - - Video channel deleted. Videokanal entfernt. @@ -3880,6 +3874,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + My videos + Meine Videos + + 1 + + Do you really want to delete videos? Willst du wirklich Videos löschen? @@ -3950,16 +3951,44 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Channels - Kanäle + + My library + Meine Bibliothek 1 - - Video imports - Video-Importe + + My channels + Meine Kanäle + + 1 + + + + My subscriptions + Meine Abos + + 1 + + + + Misc + Verschiedenes + + 1 + + + + Ownership changes + Besitzer ändern + + 1 + + + + My settings + Meine Einstellungen 1 @@ -3979,7 +4008,23 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa - Subscribe to the accountSubscribe to the account + Subscribe to the account + Diesen Account abonnieren + + 1 + + + + Focus the search bar + Die Suchleiste fokussieren + + 1 + + + + Toggle the left menu + Linkes Menü umschalten + 1 @@ -4018,6 +4063,20 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Toggle Dark theme + Dunkles Theme umschalten + + 1 + + + + Go to my subscriptions + Gehe zu meinen Abos + + 1 + + Go to my videos zur meine Videos gehen @@ -4025,6 +4084,20 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Go to my imports + Gehe zu meinen Importen + + 1 + + + + Go to my channels + Gehe zu meinen Kanälen + + 1 + + Cannot retrieve OAuth Client credentials: . @@ -4041,6 +4114,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Error + Fehler + + 1 + + You need to reconnect. Bitte verbinde dich erneut. @@ -4062,6 +4142,20 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Info + Infos + + 1 + + + + Success + Erfolg + + 1 + + Incorrect username or password. Falscher Benutzername oder falsches Passwort. @@ -4279,6 +4373,20 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Email is required. + Bitte gib eine E-Mail-Adresse ein. + + 1 + + + + Email must be valid. + Bitte gebe eine gültige E-Mail-Adresse ein. + + 1 + + Username is required. Bitte gib einen Benutzernamen ein. @@ -4300,41 +4408,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Username must be at least 3 characters long. - Der Benutzername muss mindestens 3 Zeichen lang sein. - - 1 - - - - Username cannot be more than 20 characters long. - Der Benutzername darf nicht länger als 20 Zeichen lang sein. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Der Benutzername sollte nur kleine alphanumerische Zeichen enthalten. - - 1 - - - - Email is required. - Bitte gib eine E-Mail-Adresse ein. - - 1 - - - - Email must be valid. - Bitte gebe eine gültige E-Mail-Adresse ein. - - 1 - - Password must be at least 6 characters long. Das Passwort muss mindestens 6 Zeichen lang sein. @@ -4398,20 +4471,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Display name must be at least 3 characters long. - Der Anzeigename muss mindestens 3 Zeichen lang sein. - - 1 - - - - Display name cannot be more than 120 characters long. - Der Anzeigename darf nicht länger als 120 Zeichen lang sein. - - 1 - - Description must be at least 3 characters long. Die Beschreibung muss mindestens 3 Zeichen umfassen. @@ -4419,6 +4478,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Description cannot be more than 1000 characters long. + Beschreibung kann nicht länger als 1000 Zeichen sein. + + 1 + + You must to agree with the instance terms in order to registering on it. Um dich auf dieser Instanz zu registrieren, musst du den Bestimmungen zustimmen. @@ -4454,13 +4520,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Report reason cannot be more than 300 characters long. - Der Grund für die Meldung darf nicht mehr als 300 Zeichen umfassen. - - 1 - - Moderation comment is required. Der Moderationskommentar muss angegeben werden. @@ -4475,13 +4534,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Moderation comment cannot be more than 300 characters long. - Der Moderationskommentar darf nicht mehr als 300 Zeichen umfassen. - - 1 - - The channel is required. Der Kanal muss angegeben werden. @@ -4524,6 +4576,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + You can only transfer ownership to a local account + Du kannst den Besitz nur auf einen lokalen Account übertragen + + 1 + + Name is required. Der Name muss angegeben werden. @@ -4531,27 +4590,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Name must be at least 3 characters long. - Der Name muss mindestens 3 Zeichen umfassen. - - 1 - - - - Name cannot be more than 20 characters long. - Der Name darf nicht mehr als 20 Zeichen umfassen. - - 1 - - - - Name should be only lowercase alphanumeric characters. - Der Name sollte nur kleine alphanumerische Zeichen enthalten. - - 1 - - Support text must be at least 3 characters long. Die Beschreibung zur Unterstützung muss mindestens 3 Zeichen umfassen. @@ -4559,6 +4597,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Support text cannot be more than 1000 characters long. + Die Beschreibung zur Unterstützung kann nicht mehr als 1000 Zeichen lang sein. + + 1 + + Comment is required. Bitte gib einen Kommentar ein. @@ -4650,6 +4695,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Video support cannot be more than 1000 characters long. + Die Beschreibung zur Unterstützung darf nicht mehr als 1000 Zeichen umfassen. + + 1 + + A date is required to schedule video update. Bitte gib ein ein Datum für die geplante Veröffentlichung ein. @@ -5175,6 +5227,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + users banned. + Benutzer gebannt. + + 1 + + User banned. Benutzer gesperrt. @@ -5210,6 +5269,111 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + User email set as verified + E-Mail des Benutzers als bestätigt markiert + + 1 + + + + Account muted. + Account stummgeschaltet. + + 1 + + + + Instance muted. + Instanz stummgeschaltet. + + 1 + + + + Account muted by the instance. + Account von der Instanz stummgeschaltet. + + 1 + + + + Account unmuted by the instance. + Account nicht mehr von der Instanz stummgeschaltet. + + 1 + + + + Instance muted by the instance. + Instanz von der Instanz stummgeschaltet. + + 1 + + + + Instance unmuted by the instance. + Instance nicht mehr von der Instanz stummgeschaltet. + + 1 + + + + Mute this account + Dieses Konto stummschalten + + 1 + + + + Unmute this account + Stummschaltung für dieses Konto aufheben + + 1 + + + + Mute the instance + Diese Instanz stummschalten + + 1 + + + + Unmute the instance + Stummschaltung für diese Instanz aufheben + + 1 + + + + Mute this account by your instance + Dieses Konto durch deine Instanz stummschalten lassen + + 1 + + + + Unmute this account by your instance + Stummschaltung dieses Kontos durch deine Instanz aufheben + + 1 + + + + Mute the instance by your instance + Diese Instanz durch deine Instanz stummschalten lassen + + 1 + + + + Unmute the instance by your instance + Stummschaltung dieser Instanz durch deine Instanz aufheben + + 1 + + Request is too large for the server. Please contact you administrator if you want to increase the limit size. Die Anfrage ist zu groß. Bitte kontaktiere den Administrator, um die Obergrenze für die Größe zu erhöhen. @@ -5238,13 +5402,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Subscribed - Abonniert - - 1 - - Subscribed to abonniert @@ -5252,9 +5409,9 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Unsubscribed - Abo beendet + + Subscribed + Abonniert 1 @@ -5266,6 +5423,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Unsubscribed + Abo beendet + + 1 + + Moderator Moderator @@ -5294,6 +5458,20 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Welcome! Now please check your emails to verify your account and complete signup. + Wilkommen! Bitte überprüfe deine Mails um dein Benutzerkonto zu bestätigen und die Registrierung abzuschließen. + + 1 + + + + You are now logged in as ! + Du bist jetzt eingeloggt als ! + + 1 + + Video to import updated. Zu importierendes Video wurde aktualisiert. @@ -5322,13 +5500,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Info - Infos - - 1 - - Upload cancelled Hochladen abgebrochen @@ -5336,13 +5507,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Leider kann PeerTube keine Videos verarbeiten, die größer als 8 GB sind. - - 1 - - Your video quota is exceeded with this video (video size: , used: , quota: ) Dein Videokontingent wird mit diesem Video überschritten (Videogröße: , benutzt: , Kontingent: ) diff --git a/client/src/locale/target/angular_eo.xml b/client/src/locale/target/angular_eo.xml index faa52fbdb..0d54b5a5d 100644 --- a/client/src/locale/target/angular_eo.xml +++ b/client/src/locale/target/angular_eo.xml @@ -236,7 +236,7 @@ Password Pasvorto - 12 + 13 @@ -250,7 +250,7 @@ Login Saluti - 38 + 36 @@ -278,7 +278,7 @@ Send me an email to reset my password Sendu al mi retleteron por restarigi mian pasvorton - 75 + 80 @@ -335,7 +335,7 @@ Signup Registriĝo - 88 + 78 @@ -371,7 +371,7 @@ Change the language Ŝanĝi la lingvon - 88 + 86 @@ -382,7 +382,7 @@ Miaj filmoj - 26 + 24 @@ -393,14 +393,14 @@ Adiaŭi - 30 + 28 Create an account Krei konton - 39 + 37 @@ -414,49 +414,49 @@ Subscriptions Abonoj - 47 + 45 Overview Superrigardo - 52 + 50 Trending Furoraj - 57 + 55 Recently added Freŝe aldonitaj - 62 + 60 Local Lokaj - 67 + 65 More Pli - 72 + 70 Administration Administrado - 76 + 74 @@ -568,7 +568,7 @@ No results. Nenio troviĝis. - 17 + 20 @@ -585,15 +585,11 @@ 7 - - - About instance - - - Pri la nodo «  » - + + Submit + Sendi - 1 + 31 @@ -607,47 +603,14 @@ Terms Kondiĉoj - 44 + 39 User registration is allowed and Registrado de uzantoj estas permesata kaj - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - ĉi tiu nodo donas bazan datumlimon de da spaco por filmoj de siaj uzantoj. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - ĉi tiu nodo donas senliman spacon por filmoj de siaj uzantoj. - - - 31 - - - - - User registration is currently not allowed. - - - Registrado de novaj uzantoj nun ne estas permesata. - - - 36 + 29 @@ -956,49 +919,49 @@ Short description Mallonga priskribo - 22 + 21 Default client route Norma klienta vojo - 55 + 48 Videos Overview Filma superrigardo - 58 + 51 Videos Trending Filmoj furoraj - 59 + 52 Videos Recently Added Filmoj freŝe aldonitaj - 60 + 53 Local videos Filmoj lokaj - 61 + 54 Policy on videos containing sensitive content Politiko pri filmoj kun konsterna enhavo - 70 + 61 @@ -1033,23 +996,37 @@ Signup enabled Registriĝoj ŝaltitaj - 93 + 84 Signup requires email verification Registriĝo bezonas kontrolon de retpoŝtadreso - 100 + 91 Signup limit Limo de registriĝoj + + 96 + + + + Users + Uzantoj 105 + + User default video quota + Norma datumlimo por filmoj de uzantoj + + 109 + + Import Enporti @@ -1061,35 +1038,21 @@ Video import with a torrent file or a magnet URI enabled Enporto de filmoj per torenta dosiero aŭ magneta ligilo ŝaltita - 127 + 148 Administrator Administranto - 131 + 155 Admin email Retpoŝtadreso de administranto - 134 - - - - Users - Uzantoj - - 144 - - - - User default video quota - Norma datumlimo por filmoj de uzantoj - - 147 + 158 @@ -1110,21 +1073,21 @@ Your Twitter username Via Tvitera salutnomo - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Indikas konton de Twitter por la retejo aŭ platformo, sur kiu la afero publikiĝis. - 184 + 187 Instance whitelisted by Twitter Nodo permesata de Twitter - 198 + 199 @@ -1138,98 +1101,98 @@ Transcoding Transkodado - 210 + 215 Transcoding enabled Transkodado ŝaltita - 215 + 221 If you disable transcoding, many videos from your users will not work! Se vi malŝaltos transkodadon, multaj filmoj de viaj uzantoj eble ne funkcios! - 216 + 222 Transcoding threads Fadenoj por transkodado - 223 + 237 Resolution enabled Distingo ŝaltita - 239 + 252 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Iuj dosieroj ne estas federataj (antaŭrigardoj, transskriboj). Ni prenas kaj kaŝmemoras ilin rekte el la fonta nodo. - 249 + 265 Previews cache size Grando de antaŭrigarda kaŝmemoro - 254 + 271 Video captions cache size Grandeco de kaŝmemoro por filmaj transskriboj. - 265 + 280 Customizations Adaptoj - 275 + 289 JavaScript Ĝavoskripto - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Skribu rekte Ĝavoskriptan kodon.<br />Ekzemple: <pre>console.log('mia nodo bonegas');</pre> - 281 + 297 Advanced configuration Specialaj agordoj - 207 + 212 Update configuration Efektivigi agordojn - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Ŝajnas, ke la agordo estas nevalida. Bonvolu serĉi eblajn erarojn en la langetoj. - 326 + 341 @@ -1496,41 +1459,6 @@ 7 - - My settings - Miaj agordoj - - 3 - - - - My channels - Miaj kanaloj - - 12 - - - - My videos - Miaj filmoj - - 14 - - - - My subscriptions - Miaj abonoj - - 16 - - - - My imports - Miaj enportoj - - 18 - - Video quota: Datumlimo por filmoj: @@ -1542,28 +1470,21 @@ Profile Profilo - 8 + 7 Video settings Filmaj agordoj: - 15 + 16 Danger zone Danĝera areo - 18 - - - - Submit - Sendi - - 24 + 19 @@ -1801,14 +1722,14 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos Publish will be available when upload is finished Eldono eblos post fino de alŝuto - 53 + 58 Publish Eldoni - 60 + 65 @@ -1952,14 +1873,14 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos Wait transcoding before publishing the video Atendi transkodadon antaŭ publikigi la filmon - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Se vi decidos ne atendi finon de transkodado antaŭ publikigo, ĝi povus esti neludebla ĝis la transkodo finiĝos. - 131 + 132 @@ -1973,49 +1894,49 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos Add another caption Aldoni alian transskribon - 146 + 147 See the subtitle file Rigardi la dosieron kun subtekstoj - 155 + 156 Cancel create Nuligi kreon - 169 + 170 Cancel deletion Nuligi forigon - 177 + 178 Captions Transskriboj - 139 + 140 Upload thumbnail Alŝuti miniaturon - 195 + 196 Upload preview Alŝuti antaŭrigardon - 202 + 203 @@ -2029,14 +1950,14 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos Short text to tell people how they can support you (membership platform...). Mallonga teksto por sciigi homojn, kiel ili povas subteni vin. - 209 + 210 Advanced settings Specialaj agordoj - 190 + 191 @@ -2319,13 +2240,6 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 14 - - Error getting about from server - Eraro ricevante prion de la servilo - - 1 - - No description Neniu priskribo @@ -2347,20 +2261,6 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 - - Error - Eraro - - 1 - - - - Success - Sukceso - - 1 - - Configuration updated. Agordo ĝisdatigita @@ -2550,20 +2450,6 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Ĉu vi certe volas forigi kanalon ? Tiel vi ankaŭ forigos ĉiujn filmojn alŝutitajn al tiu ĉi kanalo. - - 1 - - - - Please type the name of the video channel to confirm - Bonvolu tajpi nomon de la filma kanalo por konfirmi - - 1 - - Video channel deleted. Filma kanalo forigita. @@ -2571,6 +2457,13 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 + + My videos + Miaj filmoj + + 1 + + Do you really want to delete videos? Ĉu vi certe volas forigi filmojn? @@ -2627,6 +2520,27 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 + + My channels + Miaj kanaloj + + 1 + + + + My subscriptions + Miaj abonoj + + 1 + + + + My settings + Miaj agordoj + + 1 + + Unable to find user id or verification string. Ne povas trovi identigilon aŭ kontrolan ĉenon de uzanto @@ -2650,6 +2564,13 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 + + Error + Eraro + + 1 + + You need to reconnect. Vi devas rekonektiĝi @@ -2664,6 +2585,20 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 + + Info + Informoj + + 1 + + + + Success + Sukceso + + 1 + + An email with the reset password instructions will be sent to . Retletero kun instrukcioj por restarigi la pasvorton sendiĝos al . @@ -2860,6 +2795,20 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 + + Email is required. + Necesas retpoŝtadreso. + + 1 + + + + Email must be valid. + Retpoŝtadreso devas esti valida. + + 1 + + Username is required. Necesas salutnomo. @@ -2881,41 +2830,6 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 - - Username must be at least 3 characters long. - Salutnomo devas havi almenaŭ 3 signojn. - - 1 - - - - Username cannot be more than 20 characters long. - Salutnomo ne povas havi pli ol 20 signojn. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Salutnomo havu nur ciferojn kaj minusklajn literojn. - - 1 - - - - Email is required. - Necesas retpoŝtadreso. - - 1 - - - - Email must be valid. - Retpoŝtadreso devas esti valida. - - 1 - - Password must be at least 6 characters long. Pasvorto devas havi almenaŭ 6 signojn. @@ -2965,20 +2879,6 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 - - Display name must be at least 3 characters long. - Prezenta nomo devas havi almenaŭ 3 signojn. - - 1 - - - - Display name cannot be more than 120 characters long. - Prezenta nomo ne povas havi pli ol 120 signojn. - - 1 - - Description must be at least 3 characters long. Priskribo havu almenaŭ 3 signojn. @@ -3007,13 +2907,6 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 - - Report reason cannot be more than 300 characters long. - Kialo de raporto maldevas havi pli ol 300 signojn. - - 1 - - Video caption language is required. Necesas lingvo de filma transskribo. @@ -3686,13 +3579,6 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 - - Info - Informoj - - 1 - - Upload cancelled Alŝuto nuligita. @@ -3700,13 +3586,6 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Pardonu nin, sed PeerTube ne kapablas trakti filmojn super 8GB - - 1 - - Video published. Filmo publikigita. diff --git a/client/src/locale/target/angular_es_ES.xml b/client/src/locale/target/angular_es_ES.xml index 947c9a91d..828de2a57 100644 --- a/client/src/locale/target/angular_es_ES.xml +++ b/client/src/locale/target/angular_es_ES.xml @@ -5,7 +5,7 @@ Close - Cerrar + tppCerrar 2 @@ -227,6 +227,155 @@ 11 + + You don't have notifications. + No tiene notificaciones + + 1 + + + + + published a new video + + + ha publicado un nuevo vídeo + + + 7 + + + + + Your video has been unblacklisted + + + Su vídeo ha sido desbloqueado + + + 11 + + + + + Your video has been blacklisted + + + Su vídeo ha sido bloqueado + + + 15 + + + + + A new video abuse has been created on video + + + Una nueva denuncia de abuso ha sido creada sobre el vídeo + + + 19 + + + + + commented your video + + + ha comentado su vídeo + + + 23 + + + + + Your video has been published + + + Su vídeo ha sido publicado + + + 27 + + + + + Your video import succeeded + + + Importación de vídeo exitosa + + + 31 + + + + + Your video import failed + + + Error durante la importación de vídeo + + + 35 + + + + + User registered on your instance + + + Nuevo usuario registrado en su instancia + + + 39 + + + + + is following + + + your channel + + your account + + + ahora sigue + + + su canal + + su cuenta + + + 43 + + + + + mentioned you on video + + + le ha mencionado en el vídeo + + + 52 + + + + + + + + + + + 57 + + Unlisted No listado @@ -433,6 +582,13 @@ Cancelar la subscripción 25 + + + + + 11 + + Login @@ -497,7 +653,7 @@ Iniciar sesión Password Contraseña - 12 + 13 @@ -511,7 +667,7 @@ Iniciar sesión Login Identificarse - 38 + 36 @@ -521,6 +677,17 @@ Iniciar sesión 57 + + + We are sorry, you cannot recover you password because your instance administrator did not configure the PeerTube email system. + + + Lo sentimos, no puede recuperar su contraseña porque el administrador de su instancia no configuró el sistema de correos electrónicos de PeerTube. + + + 63 + + Email Correo electrónico @@ -539,7 +706,7 @@ Iniciar sesión Send me an email to reset my password Enviar un correo electrónico para restablecer mi contraseña - 75 + 80 @@ -608,7 +775,7 @@ Iniciar sesión Signup Registro - 88 + 78 @@ -678,7 +845,18 @@ Iniciar sesión Change the language Cambiar el idioma - 88 + 86 + + + + + Help to translate PeerTube! + + + ¡Ayude a traducir PeerTube! + + + 8 @@ -689,7 +867,7 @@ Iniciar sesión Mi perfil público - 18 + 16 @@ -700,7 +878,7 @@ Iniciar sesión Mi cuenta - 22 + 20 @@ -711,7 +889,7 @@ Iniciar sesión Mis vídeos - 26 + 24 @@ -722,14 +900,14 @@ Iniciar sesión Desconectarse - 30 + 28 Create an account Crear una cuenta - 39 + 37 @@ -743,49 +921,49 @@ Iniciar sesión Subscriptions Suscripciones - 47 + 45 Overview Vista general - 52 + 50 Trending Tendencias - 57 + 55 Recently added Añadidos recientemente - 62 + 60 Local Local - 67 + 65 More Más - 72 + 70 Administration Administración - 76 + 74 @@ -799,14 +977,42 @@ Iniciar sesión Show keyboard shortcuts Mostrar los atajos de teclado - 91 + 89 Toggle dark interface Alternar con la interfaz oscura - 94 + 92 + + + + View your notifications + Ver sus notificaciones + + 3 + + + + Notifications + Notificaciones + + 10 + + + + Update your notification preferences + Actualizar sus preferencias de notificación + + 15 + + + + See all your notifications + Ver todas sus notificaciones + + 22 @@ -911,14 +1117,14 @@ Iniciar sesión Display unlisted and private videos Mostrar los vídeos no listados y privados - 11 + 14 No results. Ningún resultados - 17 + 20 @@ -976,15 +1182,64 @@ Iniciar sesión 7 - - - About instance - - - Acerca del nodo - + + Contact administrator + Contactar al administrador de - 1 + 3 + + + + Your name + Su nombre + + 11 + + + + Your email + Su dirección de correo electrónico + + 20 + + + + Your message + Su mensaje + + 29 + + + + + Cancel + + + Cancelar + + + 26 + + + + Submit + Enviar + + 31 + + + + About instance + Acerca de la instancia + + 4 + + + + Contact administrator + Contactar al administrador + + 6 @@ -998,47 +1253,47 @@ Iniciar sesión Terms Términos de uso - 44 + 39 User registration is allowed and El registro de usuarios está permitido y - 25 + 29 - + - this instance provides a baseline quota of space for the videos of its users. - + this instance provides a baseline quota of space for the videos of its users. + - este nodo ofrece una cuota estándar de de espacio para los vídeos de sus usuarios. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - este nodo ofrece espacio ilimitado para los vídeos de sus usuarios. - + esta instancia provee un espacio máximo de para los vídeos de sus usuarios. + 31 - + - User registration is currently not allowed. - + this instance provides unlimited space for the videos of its users. + - El registro de usuarios no está permitido actualmente. - + esta instancia provee un espacio ilimitado para los vídeos de sus usuarios. + - 36 + 35 + + + + + User registration is currently not allowed. + + + El registro de usuarios no está abierto actualmente. + + + 40 @@ -1395,49 +1650,49 @@ Iniciar sesión Short description Descripción corta - 22 + 21 Default client route Routa de cliente por defecto - 55 + 48 Videos Overview Vista general de los vídeos - 58 + 51 Videos Trending Vídeos en Tendencia - 59 + 52 Videos Recently Added Vídeos Recientemente Añadidos - 60 + 53 Local videos Vídeos locales - 61 + 54 Policy on videos containing sensitive content Política para los vídeos que contengan material sensible - 70 + 61 @@ -1472,23 +1727,44 @@ Iniciar sesión Signup enabled Registro habilitado - 93 + 84 Signup requires email verification La suscripción requiere una verificación mediante correo electrónico - 100 + 91 Signup limit Límite de registro + + 96 + + + + Users + Usuarios 105 + + User default video quota + Cuota de vídeo por defecto del usuario + + 109 + + + + User default daily upload limit + Límite diario de subida por día por usuario + + 121 + + Import Importar @@ -1500,49 +1776,35 @@ Iniciar sesión Video import with HTTP URL (i.e. YouTube) enabled La importación de vídeos mediante URL HTTP (por ejemplo YouTube) está activada - 120 + 141 Video import with a torrent file or a magnet URI enabled Importar video con un archivo torrent o un enlace magnet activado - 127 + 148 Administrator Administrador - 131 + 155 Admin email Correo del administrador - 134 + 158 - - Users - Usuarios + + Enable contact form + Habilitar el formulario de contacto - 144 - - - - User default video quota - Cuota de vídeo por defecto del usuario - - 147 - - - - User default daily upload limit - Límite diario de subida por día por usuario - - 161 + 169 @@ -1563,21 +1825,32 @@ Iniciar sesión Your Twitter username Tu usuario de Twitter - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Indica la cuenta de Twitter del sitio web o de la plataforma en la que el contenido fue publicado - 184 + 187 Instance whitelisted by Twitter Nodo en lista blanca de Twitter - 198 + 199 + + + + If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br /> + If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.<br /><br /> + Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> to see if you instance is whitelisted. + Si su instancia está autorizada por Twitter, un reproductor de vídeo estará incorporado al hilo Twitter cuando se comparta un vídeo desde PeerTube.<br /> + Si la instancia no está autorizada, usamos una tarjeta con una imagen con vínculo que redireccionará hacia su instancia PeerTube.<br /><br /> + Seleccione esta casilla, guarde la configuración y pruebe colocando el URL de un vídeo de su instancia (https://example.com/videos/watch/blabla) en <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> para verificar si su instancia está autorizada por Twitter. + + 200 @@ -1591,98 +1864,162 @@ Iniciar sesión Transcoding Transcodificar - 210 + 215 Transcoding enabled Transcodificación activada - 215 + 221 If you disable transcoding, many videos from your users will not work! ¡Si desactivas la transcodificación, muchos vídeos de tus usuarios no funcionarán! - 216 + 222 + + + + Allow additional extensions + Autorizar extensiones adicionales + + 231 + + + + Allow your users to upload .mkv, .mov, .avi, .flv videos + Autorizar sus usuarios a subir vídeos .mkv, .mov, .avi y .flv + + 232 Transcoding threads Hilos de transcodificaciones - 223 + 237 Resolution enabled Resolución activada - 239 + 252 + + + + + Cache + + + + + Caché + + + + + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Algunos archivos (previsualizaciones, subtítulos) no están federados. Los obtenemos directamente del nodo de origen y las ponemos en caché. - 249 + 265 Previews cache size Tamaño de caché de las previsualizaciones - 254 + 271 Video captions cache size Tamaño de caché de los subtítulos - 265 + 280 Customizations Personalizaciones - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Escribir código Javascript directamente.<br />Ejemplo: <pre>console.log('mi nodo es maravilloso');</pre> - 281 + 297 + + + + + Write directly CSS code. Example:<br /> + <pre> + body + background-color: red; + + </pre> + + Prepend with <em>#custom-css</em> to override styles. Example: + <pre> + #custom-css .logged-in-email + color: red; + + </pre> + + + Escriba directamente código CSS. Por ejemplo:<br /> + <pre> + body + background-color: red; + + </pre> + + Prefijar con <em>#custom-css</em> para sobrecargar estilos. Por ejemplo: + <pre> + #custom-css .logged-in-email + color: red; + + </pre> + + + 311 Advanced configuration Configuración avanzada - 207 + 212 Update configuration Actualizar configuración - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Parece que la configuración no es válida. Por favor, busque errores potenciales en las diferentes pestañas. - 326 + 341 @@ -1707,6 +2044,17 @@ Iniciar sesión 7 + + + Moderation + + + Moderación + + + 11 + + Jobs @@ -1754,6 +2102,13 @@ Iniciar sesión 21 + + Filter... + Filtrar... + + 27 + + ID ID @@ -1789,6 +2144,27 @@ Iniciar sesión 11 + + Accepted + Aceptado + + 32 + + + + Pending + Pendiente + + 33 + + + + Redundancy allowed + Redundancia autorizada + + 22 + + Manage follows Gestionar seguimientos @@ -1893,6 +2269,13 @@ Iniciar sesión 65 + + Daily video quota + Cuota diaria de vídeo + + 72 + + Users list Lista de usuarios @@ -1900,6 +2283,13 @@ Iniciar sesión 2 + + Batch actions + Acciones másivas + + 19 + + Username Nombre de usuario @@ -1907,6 +2297,13 @@ Iniciar sesión 40 + + (banned) + (expulsado) + + 65 + + Go to the account page Ir a la página de la cuenta @@ -1914,6 +2311,52 @@ Iniciar sesión 133 + + User's email must be verified to login + Se requiere validar la dirección de correo electrónico del usuario antes de conectarse + + 72 + + + + User's email is verified / User can login without email verification + La dirección de correo electrónico del usuario ha sido verificada / El usuario puede conectarse sin verificación de dirección de correo electrónico + + 76 + + + + Ban reason: + Razón de la expulsión: + + 95 + + + + Moderation comment + Comentarios de moderación + + 3 + + + + + This comment can only be seen by you or the other moderators. + + + Este comentario puede ser visto solo por usted y los otros moderadores. + + + 17 + + + + Update this comment + Actualizar este comentario + + 25 + + Reporter Reportador @@ -1928,6 +2371,13 @@ Iniciar sesión 14 + + State + Estado + + 11 + + Go to the account Ir a la cuenta @@ -1942,6 +2392,69 @@ Iniciar sesión 33 + + Actions + Acciones + + 35 + + + + Reason: + Razón: + + 53 + + + + Moderation comment: + Comentario de moderación: + + 57 + + + + Video name + Nombre del vídeo + + 8 + + + + Sensitive + Sensible + + 9 + + + + Date + Fecha + + 11 + + + + Blacklist reason: + Razón del bloqueo: + + 43 + + + + Moderation + Moderación + + 2 + + + + Video abuses + Vídeos denunciados como abusivos + + 5 + + Blacklisted videos Vídeos en lista negra @@ -1949,18 +2462,39 @@ Iniciar sesión 7 - - My settings - Mis ajustes + + Muted accounts + Cuentas silenciadas - 3 + 2 - - My videos - Mis vídeos + + Muted servers + Servidores silenciados - 14 + 11 + + + + Account + Cuenta + + 12 + + + + Muted at + Silenciado en + + 13 + + + + Unmute + Dejar de silenciar + + 23 @@ -1974,28 +2508,46 @@ Iniciar sesión Profile Perfil - 8 + 7 Video settings Ajustes de vídeo - 15 + 16 Danger zone Zona peligrosa - 18 + 19 - - Submit - Enviar + + Change ownership + Cambiar el titular - 24 + 46 + + + + Select the next owner + Seleccionar el próxima titular + + 9 + + + + + Cancel + + + Cancelar + + + 35 @@ -2005,6 +2557,13 @@ Iniciar sesión 19 + + Blacklisted + Bloqueado + + 22 + + Cancel @@ -2036,6 +2595,13 @@ Cancelar 6 + + Example: my_channel + Por ejemplo: mi_canal + + 15 + + Display name Nombre a mostrar @@ -2059,6 +2625,13 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 8 + + You don't have any subscriptions yet. + No tiene suscripciones todavía. + + 1 + + Created by Creado por @@ -2073,6 +2646,117 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 16 + + Accept ownership + Aceptar la titularidad + + 3 + + + + Select the target channel + Seleccionar el canal objetivo + + 9 + + + + Initiator + Iniciador + + 13 + + + + + Created + + + + Creado + + + + 15 + + + + Status + Estatus + + 19 + + + + Action + Acción + + 20 + + + + + + + 39 + + + + Refuse + Rechazar + + 47 + + + + Muted instances + Instancias silenciadas + + 2 + + + + History enabled + Historial habilitado + + 4 + + + + Delete history + Borrar el historial + + 8 + + + + You don't have videos history yet. + No tiene historial de vídeos todavía + + 13 + + + + views + vistas + + 22 + + + + Notification preferences + Preferencias de notificación + + 2 + + + + Mark all as read + Marcar todo como leído + + 4 + + Change password Cambiar contraseña @@ -2080,6 +2764,13 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 30 + + Current password + Contraseña actual + + 7 + + New password Nueva contraseña @@ -2101,6 +2792,13 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 3 + + Use WebTorrent to exchange parts of the video with others + Usar WebTorrent para intercambiar partes del vídeo con otros + + 21 + + Automatically plays video Reproducir vídeo automáticamente @@ -2143,6 +2841,13 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 18 + + Once you delete your account, there is no going back. Please be certain. + Eliminar su cuenta es definitivo. ¿Está seguro? + + 2 + + Delete your account Eliminar tu cuenta @@ -2150,6 +2855,20 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 4 + + Activities + Actividades + + 2 + + + + Web + Web + + 3 + + Sorry, but we couldn't find the page you were looking for. @@ -2161,6 +2880,60 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 1 + + + Verify account email confirmation + + + Verificar la confirmación de la dirección de correo electrónico de la cuenta + + + 2 + + + + + Your email has been verified and you may now login. Redirecting... + + + Su dirección de correo electrónico ha sido verificada y puede conectarse ahora. En curso de redirección... + + + 6 + + + + An error occurred. + Un error ocurrió. + + 11 + + + + + Request email for account verification + + + Solicitar un correo electrónico de verificación de la cuenta + + + 2 + + + + Send verification email + Enviar un correo electrónico de verificación + + 17 + + + + This instance does not require email verification. + Esta instancia no requiere verificación por correo electrónico + + 20 + + Support this channel Apoyar este canal @@ -2203,6 +2976,13 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 159 + + Sorry, but something went wrong + Disculpas, algo salió mal + + 49 + + Congratulations, the video behind will be imported! You can already add information about this video. @@ -2228,18 +3008,25 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 6 + + Scheduled + Programado + + 25 + + Publish will be available when upload is finished La publicación estará disponible cuando finalice la subida - 53 + 58 Publish Publicar - 60 + 65 @@ -2249,6 +3036,13 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 6 + + Or + O + + 11 + + Paste magnet URI Pegar el enlace magnético @@ -2323,6 +3117,17 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 24 + + + This will replace an existing caption! + + + Eso remplazará el texto existente! + + + 29 + + Add this caption Añadir este subtítulo @@ -2344,6 +3149,27 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 191 + + Tags could be used to suggest relevant recommendations.</br>Press Enter to add a new tag. + Se puede utilizar etiquetas para sugerir recomendaciones relevantes.</br>Presione Enter para añadir una nueva etiqueta. + + 18 + + + + + Tag + + Etiqueta + + 21 + + + + Enter a new tag + Ingresar una nueva etiqueta + + 21 + + Video descriptions are truncated by default and require manual action to expand them. Las descripciones de vídeo se muestran truncadas por defecto y requieren de acción manual para expandirlas. @@ -2383,14 +3209,14 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac Wait transcoding before publishing the video Esperar transcodificación antes de publicar el vídeo - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Si decides no esperar a la transcodificación antes de publicar el vídeo, quizás no se pueda reproducir hasta que finalice la transcodificación. - 131 + 132 @@ -2404,49 +3230,81 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac Add another caption Añadir otro subtítulo - 146 + 147 See the subtitle file Ver el archivo de subtítulo - 155 + 156 + + + + Already uploaded ✔ + Ya ha sido subido ✔ + + 160 + + + + Will be created on update + Estará creado al actualizar + + 168 Cancel create Cancelar creación - 169 + 170 + + + + Will be deleted on update + Estará eliminado al actualizar + + 176 Cancel deletion Cancelar borrado - 177 + 178 + + + + + No captions for now. + + + Ningún texto por el momento. + + + 183 Captions Subtítulos - 139 + 140 Upload thumbnail Subir miniatura - 195 + 196 Upload preview Subir previsualización - 202 + 203 @@ -2460,14 +3318,14 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac Short text to tell people how they can support you (membership platform...). Breve texto para explicar a la gente cómo pueden apoyarte (plataforma de miembros...). - 209 + 210 Advanced settings Ajustes avanzados - 190 + 191 @@ -2509,6 +3367,17 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 37 + + + Cancel + + + Cancelar + + + 47 + + Download Descargar @@ -2523,6 +3392,19 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 3 + + + Your report will be sent to moderators of . + It will be forwarded to origin instance too. + + + Su reporte estará enviado a los moderadores de . + También estará transferido a la instancia original . + + + 9 + + Share Compartir @@ -2544,6 +3426,31 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 34 + + + The url is not secured (no HTTPS), so the embed video won't work on HTTPS websites (web browsers block non secured HTTP requests on HTTPS websites). + + + El URL no es seguro (no utiliza HTTPS), por lo que el vídeo embebido no funcionará en los sitios web HTTPS (los navegadores web bloquean las consultas HTTP inseguras en los sitios web HTTPS). + + + 45 + + + + Close + Cerrar + + 51 + + + + Blacklist video + Bloquear el vídeo + + 3 + + The video is being imported, it will be available when the import is finished. @@ -2566,6 +3473,46 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 15 + + + This video will be published on . + + + Este vídeo será publicado el . + + + 19 + + + + This video is blacklisted. + Este vídeo está bloqueado + + 24 + + + + + Published - views + + + Publicado - vistas + + + 37 + + + + + Published - views + + + Publicado - vistas + + + 46 + + Like this video Me gusta este vídeo @@ -2629,6 +3576,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 100 + + Unblacklist this video + Desbloquear este vídeo + + 99 + + Delete this video Eliminar este vídeo @@ -2643,6 +3597,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 123 + + By + Por + + 134 + + Show more Mostrar más @@ -2657,6 +3618,24 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 152 + + Friendly Reminder: + Recuerdo amistoso: + + 208 + + + + + the sharing system used for this video implies that some technical information about your system (such as a public IP address) can be sent to other peers. + + + el sistema utilizado para compartir este vídeo implica que algunas informaciones técnicas acerca de su sistema (como la dirección IP pública) pueden estar enviadas a otros pares. + + + 209 + + More information Más información @@ -2682,6 +3661,17 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 215 + + + Other videos + + + Otros vídeos + + + 2 + + Comments @@ -2736,6 +3726,57 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 20 + + You are one step away from commenting + Está a un paso de poder comentar + + 28 + + + + + If you have an account on this instance, you can login: + + + Si tiene una cuenta en esta instancia, puede conectarse: + + + 32 + + + + login to comment + conectarse para comentar + + 35 + + + + + Otherwise you can comment using an account on any ActivityPub-compatible instance. + On most platforms, you can find the video by typing its URL in the search bar and then comment it + from within the software's interface. + + + Sino, puede comentar usando una cuenta de cualquier instancia compatible con ActivityPub. + En la mayoría de las plataformas, puede encontrar el vídeo colocando su URL en el campo de búsqueda y luego comentarlo + desde la interfaz del software. + + + 36 + + + + + If you have an account on Mastodon or Pleroma, you can open it directly in their interface: + + + Si tiene una cuenta en Mastodon o Pleroma, puede abrirlo directamente en su interfaz: + + + 41 + + Highlighted comment Comentario resaltado @@ -2750,9 +3791,23 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 14 - - Error getting about from server - Error al obtener información del servidor + + Cannot get about information from server + No se puede obtener información del servidor + + 1 + + + + Your message has been sent. + Su mensaje ha sido remitido + + 1 + + + + You already sent this form recently + Ya envió este formulario recientemente 1 @@ -2778,16 +3833,44 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 - - Error - Error + + 240p + 240p 1 - - Success - Correcto + + 360p + 360p + + 1 + + + + 480p + 480p + + 1 + + + + 720p + 720p + + 1 + + + + 1080p + 1080p + + 1 + + + + Auto (via ffmpeg) + Auto (vía ffmpeg) 1 @@ -2806,6 +3889,69 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + 100MB + 100MB + + 1 + + + + 500MB + 500MB + + 1 + + + + 1GB + 1GB + + 1 + + + + 5GB + 5GB + + 1 + + + + 20GB + 20GB + + 1 + + + + 50GB + 50GB + + 1 + + + + 10MB + 10MB + + 1 + + + + 50MB + 50MB + + 1 + + + + 2GB + 2GB + + 1 + + is not valid no es válido @@ -2869,6 +4015,97 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + enabled + habilitada + + 1 + + + + disabled + deshabilitada + + 1 + + + + Redundancy for is + La redundancia para está + + 1 + + + + Account unmuted by your instance. + La cuenta no está silenciada por su instancia. + + 1 + + + + Instance unmuted by your instance. + La instancia no está silenciada por su instancia. + + 1 + + + + Comment updated. + Comentario actualizado + + 1 + + + + Delete this report + Eliminar este reporte + + 1 + + + + Update moderation comment + Actualizar el comentario de moderación + + 1 + + + + Mark as accepted + Marcar como aceptado + + 1 + + + + Mark as rejected + Marcar como rechazado + + 1 + + + + Do you really want to delete this abuse report? + ¿Confirma la eliminación del reporte de abuso? + + 1 + + + + Abuse deleted. + Reporte de abuso eliminado. + + 1 + + + + Do you really want to remove this video from the blacklist? It will be available again in the videos list. + ¿Confirmar el desbloqueo de este vídeo? Estará disponible de nuevo en la lista de vídeos. + + 1 + + Video removed from the blacklist. Vídeo eliminado de la lista negra. @@ -2897,6 +4134,41 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Unban + Dejar sin efecto la expulsión + + 1 + + + + Set Email as Verified + Establecer la dirección de correo electrónico como Verificada + + 1 + + + + You cannot ban root. + No puede expulsar al root. + + 1 + + + + Do you really want to unban users? + ¿Confirma dejar sin efecto la expulsión de usuarios? + + 1 + + + + users unbanned. + usuarios expulsados. + + 1 + + You cannot delete root. No puedes eliminar al root. @@ -2904,6 +4176,90 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + If you remove these users, you will not be able to create others with the same username! + ¡Si elimina estos usuarios, no será posible crear otros con el mismo nombre de usuario! + + 1 + + + + users deleted. + usuarios eliminados. + + 1 + + + + users email set as verified. + direcciones de correo electrónico de usuarios establecidas como verificadas. + + 1 + + + + Account unmuted. + La cuenta ya no está silenciada. + + 1 + + + + Instance unmuted. + La instancia ya no está silenciada. + + 1 + + + + My videos history + Mi historial de vídeos + + 1 + + + + Videos history is enabled + El historial de vídeos está habilitado + + 1 + + + + Videos history is disabled + El historial de vídeos está deshabilitado + + 1 + + + + Delete videos history + Eliminar el historial de vídeos + + 1 + + + + Are you sure you want to delete all your videos history? + ¿Confirma la eliminación de todo su historial de vídeos? + + 1 + + + + Videos history deleted + Historial de vídeos eliminado + + 1 + + + + Ownership accepted + Titularidad aceptada + + 1 + + Password updated. Contraseña actualizada. @@ -2911,6 +4267,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + You current password is invalid. + Su contraseña actual es invalida. + + 1 + + Are you sure you want to delete your account? This will delete all you data, including channels, videos etc. Estás seguro de querer eliminar tu cuenta? Todos tus datos serán eliminados, incluyendo canales, vídeos, etc. @@ -2939,6 +4302,76 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + New video from your subscriptions + Nuevo vídeo desde sus suscripciones + + 1 + + + + New comment on your video + Nuevo comentario en su vídeo + + 1 + + + + New video abuse on local video + Nueva denuncia de abuso sobre un vídeo local + + 1 + + + + One of your video is blacklisted/unblacklisted + Uno de sus vídeos ha sido bloqueado/desbloqueado + + 1 + + + + Video published (after transcoding/scheduled update) + Vídeo publicado (después de una transcodificación / actualización programada) + + 1 + + + + Video import finished + Importación de vídeo terminada + + 1 + + + + A new user registered on your instance + Un nuevo usuario se registró en su instancia + + 1 + + + + You or your channel(s) has a new follower + Usted o su(s) canal(es) tiene un nuevo seguidor + + 1 + + + + Someone mentioned you in video comments + Alguien le mencionó en comentarios de vídeo + + 1 + + + + Preferences saved + Preferencias guardadas + + 1 + + Profile updated. Perfil actualizado. @@ -2967,6 +4400,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + This name already exists on this instance. + El nombre ya existe en esta instancia. + + 1 + + Create Crear @@ -2981,20 +4421,6 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - ¿De verdad quieres eliminar ? Esto eliminará también todos los vídeos subidos a este canal. - - 1 - - - - Please type the name of the video channel to confirm - Por favor escribe el nombre del canal de vídeo para confirmar - - 1 - - Video channel deleted. Canal de vídeo eliminado. @@ -3002,6 +4428,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + My videos + Mis vídeos + + 1 + + Do you really want to delete videos? ¿De verdad quieres eliminar vídeos? @@ -3065,6 +4498,76 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Ownership change request sent. + Solicitud de cambio de titularidad enviada. + + 1 + + + + My library + Mi biblioteca + + 1 + + + + My channels + Mis canales + + 1 + + + + My subscriptions + Mis suscripciones + + 1 + + + + My history + Mi historial + + 1 + + + + Misc + Diversos + + 1 + + + + Ownership changes + Cambios de titularidad + + 1 + + + + My settings + Mis ajustes + + 1 + + + + My notifications + Mis notificaciones + + 1 + + + + An email with verification link will be sent to . + Un correo electrónico con un vínculo de verificación será enviado a . + + 1 + + Unable to find user id or verification string. No se pudo encontrar el id de usuario o la cadena de verificación. @@ -3072,6 +4575,97 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Subscribe to the account + Suscribirse a la cuenta + + 1 + + + + Focus the search bar + Enfocar la barra de búsqueda + + 1 + + + + Toggle the left menu + Conmutar el menú de la izquierda + + 1 + + + + Go to the videos overview page + Ir a la página general de vídeos + + 1 + + + + Go to the trending videos page + Ir a la página de vídeos populares + + 1 + + + + Go to the recently added videos page + Ir a la página de vídeos recientes + + 1 + + + + Go to the local videos page + Ir a la página de vídeos locales + + 1 + + + + Go to the videos upload page + Ir a la página de subida de vídeos + + 1 + + + + Toggle Dark theme + Conmutar el tema Oscuro + + 1 + + + + Go to my subscriptions + Ir a mis suscripciones + + 1 + + + + Go to my videos + Ir a mis vídeos + + 1 + + + + Go to my imports + Ir a mis importaciones + + 1 + + + + Go to my channels + Ir a mis canales + + 1 + + Cannot retrieve OAuth Client credentials: . @@ -3088,6 +4682,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Error + Error + + 1 + + You need to reconnect. Tienes que reconectar. @@ -3102,6 +4703,41 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Keyboard Shortcuts: + Atajos de teclado: + + 1 + + + + Info + Info + + 1 + + + + Success + Correcto + + 1 + + + + Incorrect username or password. + Nombre de usuario o contraseña incorrecta + + 1 + + + + You account is blocked. + Su cuenta ha sido bloqueada + + 1 + + An email with the reset password instructions will be sent to . Un correo con las instrucciones para restablecer la contraseña será enviado a . @@ -3298,6 +4934,69 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Transcoding threads must be greater or equal to 0. + El número de subprocesos de transcodificación tiene que ser superior o igual a 0. + + 1 + + + + Email is required. + Se requiere un correo electrónico. + + 1 + + + + Email must be valid. + El correo electrónico ha de ser válido. + + 1 + + + + Your name is required. + Su nombre es requerido. + + 1 + + + + Your name must be at least 1 character long. + Su nombre tiene que contener por lo menos 1 carácter. + + 1 + + + + Your name cannot be more than 120 characters long. + Su nombre no puede contener más de 120 caracteres. + + 1 + + + + A message is required. + Se tiene que colocar un mensaje. + + 1 + + + + The message must be at least 3 characters long. + El mensaje tiene que contener por lo menos 3 caracteres. + + 1 + + + + The message cannot be more than 5000 characters long. + El mensaje no puede contener más de 5.000 caracteres. + + 1 + + Username is required. Se requiere un nombre de usuario. @@ -3319,37 +5018,23 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 - - Username must be at least 3 characters long. - El nombre de usuario ha de ocupar más de 3 caracteres. + + Username must be at least 1 character long. + El nombre de usuario tiene que contener por lo menos un carácter. 1 - - Username cannot be more than 20 characters long. - El nombre de usuario no puede ocupar más de 20 caracteres. + + Username cannot be more than 50 characters long. + El nombre de usuario no puede contener más de 50 caracteres. 1 - - Username should be only lowercase alphanumeric characters. - El nombre de usuario debe utilizar únicamente caracteres alfanuméricos en minúscula. - - 1 - - - - Email is required. - Se requiere un correo electrónico. - - 1 - - - - Email must be valid. - El correo electrónico ha de ser válido. + + Username should be lowercase alphanumeric; dots and underscores are allowed. + El nombre de usuario puede contener minúsculas, cifras, puntos y barras bajas. 1 @@ -3389,6 +5074,20 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Daily upload limit is required. + Se requiere colocar un límite diario de subida. + + 1 + + + + Daily upload limit must be greater than -1. + El límite diario de subida tiene que ser superior a -1. + + 1 + + User role is required. Se requiere un rol de usuario. @@ -3403,16 +5102,16 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 - - Display name must be at least 3 characters long. - El nombre para mostrar debe ocupar como mínimo 3 caracteres. + + Display name must be at least 1 character long. + El nombre mostrado tiene que contener por lo menos 1 carácter. 1 - - Display name cannot be more than 120 characters long. - El nombre a mostrar no puede ocupar más de 120 caracteres. + + Display name cannot be more than 50 characters long. + El nombre mostrado no puede contener más de 50 caracteres. 1 @@ -3424,6 +5123,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Description cannot be more than 1000 characters long. + La descripción no puede contener más de 1.000 caracteres. + + 1 + + You must to agree with the instance terms in order to registering on it. Debes aceptar los términos de uso del nodo para poder registrarte en él. @@ -3431,6 +5137,20 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Ban reason must be at least 3 characters long. + La razón de la expulsión tiene que contener por lo menos 3 caracteres. + + 1 + + + + Ban reason cannot be more than 250 characters long. + La razón de la expulsión no puede contener más de 250 caracteres. + + 1 + + Report reason is required. Se requiere un motivo para reportar. @@ -3445,9 +5165,37 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 - - Report reason cannot be more than 300 characters long. - El motivo del reporte no puede ocupar más de 300 caracteres. + + Moderation comment is required. + Se requiere llenar el comentario de moderación. + + 1 + + + + Moderation comment must be at least 2 characters long. + El comentario de moderación tiene que contener por lo menos 2 caracteres. + + 1 + + + + The channel is required. + Se requiere llenar el canal. + + 1 + + + + Blacklist reason must be at least 2 characters long. + La razón del bloqueo tiene que contener por lo menos 2 caracteres. + + 1 + + + + Blacklist reason cannot be more than 300 characters long. + La razón del bloqueo no puede contener más de 300 caracteres. 1 @@ -3466,6 +5214,48 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + The username is required. + Se requiere llenar el nombre de usuario. + + 1 + + + + You can only transfer ownership to a local account + Solo puede transferir la titularidad a una cuenta local + + 1 + + + + Name is required. + Se requiere llenar el nombre. + + 1 + + + + Name must be at least 1 character long. + El nombre tiene que contener por lo menos 1 carácter. + + 1 + + + + Name cannot be more than 50 characters long. + El nombre no puede contener más de 50 caracteres. + + 1 + + + + Name should be lowercase alphanumeric; dots and underscores are allowed. + El nombre puede contener minúsculas, cifras, puntos y barras bajas. + + 1 + + Support text must be at least 3 characters long. El texto para el apoyo ha de ocupar como mínimo 3 caracteres. @@ -3473,6 +5263,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Support text cannot be more than 1000 characters long. + El texto de apoyo no puede contener más de 1.000 caracteres. + + 1 + + Comment is required. Se requiere comentario. @@ -3564,6 +5361,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Video support cannot be more than 1000 characters long. + El soporte de vídeo no puede contener más de 1.000 caracteres. + + 1 + + A date is required to schedule video update. Se requiere una fecha para actualizar la programación del vídeo. @@ -3914,6 +5718,27 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Transcode your videos in multiple resolutions + Transcodificar sus vídeos en múltiples resoluciones + + 1 + + + + HTTP import (YouTube, Vimeo, direct URL...) + Importación HTTP (YouTube, Vimeo, URL directo...) + + 1 + + + + Torrent import + Importación de torrent + + 1 + + ~ ~ @@ -4068,6 +5893,41 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + users banned. + usuarios bloqueados. + + 1 + + + + User banned. + Usuario bloqueado. + + 1 + + + + Do you really want to unban ? + ¿Confirma el desbloqueo de ? + + 1 + + + + User unbanned. + El usuario ha sido desbloqueado. + + 1 + + + + If you remove this user, you will not be able to create another with the same username! + ¡Si elimina este usuario, no podrá crear otro con el mismo nombre de usuario! + + 1 + + User deleted. Usuario eliminado. @@ -4075,6 +5935,111 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + User email set as verified + El correo electrónico del usuario establecido como verificado + + 1 + + + + Account muted. + Cuenta silenciada. + + 1 + + + + Instance muted. + Instancia silenciada. + + 1 + + + + Account muted by the instance. + Cuenta silenciada por la instancia. + + 1 + + + + Account unmuted by the instance. + Cuenta ya no silenciada por la instancia. + + 1 + + + + Instance muted by the instance. + Instancia silenciada por la instancia. + + 1 + + + + Instance unmuted by the instance. + La instancia ya no es silenciada por la instancia. + + 1 + + + + Mute this account + Silenciar esta cuenta + + 1 + + + + Unmute this account + Dejar de silenciar esta cuenta + + 1 + + + + Mute the instance + Silenciar esta instancia + + 1 + + + + Unmute the instance + Dejar de silenciar esta instancia + + 1 + + + + Mute this account by your instance + Silenciar esta cuenta por su instancia + + 1 + + + + Unmute this account by your instance + Dejar de silenciar esta cuenta por su instancia + + 1 + + + + Mute the instance by your instance + Silenciar esta instancia por su instancia + + 1 + + + + Unmute the instance by your instance + Dejar de silenciar esta instancia por su instancia + + 1 + + Request is too large for the server. Please contact you administrator if you want to increase the limit size. La petición es demasiado grande para el servidor. Por favor contacta con tu administrador si quieres aumentar el límite de tamaño. @@ -4103,6 +6068,76 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Subscribed to + Suscrito a + + 1 + + + + Subscribed + Suscrito + + 1 + + + + Unsubscribed from + Ya no está suscrito a + + 1 + + + + Unsubscribed + Ya no está suscrito + + 1 + + + + Moderator + Moderador + + 1 + + + + Only I can see this video + Soy el único que pueda ver este vídeo + + 1 + + + + Only people with the private link can see this video + Solo las personas que tengan el vínculo privado pueden ver este vídeo + + 1 + + + + Anyone can see this video + Todos pueden ver este vídeo + + 1 + + + + Welcome! Now please check your emails to verify your account and complete signup. + ¡Le damos la bienvenida! Ahora revise sus correos electrónicos para verificar su cuenta y terminar el proceso de registro. + + 1 + + + + You are now logged in as ! + ¡Está conectado como ! + + 1 + + Video to import updated. Video to import updated. @@ -4131,13 +6166,6 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 - - Info - Info - - 1 - - Upload cancelled Subida cancelada @@ -4145,9 +6173,16 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Lo sentimos pero PeerTube no puede manejar vídeos > 8 GB + + Your video quota is exceeded with this video (video size: , used: , quota: ) + Con este vídeo, está pasando su cuota de espacio (tamaño del vídeo: , espacio utilizado: , cuota: ) + + 1 + + + + Your daily video quota is exceeded with this video (video size: , used: , quota: ) + Con este vídeo, su cuota de espacio diario ha sido excedido (tamaño del vídeo: , espacio usado: , cuota: ) 1 @@ -4173,6 +6208,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Video blacklisted. + Vídeo bloqueado + + 1 + + Copied Copiado @@ -4187,6 +6229,27 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Start at + Iniciar a + + 1 + + + + Like the video + Colocar Me gusta a este vídeo + + 1 + + + + Dislike the video + Eliminar Me gusta de este vídeo + + 1 + + Do you really want to delete this video? ¿De verdad quieres eliminar este vídeo? @@ -4215,5 +6278,12 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Videos from your subscriptions + Vídeos desde sus suscripciones + + 1 + + \ No newline at end of file diff --git a/client/src/locale/target/angular_eu_ES.xml b/client/src/locale/target/angular_eu_ES.xml index d17189c7a..0393ab85c 100644 --- a/client/src/locale/target/angular_eu_ES.xml +++ b/client/src/locale/target/angular_eu_ES.xml @@ -499,7 +499,7 @@ Password Pasahitza - 12 + 13 @@ -513,7 +513,7 @@ Login Hasi saioa - 38 + 36 @@ -541,7 +541,7 @@ Send me an email to reset my password Bidali e-mail bat nire pasahitza berrezartzeko - 75 + 80 @@ -612,7 +612,7 @@ Signup Eman izena - 88 + 78 @@ -682,7 +682,7 @@ Change the language Aldatu hizkuntza - 88 + 86 @@ -693,7 +693,7 @@ Nire profil publikoa - 18 + 16 @@ -704,7 +704,7 @@ Nire kontua - 22 + 20 @@ -715,7 +715,7 @@ Nire bideoak - 26 + 24 @@ -726,14 +726,14 @@ Amaitu saioa - 30 + 28 Create an account Sortu kontu bat - 39 + 37 @@ -747,49 +747,49 @@ Subscriptions Harpidetzak - 47 + 45 Overview Gainbegirada - 52 + 50 Trending Joerak - 57 + 55 Recently added Gehitutako azkenak - 62 + 60 Local Tokikoa - 67 + 65 More Gehiago - 72 + 70 Administration Administrazioa - 76 + 74 @@ -803,14 +803,14 @@ Show keyboard shortcuts Erakutsi teklatu-lasterbideak - 91 + 89 Toggle dark interface Txandakatu interfaze iluna - 94 + 92 @@ -915,14 +915,14 @@ Display unlisted and private videos Bistaratu zerrendatu gabeko bideoak eta bideo pribatuak - 11 + 14 No results. Emaitzarik ez. - 17 + 20 @@ -980,15 +980,22 @@ 7 - + - About instance - + Cancel + - instantziari buruz - + Utzi + - 1 + 26 + + + + Submit + Bidali + + 31 @@ -1002,45 +1009,14 @@ Terms Baldintzak - 44 + 39 User registration is allowed and Erabiltzaile berriek izena ematea onartzen da eta - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - instantzia honek eskaintzen ditu erabiltzaileen bideoetarako oinarrizko kuota gisa. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - instantzia honek mugagabeko espazioa eskaintzen du bere erabiltzaileen bideoetarako. - - 31 - - - - - User registration is currently not allowed. - - -Erabiltzaile berriek izena ematea ez da onartzen orain. - - 36 + 29 @@ -1395,49 +1371,49 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Short description Deskripzio laburra - 22 + 21 Default client route Lehenetsitako bezeroaren ibilbidea - 55 + 48 Videos Overview Bideoen gainbegirada - 58 + 51 Videos Trending Joera diren bideoak - 59 + 52 Videos Recently Added Azkenaldian gehitutako bidoeak - 60 + 53 Local videos Tokiko bideoak - 61 + 54 Policy on videos containing sensitive content Eduki hunkigarria duten bideoen politika - 70 + 61 @@ -1472,23 +1448,44 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Signup enabled Izena ematea gaituta - 93 + 84 Signup requires email verification Izena emateko e-mail helbidea baieztatu behar da - 100 + 91 Signup limit Izena emateko muga + + 96 + + + + Users + Erabiltzaileak 105 + + User default video quota + Erabiltzailearen lehenetsitako bideo-kuota + + 109 + + + + User default daily upload limit + Erabiltzailearentzat lehenetsitako eguneko igoera muga + + 121 + + Import Inportatu @@ -1500,49 +1497,28 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Video import with HTTP URL (i.e. YouTube) enabled HTTP URL bidezko bideoen inportazioa gaituta (adibidez YouTube) - 120 + 141 Video import with a torrent file or a magnet URI enabled Bideoa torrent fitxategia edo magnet URL bidez inportatzea gaituta - 127 + 148 Administrator Administratzailea - 131 + 155 Admin email Administratzailearen e-maila - 134 - - - - Users - Erabiltzaileak - - 144 - - - - User default video quota - Erabiltzailearen lehenetsitako bideo-kuota - - 147 - - - - User default daily upload limit - Erabiltzailearentzat lehenetsitako eguneko igoera muga - - 161 + 158 @@ -1563,21 +1539,21 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Your Twitter username Zure Twitter erabiltzaile-izena - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Edukia argitaratuko den webgune edo plataformarentzat Twitter kontua adierazten du. - 184 + 187 Instance whitelisted by Twitter Twitter-ek onartutako instantzia - 198 + 199 @@ -1591,35 +1567,35 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Transcoding Transkodeketa - 210 + 215 Transcoding enabled Transkodeketa gaituta - 215 + 221 If you disable transcoding, many videos from your users will not work! Transkodeketa desgaitzen baduzu, erabiltzaileen bideo askok ez dute funtzionatuko! - 216 + 222 Transcoding threads Transkodetze hariak - 223 + 237 Resolution enabled bereizmena gaituta - 239 + 252 @@ -1634,82 +1610,47 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. - 244 + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Fitxategi batzuk ez dira federatzen (aurrebistak, azpitituluak). Zuzenean jatorrizko instantziatik jasotzen ditugu eta cachean gorde. - 249 + 265 Previews cache size Aurrebisten cachearen tamaina - 254 + 271 Video captions cache size Bideoaren azpitituluen cachearen tamaina - 265 + 280 Customizations Pertsonalizazioak - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> IdatziJavaScript kodea zuzenean.<br />Adibidez: <pre>console.log('nire instantzia zoragarria da');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - Idatzi CSS kodea zuzenean. Adibidez:<br /> - <pre> - body - background-color: red; - - </pre> - - Idatzi aurretik <em>#custom-css</em> estiloak gainidazteko. Adibidez: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1718,21 +1659,21 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Advanced configuration Konfigurazio aurreratua - 207 + 212 Update configuration Eguneratu konfigurazioa - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Konfigurazioa baliogabea dela dirudi. Bilatu zer egon daitekeen gaizki fitxa desberdinetan begiratuz. - 326 + 341 @@ -2021,21 +1962,21 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. User's email must be verified to login Erabiltzailearen e-mail helbidea baieztatu behar da saioa hasi aurretik - 70 + 72 User's email is verified / User can login without email verification Erabiltzailearen e-mail helbidea baieztatuta dago / Erabiltzaileak e-mail helbidea baieztatu gabe saioa hasi dezake - 74 + 76 Ban reason: Debekatzeko arrazoia: - 92 + 95 @@ -2102,7 +2043,7 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Actions Ekintzak - 33 + 35 @@ -2137,14 +2078,14 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Date Data - 10 + 11 Blacklist reason: Zerrenda beltzean sartzeko arrazoia: - 41 + 43 @@ -2196,69 +2137,6 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. 23 - - My settings - Nire ezarpenak - - 3 - - - - My library - Nire liburutegia - - 7 - - - - My channels - Nire kanalak - - 12 - - - - My videos - Nire bideoak - - 14 - - - - My subscriptions - Nire harpidetzak - - 16 - - - - My imports - Nire inportazioak - - 18 - - - - Misc - Denetarik - - 24 - - - - Muted instances - Mutututako instantziak - - 2 - - - - Ownership changes - Jabetza aldaketak - - 33 - - Video quota: Bideo-kuota: @@ -2270,21 +2148,21 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Profile Profila - 8 + 7 Video settings Bideo ezarpenak - 15 + 16 Danger zone Eremu arriskutsua - 18 + 19 @@ -2312,13 +2190,6 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. 35 - - Submit - Bidali - - 24 - - - views - ikustaldi @@ -2477,6 +2348,13 @@ Kanal honetara bideo bat igotzen duzunean, bideoa babesteko eremua testu honekin 47 + + Muted instances + Mutututako instantziak + + 2 + + Change password Aldatu pasahitza @@ -2725,14 +2603,14 @@ Ezin izan dugu bilatzen duzun orria aurkitu. Publish will be available when upload is finished Argitaratzea behin igoera bukatzean egongo da erabilgarri - 53 + 58 Publish Argitaratu - 60 + 65 @@ -2915,14 +2793,14 @@ Ezin izan dugu bilatzen duzun orria aurkitu. Wait transcoding before publishing the video Itxaron transkodetzeari bideoa argitaratu aurretik - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Bideoa argitaratu aurretik ez baduzu transkodetzea bukatu arte itxaroten, bideoa transkodetzea bukatu arte ezin ikustea gerta daiteke. - 131 + 132 @@ -2936,49 +2814,49 @@ Ezin izan dugu bilatzen duzun orria aurkitu. Add another caption Gehitu beste azpititulu bat - 146 + 147 See the subtitle file Ikusi azpitituluen fitxategia - 155 + 156 Already uploaded ✔ Jadanik igota ✔ - 159 + 160 Will be created on update Eguneratzean sortuko da - 167 + 168 Cancel create Ezeztatu sorkuntza - 169 + 170 Will be deleted on update Eguneratzean ezabatuko da - 175 + 176 Cancel deletion Ezeztatu ezabaketa - 177 + 178 @@ -2989,28 +2867,28 @@ Ezin izan dugu bilatzen duzun orria aurkitu. Azpititulurik ez oraingoz. - 182 + 183 Captions Azpitituluak - 139 + 140 Upload thumbnail Igo irudia - 195 + 196 Upload preview Igo aurrebista - 202 + 203 @@ -3024,14 +2902,14 @@ Ezin izan dugu bilatzen duzun orria aurkitu. Short text to tell people how they can support you (membership platform...). Jendeari zu nola babestu azaltzeko testu labur bat (kidetza plataforma...). - 209 + 210 Advanced settings Ezarpen aurreratuak - 190 + 191 @@ -3098,17 +2976,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 3 - - - Cancel - - - Utzi - - - 19 - - Share Partekatu @@ -3478,13 +3345,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 14 - - Error getting about from server - Errorea informazioa zerbitzaritik jasotzean - - 1 - - No description Deskripziorik ez @@ -3506,13 +3366,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Error - Errorea - - 1 - - 240p 240p @@ -3555,13 +3408,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Success - Arrakasta - - 1 - - Configuration updated. Konfigurazioa eguneratuta. @@ -3989,20 +3835,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Ziur ezabatu nahi duzula? Kanalera igotako bideo guztiak ezabatuko dira ere. - - 1 - - - - Please type the name of the video channel to confirm - Idatzi bideo kanalaren izena berresteko - - 1 - - Video channel deleted. bideo kanala ezabatuta. @@ -4010,6 +3842,13 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + My videos + Nire bideoak + + 1 + + Do you really want to delete videos? Ziur bideo ezabatu nahi dituzula? @@ -4080,16 +3919,44 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Channels - Kanalak + + My library + Nire liburutegia 1 - - Video imports - Bideo inportazioak + + My channels + Nire kanalak + + 1 + + + + My subscriptions + Nire harpidetzak + + 1 + + + + Misc + Denetarik + + 1 + + + + Ownership changes + Jabetza aldaketak + + 1 + + + + My settings + Nire ezarpenak 1 @@ -4215,6 +4082,13 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + Error + Errorea + + 1 + + You need to reconnect. Berriro konektatu behar duzu. @@ -4236,6 +4110,20 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + Info + Informazioa + + 1 + + + + Success + Arrakasta + + 1 + + Incorrect username or password. Erabiltzaile-izen edo pasahitz okerra. @@ -4453,6 +4341,20 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + Email is required. + E-maila behar da. + + 1 + + + + Email must be valid. + E-maila baliozkoa izan behar da. + + 1 + + Username is required. Erabiltzaile izena beha da. @@ -4474,41 +4376,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Username must be at least 3 characters long. - Erabiltzaile-izenak gutxienez 3 karaktere izan behar ditu. - - 1 - - - - Username cannot be more than 20 characters long. - Erabiltzaile-izenak ezin ditu 20 karaktere baino gehiago izan. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Erabiltzaile-izena minuskulaz dauden karaktere alfanumerikoak besterik ezin ditu izan. - - 1 - - - - Email is required. - E-maila behar da. - - 1 - - - - Email must be valid. - E-maila baliozkoa izan behar da. - - 1 - - Password must be at least 6 characters long. Pasahitza gutxienez 6 karaktere luze izan behar da. @@ -4572,20 +4439,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Display name must be at least 3 characters long. - Pantaila-izena gutxienez 3 karaktere luze izan behar da. - - 1 - - - - Display name cannot be more than 120 characters long. - Pantaila-izena ezin da 120 karaktere baino luzeagoa izan. - - 1 - - Description must be at least 3 characters long. Deskripzioa gutxienez 3 karaktere luze izan behar da. @@ -4635,13 +4488,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Report reason cannot be more than 300 characters long. - Salatzeko arrazoia ezin da 300 karaktere baino luzeagoa izan. - - 1 - - Moderation comment is required. Moderazio iruzkina derrigorrezkoa da. @@ -4656,13 +4502,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Moderation comment cannot be more than 300 characters long. - Moderazio iruzkina ezin da 300 karaktere baino luzeagoa izan. - - 1 - - The channel is required. Kanala derrigorrezkoa da. @@ -4719,27 +4558,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Name must be at least 3 characters long. - Izena gutxienez 3 karakterekoa izan behar da - - 1 - - - - Name cannot be more than 20 characters long. - Izena ezin da20 karaktere baino luzeagoa izan - - 1 - - - - Name should be only lowercase alphanumeric characters. - Izenak karaktere alfanumerikoak minuskulan besterik ezin ditu izan. - - 1 - - Support text must be at least 3 characters long. Babes testua gutxienez 3 karaktere luze izan behar da @@ -5552,13 +5370,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Subscribed - Harpidetuta - - 1 - - Subscribed to (e)ra harpidetuta @@ -5566,9 +5377,9 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Unsubscribed - Harpidetza kenduta + + Subscribed + Harpidetuta 1 @@ -5580,6 +5391,13 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + Unsubscribed + Harpidetza kenduta + + 1 + + Moderator Moderatzailea @@ -5650,13 +5468,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Info - Informazioa - - 1 - - Upload cancelled Igoera ezeztatuta @@ -5664,13 +5475,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Sentitzen dugu, PeerTubek ezin du 8GB baino gehiagoko bideorik kudeatu - - 1 - - Your video quota is exceeded with this video (video size: , used: , quota: ) Zure bideo-kuota bideo honekin gainditzen da (bideoaren tamaina: , erabilita: , kuota: ) diff --git a/client/src/locale/target/angular_fa_IR.xml b/client/src/locale/target/angular_fa_IR.xml index fe2d0b0cf..2a59cfc34 100644 --- a/client/src/locale/target/angular_fa_IR.xml +++ b/client/src/locale/target/angular_fa_IR.xml @@ -288,7 +288,7 @@ Password گذرواژه - 12 + 13 @@ -302,7 +302,7 @@ Login ورود - 38 + 36 @@ -330,7 +330,7 @@ Send me an email to reset my password یک رایانامه برای بازنشانی گذرواژه برای من بفرست - 75 + 80 @@ -392,7 +392,7 @@ Signup ثبت‌نام - 88 + 78 @@ -410,7 +410,7 @@ Change the language تغییر زبان - 88 + 86 @@ -421,7 +421,7 @@ نمایه‌ عمومی من - 18 + 16 @@ -432,7 +432,7 @@ حساب کاربری من - 22 + 20 @@ -443,7 +443,7 @@ ویدئو‌های من - 26 + 24 @@ -454,14 +454,14 @@ خروج - 30 + 28 Create an account ساخت حساب - 39 + 37 @@ -475,49 +475,49 @@ Subscriptions اشتراک - 47 + 45 Overview نمای‌کلی - 52 + 50 Trending مورد بحث - 57 + 55 Recently added به تازگی اضافه شده - 62 + 60 Local محلی - 67 + 65 More دیگر - 72 + 70 Administration مدیریت - 76 + 74 @@ -529,7 +529,7 @@ Toggle dark interfaceToggle dark interface - 94 + 92 @@ -613,7 +613,7 @@ No results. بدون نتیجه. - 17 + 20 @@ -659,14 +659,14 @@ Videos Overview نمای‌کلی ویدئو‌ها - 58 + 51 Local videos ویدئو‌های محلی - 61 + 54 @@ -680,7 +680,14 @@ Signup enabled ثبت‌نام فعال است - 93 + 84 + + + + Users + کاربران + + 105 @@ -694,14 +701,7 @@ Administrator مدیر - 131 - - - - Users - کاربران - - 144 + 155 @@ -715,14 +715,14 @@ Your Twitter username نام‌کاربری توییتر شما - 181 + 184 JavaScript جاوااکسریپت - 278 + 294 @@ -813,18 +813,25 @@ 14 - - My settings - تنظیمات من - - 3 - - My videos ویديو‌های من - 14 + 1 + + + + My settings + تنظیمات من + + 1 + + + + Info + راهنما + + 1 @@ -1030,13 +1037,6 @@ 1 - - Info - راهنما - - 1 - - Upload cancelled بارگزاری لغوشد diff --git a/client/src/locale/target/angular_fr_FR.xml b/client/src/locale/target/angular_fr_FR.xml index 55f323009..23cfec618 100644 --- a/client/src/locale/target/angular_fr_FR.xml +++ b/client/src/locale/target/angular_fr_FR.xml @@ -227,6 +227,155 @@ 11 + + You don't have notifications. + Vous n'avez pas de notifications. + + 1 + + + + + published a new video + + + a publié une nouvelle vidéo + + + 7 + + + + + Your video has been unblacklisted + + + Votre vidéo a été débloquée + + + 11 + + + + + Your video has been blacklisted + + + Votre vidéo a été bloquée + + + 15 + + + + + A new video abuse has been created on video + + + Un nouveau signalement a été créé sur la vidéo + + + 19 + + + + + commented your video + + + a commenté votre vidéo + + + 23 + + + + + Your video has been published + + + Votre vidéo a été publiée + + + 27 + + + + + Your video import succeeded + + + Votre vidéo a été importée + + + 31 + + + + + Your video import failed + + + L'importation de votre vidéo a échoué + + + 35 + + + + + User registered on your instance + + + L'utilisateur a créé un compte sur votre instance + + + 39 + + + + + is following + + + your channel + + your account + + + suit + + + votre chaîne + + votre compte + + + 43 + + + + + mentioned you on video + + + vous a mentionné sur la vidéo + + + 52 + + + + + + + + + + + 57 + + Unlisted Non répertoriée @@ -434,6 +583,13 @@ 25 + + + + + 11 + + Login @@ -498,7 +654,7 @@ Password Mot de passe - 12 + 13 @@ -512,7 +668,7 @@ Login Se connecter - 38 + 36 @@ -522,6 +678,17 @@ 57 + + + We are sorry, you cannot recover you password because your instance administrator did not configure the PeerTube email system. + + + Désolé, vous ne pouvez pas récupérer votre mot de passe car l'administrateur de votre instance n'a pas configuré le système de mails de PeerTube. + + + 63 + + Email Courriel @@ -540,7 +707,7 @@ Send me an email to reset my password M'envoyer un courriel pour réinitialiser mon mot de passe - 75 + 80 @@ -611,7 +778,7 @@ Signup Créer un compte - 88 + 78 @@ -681,7 +848,18 @@ Change the language Changer la langue - 88 + 86 + + + + + Help to translate PeerTube! + + + Aidez à traduire PeerTube ! + + + 8 @@ -692,7 +870,7 @@ Mon profil public - 18 + 16 @@ -703,7 +881,7 @@ Mon compte - 22 + 20 @@ -714,7 +892,7 @@ Mes vidéos - 26 + 24 @@ -725,14 +903,14 @@ Se déconnecter - 30 + 28 Create an account Créer un compte - 39 + 37 @@ -746,49 +924,49 @@ Subscriptions Abonnements - 47 + 45 Overview Vue d'ensemble - 52 + 50 Trending Tendances - 57 + 55 Recently added Récemment ajoutées - 62 + 60 Local Locales - 67 + 65 More Plus - 72 + 70 Administration Administration - 76 + 74 @@ -802,14 +980,42 @@ Show keyboard shortcuts Montrer les raccourcis clavier - 91 + 89 Toggle dark interface (Dés)activer le thème sombre - 94 + 92 + + + + View your notifications + Voir vos notifications + + 3 + + + + Notifications + Notifications + + 10 + + + + Update your notification preferences + Mettre à jour vos préférences de notification + + 15 + + + + See all your notifications + Voir toutes vos notifications + + 22 @@ -914,14 +1120,14 @@ Display unlisted and private videos Afficher les vidéos privées et non répertoriées - 11 + 14 No results. Aucun résultat. - 17 + 20 @@ -979,14 +1185,64 @@ 7 - - - About instance - - - À propos de l'instance : + + Contact administrator + Contacter l'administrateur de - 1 + 3 + + + + Your name + Votre nom + + 11 + + + + Your email + Votre mail + + 20 + + + + Your message + Votre message + + 29 + + + + + Cancel + + + Annuler + + + 26 + + + + Submit + Envoyer + + 31 + + + + About instance + À propos de l'instance + + 4 + + + + Contact administrator + Contact de l'administrateur + + 6 @@ -1000,47 +1256,47 @@ Terms Conditions d'utilisation - 44 + 39 User registration is allowed and La création de comptes utilisateurs est autorisée et - 25 + 29 - + - this instance provides a baseline quota of space for the videos of its users. - + this instance provides a baseline quota of space for the videos of its users. + - cette instance fournit un quota de base de pour les vidéos de ses utilisateurs. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - cette instance met à disposition de ses utilisateurs un espace de stockage vidéo illimité. - + cette instance propose un quota d'espace de pour les vidéos de ses utilisateurs. + 31 - + - User registration is currently not allowed. - + this instance provides unlimited space for the videos of its users. + - Vous ne pouvez pas créer de comptes utilisateurs pour le moment. - + cette instance propose un espace illimité pour les vidéos de ses utilisateurs. + - 36 + 35 + + + + + User registration is currently not allowed. + + + La création de nouveaux compte n'est pas autorisée pour l'instant. + + + 40 @@ -1397,49 +1653,49 @@ Short description Courte description - 22 + 21 Default client route Route du client par défaut - 55 + 48 Videos Overview Vue d'ensemble des vidéos - 58 + 51 Videos Trending Vidéos tendance - 59 + 52 Videos Recently Added Vidéos récemment ajoutées - 60 + 53 Local videos Vidéos locales - 61 + 54 Policy on videos containing sensitive content Politique concernant les vidéos ayant du contenu sensible - 70 + 61 @@ -1474,23 +1730,44 @@ Signup enabled Enregistrement activé - 93 + 84 Signup requires email verification L'inscription requiert la vérification par courriel - 100 + 91 Signup limit Limitation des enregistrements + + 96 + + + + Users + Utilisateurs 105 + + User default video quota + Quota de vidéos par défaut par utilisateur + + 109 + + + + User default daily upload limit + La limite journalière de téléversement est atteinte + + 121 + + Import Importer @@ -1502,49 +1779,35 @@ Video import with HTTP URL (i.e. YouTube) enabled Import de vidéo via une URL (YouTube par exemple) activé - 120 + 141 Video import with a torrent file or a magnet URI enabled Import de vidéo avec un fichier torrent ou URL magnet activé - 127 + 148 Administrator Administrateur - 131 + 155 Admin email Email de l'administrateur - 134 + 158 - - Users - Utilisateurs + + Enable contact form + Activer le formulaire de contact - 144 - - - - User default video quota - Quota de vidéos par défaut par utilisateur - - 147 - - - - User default daily upload limit - La limite journalière de téléversement est atteinte - - 161 + 169 @@ -1565,21 +1828,32 @@ Your Twitter username Votre identifiant Twitter - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Indique le compte Twitter pour le site ou la plateforme sur laquelle le contenu a été publié. - 184 + 187 Instance whitelisted by Twitter Instance sur la liste blanche de Twitter - 198 + 199 + + + + If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br /> + If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.<br /><br /> + Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> to see if you instance is whitelisted. + Si votre instance est autorisée par Twitter, un lecteur de vidéo sera inséré dans le flux Twitter pour les partages de vidéo depuis PeerTube.<br /> + Si votre instance n'est pas autorisée, une carte sera inséré avec une image et un lien vers votre instance PeerTube.<br /><br /> + Selectionnez cette case, sauvegardez la configuration et pour tester si votre instance est autorisée par Twitter, insérez l'URL d'une vidéo de votre instance (https://example.com/videos/watch/blabla) sur <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a>. + + 200 @@ -1593,35 +1867,49 @@ Transcoding Encodage - 210 + 215 Transcoding enabled Encodage activé - 215 + 221 If you disable transcoding, many videos from your users will not work! Si vous désactivez le transcodage, de nombreuses vidéos d'utilisateurs ne fonctionneront pas ! - 216 + 222 + + + + Allow additional extensions + Permettre des extensions additionnelles + + 231 + + + + Allow your users to upload .mkv, .mov, .avi, .flv videos + Autoriser vos utilisateurs à publier des vidéos .mkv, .mov, .avi et .flv. + + 232 Transcoding threads Nombre de threads pour l'encodage - 223 + 237 Resolution enabled Résolution activée - 239 + 252 @@ -1636,105 +1924,105 @@ - 244 + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Certain fichiers ne sont pas fédérés (miniature, sous-titre). Nous les récupérons directement depuis l'instance d'origine et nous les gardons en cache. - 249 + 265 Previews cache size Taille du cache des prévisualisations - 254 + 271 Video captions cache size Taille du cache des sous-titres - 265 + 280 Customizations Personnalisations - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Écrivez directement du code JavaScript.<br />Exemple : <pre>console.log('mon instance est super géniale');</pre> - 281 + 297 - + - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> + Write directly CSS code. Example:<br /> + <pre> + body + background-color: red; + + </pre> - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - + Prepend with <em>#custom-css</em> to override styles. Example: + <pre> + #custom-css .logged-in-email + color: red; + + </pre> + - Écrivez directement du code CSS. Exemple :<br /> - <pre> - body - background-color: red; - - </pre> + Écrivez directement du code CSS. Par exemple:<br /> + <pre> + body + background-color: red; + + </pre> - Ajoutez le préfixe <em>#custom-css</em> pour remplacer les styles. Exemple: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - + Ajoutez le préfixe <em>#custom-css</em> pour surcharger les styles. Par exemple: + <pre> + #custom-css .logged-in-email + color: red; + + </pre> + - 297 + 311 Advanced configuration Configuration avancée - 207 + 212 Update configuration Mettre à jour la configuration - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Il semblerait que la configuration soit invalide. Merci de chercher des erreurs potentielles dans les différents onglets. - 326 + 341 @@ -2026,11 +2314,25 @@ 133 + + User's email must be verified to login + L'adresse mail de l'utilisateur doit être vérifiée afin de se connecter + + 72 + + + + User's email is verified / User can login without email verification + L'adresse mail de l'utilisateur est vérifié / L'utilisateur peut se connecter sans vérification mail + + 76 + + Ban reason: Raison du bannissement : - 92 + 95 @@ -2097,7 +2399,7 @@ Actions Actions - 33 + 35 @@ -2132,14 +2434,14 @@ Date Date - 10 + 11 Blacklist reason: Raison de mise sur liste noire : - 41 + 43 @@ -2198,69 +2500,6 @@ 23 - - My settings - Mes paramètres - - 3 - - - - My library - Ma bibliothèque - - 7 - - - - My channels - Mes chaînes - - 12 - - - - My videos - Mes vidéos - - 14 - - - - My subscriptions - Mes abonnements - - 16 - - - - My imports - Mes imports - - 18 - - - - Misc - Divers - - 24 - - - - Muted instances - Instances muettes - - 2 - - - - Ownership changes - Changements de propriétaires - - 33 - - Video quota: Quota de vidéos : @@ -2272,21 +2511,21 @@ Profile Profil - 8 + 7 Video settings Paramètres de la vidéo - 15 + 16 Danger zone Zone dangereuse - 18 + 19 @@ -2314,13 +2553,6 @@ 35 - - Submit - Envoyer - - 24 - - - views - vues @@ -2480,6 +2712,55 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au 47 + + Muted instances + Instances muettes + + 2 + + + + History enabled + Historique activé + + 4 + + + + Delete history + Supprimer l'historique + + 8 + + + + You don't have videos history yet. + Vous n'avez pas d'historique de vidéos pour l'instant. + + 13 + + + + views + vues + + 22 + + + + Notification preferences + Préférences de notification + + 2 + + + + Mark all as read + Tout marqué comme lu + + 4 + + Change password Changer le mot de passe @@ -2578,6 +2859,20 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au 4 + + Activities + Activités + + 2 + + + + Web + Web + + 3 + + Sorry, but we couldn't find the page you were looking for. @@ -2686,6 +2981,13 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 159 + + Sorry, but something went wrong + Désolé, mais quelque chose s'est mal passé + + 49 + + Congratulations, the video behind will be imported! You can already add information about this video. @@ -2722,14 +3024,14 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute Publish will be available when upload is finished Vous pourrez publier cette vidéo lorsque l'envoi sera terminé - 53 + 58 Publish Publier - 60 + 65 @@ -2912,14 +3214,14 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute Wait transcoding before publishing the video Attendre l'encodage avant de publier la vidéo - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Si vous décidez de ne pas attendre la fin du traitement avant la publication de la vidéo, elle pourrait bien être injouable. - 131 + 132 @@ -2933,49 +3235,49 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute Add another caption Ajouter un nouveau sous-titre - 146 + 147 See the subtitle file Voir le fichier de sous-titres - 155 + 156 Already uploaded ✔ Déjà téléversé ✔ - 159 + 160 Will be created on update Sera créé après la mise à jour - 167 + 168 Cancel create Annuler la création - 169 + 170 Will be deleted on update Sera supprimé après la mise à jour - 175 + 176 Cancel deletion Annuler la suppression - 177 + 178 @@ -2986,28 +3288,28 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute Pas de sous-titres pour le moment. - 182 + 183 Captions Sous-titres - 139 + 140 Upload thumbnail Téléverser une vignette - 195 + 196 Upload preview Téléverser un aperçu - 202 + 203 @@ -3021,14 +3323,14 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute Short text to tell people how they can support you (membership platform...). Courte description des moyens qu'ont les utilisateurs de vous soutenir (financement participatif, etc.). - 209 + 210 Advanced settings Paramétrage avancé - 190 + 191 @@ -3095,15 +3397,17 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 3 - + - Cancel - + Your report will be sent to moderators of . + It will be forwarded to origin instance too. + - Annuler - + Votre signalement sera envoyé aux modérateurs de . + Il sera également transmis à l'instance d'origine + - 19 + 9 @@ -3491,9 +3795,23 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 14 - - Error getting about from server - Erreur lors de la récupération des informations 'à propos' du serveur + + Cannot get about information from server + Impossible d'obtenir la description du serveur + + 1 + + + + Your message has been sent. + Votre message a été envoyé + + 1 + + + + You already sent this form recently + Vous avez déjà rempli ce formulaire récemment 1 @@ -3519,13 +3837,6 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Error - Erreur - - 1 - - 240p 240p @@ -3568,13 +3879,6 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Success - Réussite - - 1 - - Configuration updated. La configuration a été mise à jour. @@ -3841,6 +4145,13 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + Set Email as Verified + Définir l'adresse mail comme vérifiée + + 1 + + You cannot ban root. Vous ne pouvez pas bannir root. @@ -3883,6 +4194,13 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + users email set as verified. + adresses mail d'utilisateurs ont été vérifiées. + + 1 + + Account unmuted. Compte réactivé. @@ -3897,6 +4215,48 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + My videos history + Mon historique de vidéos + + 1 + + + + Videos history is enabled + Historique de vidéos activé + + 1 + + + + Videos history is disabled + Historique de vidéos désactivé + + 1 + + + + Delete videos history + Supprimer l'historique de vidéos + + 1 + + + + Are you sure you want to delete all your videos history? + Êtes vous sur de vouloir supprimer toutes les vidéos de votre historique ? + + 1 + + + + Videos history deleted + Historique de vidéos supprimé + + 1 + + Ownership accepted Changement de propriété accepté @@ -3946,6 +4306,76 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + New video from your subscriptions + Nouvelle vidéo depuis vos souscriptions + + 1 + + + + New comment on your video + Nouveau commentaire sur votre vidéo + + 1 + + + + New video abuse on local video + Nouveau signalement sur une vidéo locale + + 1 + + + + One of your video is blacklisted/unblacklisted + Une de vos vidéos a été bloquée/débloquée + + 1 + + + + Video published (after transcoding/scheduled update) + Vidéo publiée (après transcodage / mise à jour programmée) + + 1 + + + + Video import finished + Import de vidéo terminé + + 1 + + + + A new user registered on your instance + Nouveau compte créé sur votre instance + + 1 + + + + You or your channel(s) has a new follower + Vous (ou votre chaîne) avez un nouveau suiveur + + 1 + + + + Someone mentioned you in video comments + Quelqu'un vous a mentionné dans les commentaires d'une vidéo + + 1 + + + + Preferences saved + Préférences sauvegardées + + 1 + + Profile updated. Profil mis à jour. @@ -3995,20 +4425,6 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Voulez-vous vraiment supprimer ? Ceci supprimera aussi toutes les vidéos téléversées dans cette chaîne. - - 1 - - - - Please type the name of the video channel to confirm - Merci de confirmer le nom de la chaîne - - 1 - - Video channel deleted. Chaîne vidéo supprimée. @@ -4016,6 +4432,13 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + My videos + Mes vidéos + + 1 + + Do you really want to delete videos? Souhaitez-vous vraiment supprimer vidéos ? @@ -4086,16 +4509,58 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Channels - Chaînes + + My library + Ma bibliothèque 1 - - Video imports - Importations de vidéos + + My channels + Mes chaînes + + 1 + + + + My subscriptions + Mes abonnements + + 1 + + + + My history + Mon historique + + 1 + + + + Misc + Divers + + 1 + + + + Ownership changes + Changements de propriétaires + + 1 + + + + My settings + Mes paramètres + + 1 + + + + My notifications + Mes notifications 1 @@ -4221,6 +4686,13 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + Error + Erreur + + 1 + + You need to reconnect. Vous devez vous reconnecter. @@ -4242,6 +4714,20 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + Info + Info + + 1 + + + + Success + Réussite + + 1 + + Incorrect username or password. Nom d'utilisateur ou mot de passe incorrects. @@ -4459,6 +4945,62 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + Email is required. + Le courriel est requis. + + 1 + + + + Email must be valid. + Le courriel doit être valide. + + 1 + + + + Your name is required. + Votre nom doit être rempli. + + 1 + + + + Your name must be at least 1 character long. + Votre nom doit contenir au moins un caractère. + + 1 + + + + Your name cannot be more than 120 characters long. + Votre nom ne peut pas contenir plus de 120 caractères. + + 1 + + + + A message is required. + Votre message doit être rempli. + + 1 + + + + The message must be at least 3 characters long. + Votre message doit contenir au moins 3 caractères. + + 1 + + + + The message cannot be more than 5000 characters long. + Le message ne peut pas contenir plus de 5000 caractères. + + 1 + + Username is required. Le nom d'utilisateur est requis. @@ -4480,37 +5022,23 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Username must be at least 3 characters long. - Le nom d'utilisateur doit être composé d'au moins 3 caractères. + + Username must be at least 1 character long. + Votre nom d'utilisateur doit contenir au moins un caractère. 1 - - Username cannot be more than 20 characters long. - Le nom d'utilisateur ne peut pas faire plus de 20 caractères. + + Username cannot be more than 50 characters long. + Votre nom d'utilisateur ne peut pas contenir plus de 50 caractères. 1 - - Username should be only lowercase alphanumeric characters. - Le nom d'utilisateur ne doit être composé que de caractères alphanumériques en minuscule. - - 1 - - - - Email is required. - Le courriel est requis. - - 1 - - - - Email must be valid. - Le courriel doit être valide. + + Username should be lowercase alphanumeric; dots and underscores are allowed. + Le nom d'utilisateur peut contenir des minuscules, des chiffres, des points et des tirets bas. 1 @@ -4578,16 +5106,16 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Display name must be at least 3 characters long. - Le nom d'affichage doit être composé d'au moins 3 caractères. + + Display name must be at least 1 character long. + Votre nom affiché doit contenir au moins un caractère. 1 - - Display name cannot be more than 120 characters long. - Le nom d'affichage ne peut pas faire plus de 120 caractères. + + Display name cannot be more than 50 characters long. + Votre nom affiché ne peut pas contenir plus de 50 caractères. 1 @@ -4641,13 +5169,6 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Report reason cannot be more than 300 characters long. - La raison du signalement ne peut pas dépasser 300 caractères. - - 1 - - Moderation comment is required. Un commentaire de modération est requis. @@ -4662,13 +5183,6 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Moderation comment cannot be more than 300 characters long. - Le commentaire de modération doit faire au plus 300 caractères. - - 1 - - The channel is required. La chaîne est requise. @@ -4725,23 +5239,23 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Name must be at least 3 characters long. - Le nom doit faire au moins 3 caractères. + + Name must be at least 1 character long. + Le nom doit contenir au moins un caractère. 1 - - Name cannot be more than 20 characters long. - Le nom doit faire au plus 20 caractères. + + Name cannot be more than 50 characters long. + Le nom ne peut pas contenir plus de 50 caractères. 1 - - Name should be only lowercase alphanumeric characters. - Le nom doit contenir seulement des caractères alphanumériques minuscules. + + Name should be lowercase alphanumeric; dots and underscores are allowed. + Le nom peut contenir des minuscules, des chiffres, des points et des tirets bas. 1 @@ -5425,6 +5939,13 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + User email set as verified + L'adresse mail de l'utilisateur a été vérifiée + + 1 + + Account muted. Comptes muets. @@ -5551,13 +6072,6 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Subscribed - Abonné - - 1 - - Subscribed to Abonné à @@ -5565,9 +6079,9 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Unsubscribed - Désabonné + + Subscribed + Abonné 1 @@ -5579,6 +6093,13 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + Unsubscribed + Désabonné + + 1 + + Moderator Modérateur @@ -5607,6 +6128,20 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + Welcome! Now please check your emails to verify your account and complete signup. + Bienvenue ! Veuillez maintenant consulter vos mails afin de vérifier votre compte et compéter l'inscription. + + 1 + + + + You are now logged in as ! + Vous êtes maintenant connecté en tant que ! + + 1 + + Video to import updated. Les vidéos à importer ont été mises à jour @@ -5635,13 +6170,6 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Info - Info - - 1 - - Upload cancelled Mise en ligne annulée @@ -5649,13 +6177,6 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Désolé, mais PeerTube ne gère pas les vidéos d'une taille > 8 Go - - 1 - - Your video quota is exceeded with this video (video size: , used: , quota: ) Votre quota est dépassé avec cette vidéo (taille de la vidéo : , used: , quota: ) diff --git a/client/src/locale/target/angular_gl_ES.xml b/client/src/locale/target/angular_gl_ES.xml index e2695304b..ab07180b2 100644 --- a/client/src/locale/target/angular_gl_ES.xml +++ b/client/src/locale/target/angular_gl_ES.xml @@ -103,7 +103,7 @@ Password Contrasinal - 12 + 13 @@ -117,7 +117,7 @@ Login Conectar - 38 + 36 @@ -145,7 +145,7 @@ Send me an email to reset my password Envíenme un correo para restablecer o contrasinal - 75 + 80 @@ -202,7 +202,7 @@ Signup Abrir conta - 88 + 78 @@ -238,14 +238,14 @@ Change the language Cambiar o idioma - 88 + 86 Create an account Crear unha conta - 39 + 37 @@ -259,35 +259,35 @@ Trending En voga - 57 + 55 Recently added Últimos engadidos - 62 + 60 Local Local - 67 + 65 More Máis - 72 + 70 Administration Administración - 76 + 74 @@ -399,7 +399,7 @@ No results. Sin resultados. - 17 + 20 @@ -416,17 +416,6 @@ 7 - - - About instance - - - Acerca da instancia - - - 1 - - Description Descrición @@ -438,47 +427,14 @@ Terms Termos - 44 + 39 User registration is allowed and O rexistro está aberto e - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - esta instancia proporciona unha cota inicial de para os vídeos das súas usuarias. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - esta instancia non limita o espazo para os videos das súas usuarias. - - - 31 - - - - - User registration is currently not allowed. - - - En este momento non está aberto o rexistro de novas usuarias. - - - 36 + 29 @@ -744,42 +700,42 @@ Short description Descrición curta - 22 + 21 Default client route Ruta ao cliente por omisión - 55 + 48 Videos Trending Vídeos de moda - 59 + 52 Videos Recently Added Vídeos engadidos recentemente - 60 + 53 Local videos Vídeos en local - 61 + 54 Policy on videos containing sensitive content Política para os vídeos con contido sensible - 70 + 61 @@ -814,16 +770,30 @@ Signup enabled Rexistro activado - 93 + 84 Signup limit Rexistro limitado + + 96 + + + + Users + Usuarias 105 + + User default video quota + Cota de vídeo por omisión para a usuaria + + 109 + + Import Importar @@ -835,35 +805,21 @@ Video import with a torrent file or a magnet URI enabled Importación de vídeo con un ficheiro torrent ou URI magnet activada - 127 + 148 Administrator Administración - 131 + 155 Admin email Correo-e da Admin - 134 - - - - Users - Usuarias - - 144 - - - - User default video quota - Cota de vídeo por omisión para a usuaria - - 147 + 158 @@ -884,21 +840,21 @@ Your Twitter username O seu alcume na Twitter - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Indica a conta na Twitter para o sitio web ou plataforma para a cal o contido foi publicado. - 184 + 187 Instance whitelisted by Twitter Instancia na lista blanca por Twitter - 198 + 199 @@ -912,98 +868,98 @@ Transcoding Recodificando - 210 + 215 Transcoding enabled Recodificación activada - 215 + 221 If you disable transcoding, many videos from your users will not work! Si desactiva a recodificación moitos vídeos das súas usuarias non funcionarán! - 216 + 222 Transcoding threads Fíos de recodificación - 223 + 237 Resolution enabled Resolución activada - 239 + 252 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Algúns ficheiros non se federan (vista previa, comentarios). Recollémolos directamente desde a instancia de orixe e almacenámolos. - 249 + 265 Previews cache size Tamaño da caché de vista previa - 254 + 271 Video captions cache size Tamaño da caché de comentarios no vídeo - 265 + 280 Customizations Personalizacións - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Escribir código JavaScript directamente.<br />Exemplo: <pre>console.log('a miña instancia é tremenda');</pre> - 281 + 297 Advanced configuration Configuración avanzada - 207 + 212 Update configuration Actualizar configuración - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Semella que a configuración non é válida. Por favor busque os erros potenciais nas diferentes pestanas. - 326 + 341 diff --git a/client/src/locale/target/angular_it_IT.xml b/client/src/locale/target/angular_it_IT.xml index 2f5178484..c3bcc704c 100644 --- a/client/src/locale/target/angular_it_IT.xml +++ b/client/src/locale/target/angular_it_IT.xml @@ -479,7 +479,7 @@ Password Password - 12 + 13 @@ -493,7 +493,7 @@ Login Accedi - 38 + 36 @@ -521,7 +521,7 @@ Send me an email to reset my password Inviami un email per resettare la password - 75 + 80 @@ -585,7 +585,7 @@ Signup Registrati - 88 + 78 @@ -655,7 +655,7 @@ Change the language Cambia lingua - 88 + 86 @@ -666,7 +666,7 @@ Il mio profilo pubblico - 18 + 16 @@ -677,7 +677,7 @@ Il mio account - 22 + 20 @@ -688,7 +688,7 @@ I miei video - 26 + 24 @@ -699,14 +699,14 @@ Esci - 30 + 28 Create an account Crea un account - 39 + 37 @@ -720,49 +720,49 @@ Subscriptions Iscrizioni - 47 + 45 Overview Panoramica - 52 + 50 Trending Popolari - 57 + 55 Recently added Aggiunti di recente - 62 + 60 Local Locali - 67 + 65 More Altro - 72 + 70 Administration Amministrazione - 76 + 74 @@ -776,14 +776,14 @@ Show keyboard shortcuts Mostra scorciatoie della tastiera - 91 + 89 Toggle dark interface (Dis)attiva l'interfaccia sicura - 94 + 92 @@ -888,14 +888,14 @@ Display unlisted and private videos Mostra video privati e non elencati - 11 + 14 No results. Nessun risultato. - 17 + 20 @@ -953,15 +953,22 @@ 7 - + - About instance - + Cancel + - Riguardo all'istanza - + Annulla + - 1 + 26 + + + + Submit + Invia + + 31 @@ -975,47 +982,14 @@ Terms Termini - 44 + 39 User registration is allowed and È permessa la registrazione di nuovi utenti e - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - questa istanza fornisce una quota base di per i video dei suoi utenti. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - questa istanza fornisce spazio illimitato per i video dei suoi utenti. - - - 31 - - - - - User registration is currently not allowed. - - - La registrazione di nuovi utenti al momento non è permessa. - - - 36 + 29 @@ -1359,49 +1333,49 @@ Short description Breve descrizione - 22 + 21 Default client route Percorso predefinito del client - 55 + 48 Videos Overview Panoramica dei video - 58 + 51 Videos Trending Video popolari - 59 + 52 Videos Recently Added Video aggiunti di recente - 60 + 53 Local videos Video locali - 61 + 54 Policy on videos containing sensitive content Policy su video che contengono contenuti sensibili - 70 + 61 @@ -1436,23 +1410,44 @@ Signup enabled Registrazione abilitata - 93 + 84 Signup requires email verification La registrazione richiede una verifica via email - 100 + 91 Signup limit Limite registrazioni + + 96 + + + + Users + Utenti 105 + + User default video quota + Quota standard per i video dell'utente + + 109 + + + + User default daily upload limit + Limite giornaliero per il caricamento + + 121 + + Import Carica @@ -1464,49 +1459,28 @@ Video import with HTTP URL (i.e. YouTube) enabled Importazione video con indirizzo HTTP (es. YouTube) abilitata - 120 + 141 Video import with a torrent file or a magnet URI enabled Carica video con un file torrent o un URI magnete attivo - 127 + 148 Administrator Amministratore - 131 + 155 Admin email Email Amministratore - 134 - - - - Users - Utenti - - 144 - - - - User default video quota - Quota standard per i video dell'utente - - 147 - - - - User default daily upload limit - Limite giornaliero per il caricamento - - 161 + 158 @@ -1527,21 +1501,21 @@ Your Twitter username Il tuo username Twitter - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Indica l'account Twitter per il sito web o la piattaforma in cui il contenuto e' stato pubblicato. - 184 + 187 Instance whitelisted by Twitter Istanza inserita in white list da Twitter - 198 + 199 @@ -1555,35 +1529,35 @@ Transcoding Trascrizione - 210 + 215 Transcoding enabled Trascrizione attivata - 215 + 221 If you disable transcoding, many videos from your users will not work! Se disatitvi la trascrizione, molti video dai tuoi utenti non funzioneranno. - 216 + 222 Transcoding threads Trascrizione thread - 223 + 237 Resolution enabled Risoluzione abilitata - 239 + 252 @@ -1598,82 +1572,47 @@ - 244 + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Alcuni file non sono federati (anteprime, sottotitoli). Li recuperiamo direttamente dall'istanza di origine e li mettiamo in cache. - 249 + 265 Previews cache size Dimensione del cache per la previsualizzazione - 254 + 271 Video captions cache size Dimensione - 265 + 280 Customizations Personalizzazioni - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Scrivi direttamente codice JavaScript .<br />Esempio: <pre>console.log('La mia istanza spacca!');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - Scrivi direttamente codice CSS .Esempio:<br /> - <pre> - body - background-color: red; - - </pre> - - Precedi con <em>#custom-css</em> per sovrascrivere stili. Esempio: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1682,21 +1621,21 @@ Advanced configuration Configurazione avanzata - 207 + 212 Update configuration Aggiorna configurazione - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Sembra che la configurazione sia valida. Per favore cerca potenziali errori nelle altre tab - 326 + 341 @@ -1979,7 +1918,7 @@ Ban reason: Motivo ban: - 92 + 95 @@ -2044,7 +1983,7 @@ Actions Azioni - 33 + 35 @@ -2079,14 +2018,14 @@ Date Data - 10 + 11 Blacklist reason: motivo per essere in Blacklist: - 41 + 43 @@ -2138,69 +2077,6 @@ 23 - - My settings - Le mie impostazioni - - 3 - - - - My library - La mia libreria - - 7 - - - - My channels - I miei canali - - 12 - - - - My videos - I miei video - - 14 - - - - My subscriptions - Le mie sottoscrizioni - - 16 - - - - My imports - Le mie importazioni - - 18 - - - - Misc - Altro - - 24 - - - - Muted instances - Istanze silenziate - - 2 - - - - Ownership changes - Cambi di proprietario - - 33 - - Video quota: Quota video: @@ -2212,21 +2088,21 @@ Profile Profilo - 8 + 7 Video settings Impostazione video - 15 + 16 Danger zone Zona pericolosa - 18 + 19 @@ -2254,13 +2130,6 @@ 35 - - Submit - Invia - - 24 - - - views - visualizzazioni @@ -2420,6 +2289,13 @@ Quando tu carichi un video su questo canale. il campo di supporto per il video v 47 + + Muted instances + Istanze silenziate + + 2 + + Change password Cambia password @@ -2650,14 +2526,14 @@ Quando tu carichi un video su questo canale. il campo di supporto per il video v Publish will be available when upload is finished La pubblicazione sarà disponibile quando il caricamento sarà completato - 53 + 58 Publish Pubblica - 60 + 65 @@ -2836,12 +2712,12 @@ Quando tu carichi un video su questo canale. il campo di supporto per il video v Wait transcoding before publishing the videoWait transcoding before publishing the video - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends.If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. - 131 + 132 @@ -2855,45 +2731,45 @@ Quando tu carichi un video su questo canale. il campo di supporto per il video v Add another caption Aggiungi un'altra descrizione - 146 + 147 See the subtitle file Guarda il file dei sottotitoli - 155 + 156 Cancel create Annulla creazione - 169 + 170 Cancel deletion Annulla creazione - 177 + 178 CaptionsCaptions - 139 + 140 Upload thumbnail Carica miniatura - 195 + 196 Upload previewUpload preview - 202 + 203 @@ -2905,14 +2781,14 @@ Quando tu carichi un video su questo canale. il campo di supporto per il video v Short text to tell people how they can support you (membership platform...).Short text to tell people how they can support you (membership platform...). - 209 + 210 Advanced settings Impostazioni avanzate - 190 + 191 @@ -2972,17 +2848,6 @@ Quando tu carichi un video su questo canale. il campo di supporto per il video v 3 - - - Cancel - - - Annulla - - - 19 - - Share Condividi @@ -3305,13 +3170,6 @@ Altri video 14 - - Error getting about from server - Errore durante la comunicazione con il server - - 1 - - No description Nessuna descrizione @@ -3333,13 +3191,6 @@ Altri video 1 - - Error - Errore - - 1 - - 240p 240p @@ -3354,11 +3205,6 @@ Altri video 1 - - SuccessSuccess - 1 - - Configuration updated. Configurazione aggiornata. @@ -3724,20 +3570,6 @@ Altri video 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Vuoi veramente eliminare ? Questo eliminerá anche tutti i video caricati su questo canale. - - 1 - - - - Please type the name of the video channel to confirm - Per favore digita il nome del canale video per confermare - - 1 - - Video channel deleted. Il canale video è stato cancellato. @@ -3745,6 +3577,13 @@ Altri video 1 + + My videos + I miei video + + 1 + + Do you really want to delete videos? Vuoi veramente cancellare video? @@ -3811,16 +3650,44 @@ Altri video 1 - - Channels - Canali + + My library + La mia libreria 1 - - Video imports - Caricamenti video + + My channels + I miei canali + + 1 + + + + My subscriptions + Le mie sottoscrizioni + + 1 + + + + Misc + Altro + + 1 + + + + Ownership changes + Cambi di proprietario + + 1 + + + + My settings + Le mie impostazioni 1 @@ -3862,6 +3729,13 @@ Altri video 1 + + Error + Errore + + 1 + + You need to reconnect. Devi riconnetterti. @@ -3883,6 +3757,18 @@ Altri video 1 + + Info + Informazioni + + 1 + + + + SuccessSuccess + 1 + + Incorrect username or password. Username or password non corretti @@ -4100,6 +3986,20 @@ Altri video 1 + + Email is required. + L'email è richiesta. + + 1 + + + + Email must be valid. + L'email deve essere valida. + + 1 + + Username is required. L'username è necessario. @@ -4121,41 +4021,6 @@ Altri video 1 - - Username must be at least 3 characters long. - L'username deve essere almeno di 3 caratteri. - - 1 - - - - Username cannot be more than 20 characters long. - L'username non può essere più di 20 caratteri. - - 1 - - - - Username should be only lowercase alphanumeric characters. - L'username dovrebbe essere solo in minuscolo e contenere solo alfanumerici. - - 1 - - - - Email is required. - L'email è richiesta. - - 1 - - - - Email must be valid. - L'email deve essere valida. - - 1 - - Password must be at least 6 characters long. La password deve essere lunga almeno 6 caratteri. @@ -4219,16 +4084,6 @@ Altri video 1 - - Display name must be at least 3 characters long.Display name must be at least 3 characters long. - 1 - - - - Display name cannot be more than 120 characters long.Display name cannot be more than 120 characters long. - 1 - - Description must be at least 3 characters long. La descrizione deve avere al minino 3 caratteri. @@ -4271,13 +4126,6 @@ Altri video 1 - - Report reason cannot be more than 300 characters long. - Il motivo per la segnalazione non può essere più lungo di 300 caratteri. - - 1 - - Moderation comment is required. Il commento di moderazione è richiesto. @@ -4292,13 +4140,6 @@ Altri video 1 - - Moderation comment cannot be more than 300 characters long. - Il commento di moderazione non può essere più lungo di 300 caratteri. - - 1 - - The channel is required. Il canale è richiesto. @@ -4320,27 +4161,6 @@ Altri video 1 - - Name must be at least 3 characters long. - Il nome deve essere al minimo lunguo di tre caratteri. - - 1 - - - - Name cannot be more than 20 characters long. - Il nome non deve superare i 20 caratteri. - - 1 - - - - Name should be only lowercase alphanumeric characters. - Il nome deve contenire solo caratteri minuscoli ed alfanumerichi; - - 1 - - Comment is required. Un commento è necessario. @@ -5000,13 +4820,6 @@ Altri video 1 - - Subscribed - Iscritto - - 1 - - Subscribed to Iscritto a @@ -5014,9 +4827,9 @@ Altri video 1 - - Unsubscribed - Disiscritto + + Subscribed + Iscritto 1 @@ -5028,6 +4841,13 @@ Altri video 1 + + Unsubscribed + Disiscritto + + 1 + + Moderator Moderatore @@ -5084,13 +4904,6 @@ Altri video 1 - - Info - Informazioni - - 1 - - Upload cancelled Caricamento annullato. @@ -5098,13 +4911,6 @@ Altri video 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Ci dispiace ma PeerTube non può gestire video di dimensioni > 8GB - - 1 - - Your video quota is exceeded with this video (video size: , used: , quota: ) La tua quota è stata superata con questo video (dimensione del video: , stai utilizzando: , quota: ) diff --git a/client/src/locale/target/angular_ja_JP.xml b/client/src/locale/target/angular_ja_JP.xml index d0b592098..04bd5089a 100644 --- a/client/src/locale/target/angular_ja_JP.xml +++ b/client/src/locale/target/angular_ja_JP.xml @@ -342,7 +342,7 @@ Password パスワード - 12 + 13 @@ -356,7 +356,7 @@ Login ログイン - 38 + 36 @@ -382,7 +382,7 @@ Send me an email to reset my password 新しいパスワードをメールで送る - 75 + 80 @@ -444,7 +444,7 @@ Signup サインアップ - 88 + 78 @@ -456,7 +456,7 @@ Change the languageChange the language - 88 + 86 @@ -465,7 +465,7 @@ マイアカウント - 22 + 20 @@ -474,7 +474,7 @@ マイビデオ - 26 + 24 @@ -483,14 +483,14 @@ ログアウト - 30 + 28 Create an account アカウントを作成する - 39 + 37 @@ -504,47 +504,47 @@ Subscriptions サブスクリプション - 47 + 45 Overview 調査 - 52 + 50 TrendingTrending - 57 + 55 Recently added 最近追加された - 62 + 60 Local 地元 - 67 + 65 More 多くの - 72 + 70 Administration 運営 - 76 + 74 @@ -635,7 +635,7 @@ No results. 結果がありません。 - 17 + 20 @@ -682,6 +682,24 @@ 7 + + + Cancel + + + キャンセル + + + 26 + + + + Submit + 差し出す + + 31 + + Description 説明 @@ -693,23 +711,14 @@ Terms 条項 - 44 + 39 User registration is allowed and ユーザー登録が可能です - 25 - - - - - User registration is currently not allowed. - - ユーザー登録は現在受け付けておりません - - 36 + 29 @@ -762,14 +771,14 @@ Short description 簡単な説明 - 22 + 21 Videos Overview ビデオの概要 - 58 + 51 @@ -790,19 +799,26 @@ Signup enabled サインアップが有効 - 93 + 84 Signup requires email verification サインアップには電子メールの確認が必要です - 100 + 91 Signup limit サインアップの制限 + + 96 + + + + Users + ユーザー 105 @@ -818,28 +834,21 @@ Video import with a torrent file or a magnet URI enabled Torrent ファイル または magnet リンクを使用して動画をインポートする - 127 + 148 Administrator 管理者 - 131 + 155 Admin email 管理者の電子メール - 134 - - - - Users - ユーザー - - 144 + 158 @@ -860,7 +869,7 @@ Your Twitter username あなたのTwitterユーザー名 - 181 + 184 @@ -874,47 +883,47 @@ Transcoding トランスコード - 210 + 215 Transcoding enabled トランスコードが有効になっています - 215 + 221 Transcoding threadsTranscoding threads - 223 + 237 Customizations カスタマイズ - 275 + 289 JavaScript JavaScript - 278 + 294 Advanced configuration 高度な構成 - 207 + 212 Update configuration 設定を更新する - 325 + 340 @@ -1037,7 +1046,7 @@ Ban reason: 禁止理由： - 92 + 95 @@ -1086,7 +1095,7 @@ Actions 行動 - 33 + 35 @@ -1110,46 +1119,25 @@ 2 - - My subscriptions - 私の輸入品 - - 16 - - - - My imports - 私の購読 - - 18 - - - - Ownership changes - 所有権の変更 - - 33 - - Profile プロフィール - 8 + 7 Video settings ビデオ設定 - 15 + 16 Danger zone 危険区域 - 18 + 19 @@ -1159,13 +1147,6 @@ 46 - - Submit - 差し出す - - 24 - - Cancel @@ -1307,7 +1288,7 @@ Publish 出す - 60 + 65 @@ -1384,17 +1365,6 @@ 3 - - - Cancel - - - キャンセル - - - 19 - - Share シェア @@ -1573,13 +1543,6 @@ 14 - - Error getting about from server - サーバーからのエラー - - 1 - - No description 説明はありません @@ -1594,20 +1557,6 @@ 1 - - Error - エラー - - 1 - - - - Success - 成功 - - 1 - - Configuration updated. 構成が更新されました。 @@ -1690,9 +1639,16 @@ 1 - - Channels - チャンネル + + My subscriptions + 私の輸入品 + + 1 + + + + Ownership changes + 所有権の変更 1 @@ -1712,6 +1668,13 @@ 1 + + Error + エラー + + 1 + + You need to reconnect. 再接続する必要があります。 @@ -1726,6 +1689,20 @@ 1 + + Info + 情報 + + 1 + + + + Success + 成功 + + 1 + + Incorrect username or password. ユーザーネームまたはパスワードが違います。 @@ -1796,6 +1773,20 @@ 1 + + Email is required. + 電子メールが必要です。 + + 1 + + + + Email must be valid. + 電子メールは有効である必要があります。 + + 1 + + Username is required. ユーザー名は必須です。 @@ -1817,41 +1808,6 @@ 1 - - Username must be at least 3 characters long. - ユーザー名は3文字以上でなければなりません。 - - 1 - - - - Username cannot be more than 20 characters long. - ユーザー名の長さは20文字を超えることはできません。 - - 1 - - - - Username should be only lowercase alphanumeric characters. - ユーザー名は小文字の英数字でなければなりません。 - - 1 - - - - Email is required. - 電子メールが必要です。 - - 1 - - - - Email must be valid. - 電子メールは有効である必要があります。 - - 1 - - Password must be at least 6 characters long. パスワードは6文字以上でなければなりません。 @@ -2419,16 +2375,16 @@ 1 - - Subscribed - 購読する + + Subscribed to + の登録が完了しました。 1 - - Subscribed to - の登録が完了しました。 + + Subscribed + 購読する 1 @@ -2461,13 +2417,6 @@ 1 - - Info - 情報 - - 1 - - Upload cancelled アップロードのキャンセル @@ -2475,13 +2424,6 @@ 1 - - We are sorry but PeerTube cannot handle videos > 8GB - 申し訳ありませんが、PeerTube は動画を処理出来ません。 > 8GB - - 1 - - Video published. ビデオが公開されました。 diff --git a/client/src/locale/target/angular_jbo.xml b/client/src/locale/target/angular_jbo.xml index 83e61a714..6478b002c 100644 --- a/client/src/locale/target/angular_jbo.xml +++ b/client/src/locale/target/angular_jbo.xml @@ -33,7 +33,7 @@ Next month - la bavla'ima'i + lo bavla'ima'i 27 @@ -53,9 +53,7 @@ - «« - «« - + «««« 7 @@ -67,9 +65,7 @@ - « - « - + «« 15 @@ -81,9 +77,7 @@ - » - » - + »» 29 @@ -95,9 +89,7 @@ - »» - »» - + »»»» 36 @@ -237,6 +229,48 @@ sisti lo nu jersi pe'a 13 + + User registration is not allowed on this instance, but you can register on many others! + .i le samtcise'u cu curmi no nu cmiveigau .i ku'i do cmeveigau fo so'i drata ka'e + + 28 + + + + Password + lo lerpoijaspu + + 13 + + + + I forgot my password + .i mi nalmo'i le mi lerpoijaspu + + 44 + + + + Login + co'a cmisau + + 36 + + + + Forgot your password + .i mi nalmo'i le mi lerpoijaspu + + 57 + + + + Email + lo ve samymri + + 8 + + Email address lo ve samymri @@ -248,7 +282,7 @@ sisti lo nu jersi pe'a Send me an email to reset my password samymri fi mi te zu'e lo nu galfi le mi japyvla - 75 + 80 @@ -299,6 +333,13 @@ zbasu lo pilno 55 + + Signup + cmiveigau + + 78 + + results lo te facki @@ -327,7 +368,7 @@ zbasu lo pilno Change the language galfi lo bangu - 88 + 86 @@ -337,7 +378,7 @@ zbasu lo pilno lo predatni be mi be'o poi gubni - 18 + 16 @@ -347,7 +388,7 @@ lo predatni be mi be'o poi gubni lo mi pilno - 22 + 20 @@ -357,14 +398,14 @@ lo mi pilno lo mi vidvi - 26 + 24 Create an account zbasu lo pilno - 39 + 37 @@ -378,28 +419,28 @@ lo mi vidvi Subscriptions lo se jersi pe'a - 47 + 45 Trending lo cabna misno - 57 + 55 Local lo diklo - 67 + 65 More lo drata - 72 + 70 @@ -476,7 +517,7 @@ lo mi vidvi No results. .i facki fi no da - 17 + 20 @@ -498,26 +539,6 @@ lo mi vidvi 27 - - - this instance provides unlimited space for the videos of its users. - - - .i le vi samtcise'u cu sabji lo na'e se jimte ke vidvi datni canlu lo pilno be sy. - - 31 - - - - - User registration is currently not allowed. - - - .i ca na'e curmi lo nu zbasu lo pilno - - 36 - - About PeerTube @@ -638,28 +659,28 @@ lo mi vidvi Short description lo cmalu ve skicu - 22 + 21 Local videos lo diklo vidvi - 61 + 54 Policy on videos containing sensitive content loi javni be tu'a lo vidvi poi vasru lo ganvi poi te kajde - 70 + 61 JavaScript la .djavascript. - 278 + 294 @@ -686,53 +707,18 @@ lo pilno 12 - - My settings - lo mi se cuxna - - 3 - - - - My channels - lo mi te tivni - - 12 - - - - My videos - lo mi vidvi - - 14 - - - - My subscriptions - lo se jersi pe'a be mi - - 16 - - - - My imports - lo se nerbei be mi - - 18 - - Profile lo predatni - 8 + 7 Video settings lo se cuxna pe lo vidvi - 15 + 16 @@ -942,14 +928,14 @@ lo pilno Cancel create co'u zbasu - 169 + 170 Cancel deletion co'u vimcu - 177 + 178 @@ -963,7 +949,7 @@ lo pilno Advanced settings lo certu se cuxna - 190 + 191 @@ -1104,13 +1090,6 @@ lo pilno 14 - - Error - .i srera - - 1 - - 100MB pa no no lo megbivysamsle @@ -1195,6 +1174,27 @@ lo pilno 1 + + Delete this report + vimcu le notci + + 1 + + + + Do you really want to delete this abuse report? + .i .au ju'o pei vimcu le malpli notci + + 1 + + + + Abuse deleted. + .i mo'u vimcu le malpli notci + + 1 + + Password updated. .i mo'u galfi lo japyvla @@ -1237,6 +1237,20 @@ lo pilno 1 + + Video channel created. + .i mo'u zbasu la'o ly. .ly. noi vidvi te tivni + + 1 + + + + This name already exists on this instance. + .i le cmene xa'o zasti ci'e le mupli + + 1 + + Create zbasu @@ -1244,16 +1258,9 @@ lo pilno 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - .i .au ju'o pei do vimcu la'o ly. .ly. .i la'e di'u vimcu ro lo vidvi ji'a poi se kibdu'a fi le vi te tivni - - 1 - - - - Please type the name of the video channel to confirm - .i .e'o ko ciska le cmene be le vidvi te zu'e lo nu birti + + Video channel updated. + .i mo'u galfi la'o ly. .ly. noi vidvi te tivni 1 @@ -1265,6 +1272,13 @@ lo pilno 1 + + My videos + lo mi vidvi + + 1 + + Do you really want to delete videos? .i .au ju'o pei do vimcu lo vidvi @@ -1279,16 +1293,23 @@ lo pilno 1 - - Channels - lo te tivni + + My channels + lo mi te tivni 1 - - Video imports - lo vidvi poi se nerbei + + My subscriptions + lo se jersi pe'a be mi + + 1 + + + + My settings + lo mi se cuxna 1 @@ -1335,6 +1356,13 @@ lo pilno 1 + + Error + .i srera + + 1 + + Your password has been successfully reset! .i snada lo nu mo'u galfi le do japyvla @@ -1342,5 +1370,19 @@ lo pilno 1 + + The channel is required. + .i le vidvi te tivni cu sarcu + + 1 + + + + Video channel is required. + .i le vidvi te tivni cu sarcu + + 1 + + \ No newline at end of file diff --git a/client/src/locale/target/angular_nl_NL.xml b/client/src/locale/target/angular_nl_NL.xml index 3db9f0504..7e7a6abdd 100644 --- a/client/src/locale/target/angular_nl_NL.xml +++ b/client/src/locale/target/angular_nl_NL.xml @@ -3,6 +3,244 @@ + + Close + Sluiten + + 2 + + + + Previous + Vorige + + 13 + + + + Next + Volgende + + 17 + + + + Previous month + Vorige maand + + 5 + + + + Next month + Volgende maand + + 27 + + + + Select month + Selecteer maand + + 7 + + + + Select year + Selecteer jaar + + 16 + + + + «« + «« + + 7 + + + + First + Eerste + + 5 + + + + « + « + + 15 + + + + Previous + Vorige + + 13 + + + + » + » + + 29 + + + + Next + Volgende + + 27 + + + + »» + »» + + 36 + + + + Last + Laatste + + 34 + + + + % + % + + 6 + + + + Increment hours + Verhoog uren + + 9 + + + + HH + HH + + 12 + + + + Hours + Uren + + 14 + + + + Decrement hours + Verlaag uren + + 19 + + + + Increment minutes + Verhoog minuten + + 28 + + + + MM + MM + + 31 + + + + Minutes + Minuten + + 33 + + + + Decrement minutes + Verlaag minuten + + 38 + + + + Increment seconds + Verhoog seconden + + 47 + + + + SS + SS + + 50 + + + + Seconds + Seconden + + 52 + + + + Decrement seconds + Verlaag seconden + + 57 + + + + PM + PM + + 65 + + + + AM + AM + + 66 + + + + Cancel + Annuleren + + 10 + + + + (extensions: , max size: ) + (extensies: , max grootte: ) + + 11 + + + + Unlisted + Onvermeld + + 10 + + + + Private + Privé + + 11 + + - views - keer bekeken @@ -45,6 +283,105 @@ 19 + + + + Subscribe + + + + + + + + Abonneer + + + + + + 5 + + + + + Unsubscribe + + +Abonnement opzeggen + + 18 + + + + Using an ActivityPub account + Een ActivityPub-account gebruiken + + 36 + + + + Subscribe with an account on + Abonneer met een account op + + 39 + + + + Subscribe with your local account + Abonneer met je lokale account + + 40 + + + + Subscribe with a Mastodon account: + Abonneer met een Mastodon-account + + 43 + + + + Using a syndication feed + Een syndicaatfeed gebruiken + + 48 + + + + Subscribe via RSS + Abonneren met RSS + + 49 + + + + + Remote subscribe + Remote interact + + +Extern abonneren + Externe interactie + + + 10 + + + + You can subscribe to the channel via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type the channel URL in the search box and subscribe there. + Je kan op het kanaal abonneren via elke ActivityPub-mogelijke fediverse instantie. Bijvoorbeeld met Mastodon of Pleroma kan je de URL van het kanaal in de zoekbalk invullen en daar abonneren. + + 17 + + + + You can interact with this via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type the current URL in the search box and interact with it there. + Je kan hiermee interactie hebben via elke ActivityPub-mogelijke fediverse instantie. Bijvoorbeeld met Mastodon of Pleroma kan je de huidige URL in de zoekbalk typen en er daar interactie mee hebben. + + 22 + + Video quota Videoquotum @@ -52,15 +389,65 @@ 42 + + + Unlimited ( per day) + + +Oneindig ( per dag) + + + 14 + + + + Ban + Verbannen + + 3 + + + + Reason... + Reden... + + 11 + + + + + A banned user will no longer be able to login. + + +Een verbannen gebruiker kan niet langer inloggen. + + 17 + + + + Ban this user + Verban deze gebruiker + + 25 + + Login - Aanmelden + +Aanmelden 2 + + Request new verification email. + Een nieuwe verificatie e-mail aanvragen. + + 12 + + User Gebruiker @@ -79,7 +466,8 @@ or create an account - of maak een account + +of maak een account 18 @@ -88,14 +476,15 @@ or create an account on another instance - of maak een account aan op een andere server + +of maak een account aan op een andere instantie 22 User registration is not allowed on this instance, but you can register on many others! - Registratie is niet mogelijk op deze instantie, maar je kan een account maken op een van de vele anderen! + Registratie is niet mogelijk op deze instantie, maar je kan wel registreren op een van de vele anderen! 28 @@ -104,12 +493,12 @@ Password Wachtwoord - 12 + 13 I forgot my password - Wachtwoord vergeten + Ik ben mijn wachtwoord vergeten 44 @@ -118,12 +507,12 @@ Login Aanmelden - 38 + 36 Forgot your password - Wachtwoord vergeten + Jouw wachtwoord vergeten 57 @@ -146,14 +535,15 @@ Send me an email to reset my password Zend me een e-mail om een nieuw wachtwoord in te stellen - 75 + 80 Reset my password - Wachtwoord opnieuw instellen + +Wachtwoord opnieuw instellen 2 @@ -183,7 +573,8 @@ Create an account - Account maken + +Account aanmaken 3 @@ -195,25 +586,139 @@ 8 + + Example: jane_doe + Bijvoorbeeld: jane-doe + + 17 + + + + I am at least 16 years old and agree to the <a href='/about/instance#terms-section' target='_blank'rel='noopener noreferrer'>Terms</a> of this instance + Ik ben minstens 16 jaar oud en accepteer de <a href='/about/instance#terms-section' target='_blank'rel='noopener noreferrer'>Voorwaarden</a> van deze instantie + + 55 + + Signup Registratie - 88 + 78 + + + + Features found on this instance + Kenmerken van deze instantie + + 67 + + + + results + resultaten + + 5 + + + + + for + + +voor + + 6 + + + + + Filters + + + + Filters + + + 16 + + + + + No results found + + +Geen resultaten gevonden + + 28 + + + + subscribers + abonnees + + 44 + + + + - views + - weergaven + + 55 Change the language Taal veranderen - 88 + 86 + + + + + My public profile + + +Mijn openbare profiel + + 16 + + + + + My account + + +Mijn account + + 20 + + + + + My videos + + +Mijn video's + + 24 + + + + + Log out + + +Uitloggen + + 28 Create an account Account maken - 39 + 37 @@ -223,32 +728,53 @@ 24 + + Subscriptions + Abonnementen + + 45 + + + + Overview + Overzicht + + 50 + + Trending Populair - 57 + 55 Recently added Recent toegevoegd - 62 + 60 Local Lokaal - 67 + 65 + + + + More + Meer + + 70 Administration Administratie - 76 + 74 @@ -258,6 +784,20 @@ 25 + + Show keyboard shortcuts + Laat keyboard shortcuts zien + + 89 + + + + Toggle dark interface + Schakel donkere interface aan of uit + + 92 + + Search... Zoeken … @@ -272,6 +812,48 @@ 9 + + Sort + Sorteren + + 6 + + + + Published date + Datum van publicatie + + 15 + + + + Duration + Duratie + + 24 + + + + Display sensitive content + Laat gevoelige inhoud zien + + 33 + + + + Yes + Ja + + 37 + + + + No + Nee + + 42 + + Category Categorie @@ -293,11 +875,77 @@ 182 + + All of these tags + Al deze tags + + 82 + + + + One of these tags + Een van deze tags + + 87 + + + + Filter + Filter + + 94 + + + + Display unlisted and private videos + Laat onvermelde en privé-video's zien + + 14 + + No results. Geen resultaten. - 17 + 20 + + + + + + + + + + 6 + + + + + # + + +# + + 14 + + + + + + + + + + + + + + + + + + 22 @@ -314,13 +962,21 @@ 7 - + - About instance - - Over de instantie + Cancel + + +Annuleer - 1 + 26 + + + + Submit + Voorleggen + + 31 @@ -334,48 +990,24 @@ Terms Voorwaarden - 44 + 39 User registration is allowed and Een account aanmaken is mogelijk en - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - deze instantie voorziet een basis-opslagquotum van voor de video's van haar gebruikers. - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - deze instantie voorziet onbeperkte opslagruimte voor de video's van haar gebruikers. - - 31 - - - - - User registration is currently not allowed. - - Een account maken is momenteel niet toegelaten op deze instantie. - - 36 + 29 About PeerTube - Over PeerTube + +Over PeerTube + + 1 @@ -391,7 +1023,8 @@ It is a free and open-source software, under the AGPLv3 licence. - Het is vrije en open-source software, beschikbaar onder de AGPLv3. + +Het is vrije en open-source software, beschikbaar onder de AGPLv3 licentie. 8 @@ -400,7 +1033,8 @@ For more information, please visit joinpeertube.org. - Kijk voor meer informatie op joinpeertube.org. + +Kijk voor meer informatie op joinpeertube.org. 12 @@ -417,7 +1051,8 @@ PeerTube uses the BitTorrent protocol to share bandwidth between users. This implies that your IP address is stored in the instance's BitTorrent tracker as long as you download or watch the video. - PeerTube gebruikt het BitTorrent-protocol om bandbreedte tussen gebruikers te delen. Dat betekent ook dat jouw IP-adres bijgehouden wordt in de BitTorrent-tracker van de PeerTube-instantie zolang je de video aan het bekijken bent. + +PeerTube gebruikt het BitTorrent-protocol om bandbreedte tussen gebruikers te delen. Dat betekent ook dat jouw IP-adres bijgehouden wordt in de BitTorrent-tracker van de PeerTube-instantie zolang je de video aan het bekijken bent. 20 @@ -434,7 +1069,8 @@ In theory, someone with enough technical skills could create a script that tracks which IP is downloading which video. In practice, this is much more difficult because: - In theorie kan iemand met technische kennis een script maken dat bijhoudt welk IP-adres welke video aan het downloaden is. In de praktijk is dat wat moeilijker: + +In theorie kan iemand met technische kennis een script maken dat bijhoudt welk IP-adres welke video aan het downloaden is. In de praktijk is dat wat moeilijker omdat: 27 @@ -444,7 +1080,8 @@ An HTTP request has to be sent on each tracker for each video to spy. If we want to spy all PeerTube's videos, we have to send as many requests as there are videos (so potentially a lot) - Voor elke video waarvan hij de kijkers wil bespioneren, moet hij een apart HTTP-request sturen. Om dat voor alle PeerTube-videos te doen, moeten er dus evenveel HTTP-requests als video's gebruikt worden (dat kan hoog oplopen). + +Voor elke video waarvan hij de kijkers wil bespioneren, moet hij een apart HTTP-request sturen. Om dat voor alle PeerTube-videos te doen, moeten er dus evenveel HTTP-requests als video's gebruikt worden (dat kan hoog oplopen). 33 @@ -454,7 +1091,8 @@ For each request sent, the tracker returns random peers at a limited number. For instance, if there are 1000 peers in the swarm and the tracker sends only 20 peers for each request, there must be at least 50 requests sent to know every peers in the swarm - Voor elk request geeft de tracker een beperkt aantal willekeurige peers terug. Als er bijvoorbeeld 1000 peers beschikbaar zijn en de tracker steeds 20 peers teruggeeft, moeten er op zijn minst 50 requests gestuurd worden om alle peers te weten te komen. + +Voor elk request geeft de tracker een beperkt aantal willekeurige peers terug. Als er bijvoorbeeld 1000 peers beschikbaar zijn en de tracker steeds 20 peers teruggeeft, moeten er op zijn minst 50 requests gestuurd worden om alle peers te weten te komen. 38 @@ -463,7 +1101,8 @@ Those requests have to be sent regularly to know who starts/stops watching a video. It is easy to detect that kind of behaviour - Die requests moeten regelmatig herhaald worden om te kunnen achterhalen wie begint of stopt met een video te bekijken. Het is gemakkelijk om zulk gedrag te detecteren. + +Die requests moeten regelmatig herhaald worden om te kunnen achterhalen wie begint of stopt met een video te kijken. Het is gemakkelijk om zulk gedrag te detecteren. 43 @@ -472,7 +1111,8 @@ If an IP address is stored in the tracker, it doesn't mean that the person behind the IP (if this person exists) has watched the video - Als een IP-adres opgeslagen is in de tracker, betekent dat niet dat de persoon achter dat adres (als die persoon bestaat) de video bekeken heeft + +Als een IP-adres opgeslagen is in de tracker, betekent dat niet dat de persoon achter dat adres (als die persoon bestaat) de video bekeken heeft 47 @@ -481,24 +1121,169 @@ The IP address is a vague information : usually, it regularly changes and can represent many persons or entities - Een IP-adres is vage + +Een IP-adres is vage informatie: Meestal veranderd het regelmatig en kan het meerdere personen en identiteiten representeren 51 + + + Web peers are not publicly accessible: because we use WebRTC inside the web browser (with the WebTorrent library), the protocol is different from classic BitTorrent. + When you are in a web browser, you send a signal containing your IP address to the tracker that will randomly choose other peers to forward the information to. + See this document for more information + + +Web peers zijn niet openbaar bereikbaar: omdat we WebRTC in de webbrowser gebruiken (met de WebTorrent-bibliotheek), is het protocol anders dan in klassieke BitTorrent. + Wanneer je in een webbrowser zit, verstuur je een signaal die je IP adres bevat naar de tracker die willekeurig andere peers kiest om de informatie heen te sturen. + See dit document voor meer informatie + + 55 + + + + + The worst-case scenario of an average person spying on their friends is quite unlikely. + There are much more effective ways to get that kind of information. + + +Het worst-case scenario dat kan gebeuren van een gemiddeld persoon die hun vrienden bespioneert is erg onwaarschijnlijk. +Er zijn veel effectievere manieren om dat soort informatie te verkrijgen. + + 62 + + + + How does PeerTube compare with YouTube? + Hoe is PeerTube vergeleken met YouTube? + + 67 + + + + + The threats to privacy in YouTube are different from PeerTube's. + In YouTube's case, the platform gathers a huge amount of your personal information (not only your IP) to analyze them and track you. + Moreover, YouTube is owned by Google/Alphabet, a company that tracks you across many websites (via AdSense or Google Analytics). + + +De bedreigingen tegen privacy in YouTube zijn verschillend dan in PeerTube's geval. +In YouTube's geval, verzamelt het platform een gigantisch aantal persoonlijke informatie (niet alleen je IP) om te analyseren en om je te tracken. +Verder nog, YouTube is eigendom van Google/Alphabet, een bedrijf die je trackt over meerdere websites (via AdSense of Google Analytics). + + 69 + + + + What can I do to limit the exposure of my IP address? + Wat kan ik doen om de blootstelling van mijn IP adress te verminderen? + + 75 + + Your IP address is public so every time you consult a website, there is a number of actors (in addition to the final website) seeing your IP in their connection logs: ISP/routers/trackers/CDN and more. PeerTube is transparent about it: we warn you that if you want to keep your IP private, you must use a VPN or Tor Browser. Thinking that removing P2P from PeerTube will give you back anonymity doesn't make sense. - Je IP-adres is geen privé-gegeven. Elke keer je een website bezoekt, is er een aantal entiteiten (bovenop de website die je effectief bezoekt) die je IP zien in hun logs: ISP's, routers, trackers, CDN's en meer. -PeerTube is transparant: we waarschuwen je dat je, als je je IP-adres privé wil afschermen, je een VPN of de Tor-Browser moet gebruiken. -Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit geven. + +Je IP-adres is openbaar dus elke keer dat je een website bezoekt, zijn er een aantal actoren (bovenop de website die je effectief bezoekt) die je IP zien in hun logs: ISP/routers/trackers/CDN en meer. +PeerTube is daarover transparant: we waarschuwen je dat je, als je je IP-adres wil afschermen, je een VPN of de Tor-Browser moet gebruiken. +Denken dat het P2P-mechanisme uit PeerTube halen je anonimiteit terug zou geven is onlogisch. 77 + + What will be done to mitigate this problem? + Wat zal worden gedaan om dit probleem te verminderen? + + 83 + + + + + PeerTube is in its early stages, and want to deliver the best countermeasures possible by the time the stable is released. + In the meantime, we want to test different ideas related to this issue: + + +PeerTube is in haar ontwikkelingsfasen, en wilt de beste tegenmaatregelen mogelijk geven tegen de tijd dat de stabiele versie is gereleased. +Ondertussen willen we verschillende ideeën testen die gerelateerd zijn aan dit probleem: + + 85 + + + + Set a limit to the number of peers sent by the tracker + Zet een limiet op het aantal peers verzonden door de tracker + + 91 + + + + Set a limit on the request frequency received by the tracker (being tested) + Zet een limiet op de verzoekfrequentie verkregen door de tracker (wordt getest) + + 92 + + + + Ring a bell if there are unusual requests (being tested) + Laat iets horen als er ongebruikelijke requests zijn (wordt getest) + + 93 + + + + Disable P2P from the administration interface + Schakel P2P uit vanuit het administratieinterface + + 94 + + + + An automatic video redundancy program: we wouldn't know if the IP downloaded the video on purpose or if it was the automatized program + Een automatisch video-overbodigheidsprogramma: we zouden niet weten of het IP de video met opzet heeft gedownload, of als het een geautomatiseerd programma was. + + 95 + + + + Banned + Verbannen + + 12 + + + + Muted + Gedempt + + 13 + + + + Muted by your instance + Gedempt door jouw instantie + + 14 + + + + Instance muted + Instantie gedempt + + 15 + + + + Instance muted by your instance + Instantie gedempt door jouw instantie + + 16 + + subscribers abonnees @@ -552,42 +1337,49 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge Short description Korte omschrijving - 22 + 21 Default client route Startpagina - 55 + 48 + + + + Videos Overview + Video-overzicht + + 51 Videos Trending Populaire video's - 59 + 52 Videos Recently Added Recent toegevoegde video's - 60 + 53 Local videos Video's op deze instantie - 61 + 54 Policy on videos containing sensitive content Beleid rond video's met gevoelige inhoud - 70 + 61 @@ -622,42 +1414,77 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge Signup enabled Registratie mogelijk - 93 + 84 + + + + Signup requires email verification + E-mailverificatie nodig bij registratie + + 91 Signup limit Registratielimiet - 105 - - - - Administrator - Beheerder - - 131 - - - - Admin email - E-mail van beheerder - - 134 + 96 Users Gebruikers - 144 + 105 User default video quota Standaard video-quotum voor gebruikers - 147 + 109 + + + + User default daily upload limit + Standaard dagelijks video-quotum voor gebruikers + + 121 + + + + Import + Importeren + + 42 + + + + Video import with HTTP URL (i.e. YouTube) enabled + Video-import met HTTP URL (d.w.z. YouTube) ingeschakeld + + 141 + + + + Video import with a torrent file or a magnet URI enabled + Video-import met een torrentbestand of een magnet URL ingeschakeld + + 148 + + + + Administrator + Administrator + + 155 + + + + Admin email + E-mail van administrator + + 158 @@ -678,21 +1505,21 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge Your Twitter username Je Twitter-gebruikersnaam - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Geeft het Twitter-account aan voor de website of het platform waarop de inhoud gepubliceerd werd. - 184 + 187 Instance whitelisted by Twitter - Instantie ge-whitelist door Twitter + Instantie gewhitelist door Twitter - 198 + 199 @@ -706,77 +1533,120 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge Transcoding Transcoding - 210 + 215 Transcoding enabled Transcoding ingeschakeld - 215 + 221 If you disable transcoding, many videos from your users will not work! - Als je transcoding niet inschakelt, zullen veel video's die je gebruikers uploaden niet overal werken! + Als je transcoding niet inschakelt, zullen veel video's die je gebruikers uploaden niet werken! - 216 + 222 Transcoding threads Threads gebruikt voor transcoding - 223 + 237 + + + + Resolution enabled + Resolutie ingeschakeld + + 252 + + + + + Cache + + + + +Cache + + + + 260 + + + + Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. + Sommige bestanden zijn niet federaal (voorbeelden, ondertitelingen). We verkrijgen ze direct van hun afkomstige instantie en cachen ze. + + 265 Previews cache size Cachegrootte voor previews - 254 + 271 + + + + Video captions cache size + Cachegrootte van video-ondertiteling + + 280 Customizations Aanpassingen - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> - Schrijf JavaScriptcode.<br />Voorbeeld: <pre>console.log('mijn instantie is fantastisch');</pre> + Schrijf direct JavaScriptcode.<br />Bijvoorbeeld: <pre>console.log('mijn instantie is fantastisch');</pre> - 281 + 297 Advanced configuration Geavanceerde configuratie - 207 + 212 Update configuration - Updateconfiguratie + Bijwerkingsconfiguratie - 325 + 340 + + + + It seems the configuration is invalid. Please search potential errors in the different tabs. + Het lijkt erop dat de configuratie invalide is. Zoek alstublieft potentiële foutmeldingen op in andere tabbladen. + + 341 Users - Gebruikers + +Gebruikers 3 @@ -785,16 +1655,28 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge Manage follows - Volgers beheren + +Volgers beheren 7 + + + Moderation + + +Moderatie + + 11 + + Jobs - Jobs + +Banen 15 @@ -803,7 +1685,8 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge Configuration - Configuratie + +Configuratie 19 @@ -819,18 +1702,26 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge It seems that you are not on a HTTPS server. Your webserver needs to have TLS activated in order to follow servers. - Het ziet ernaar uit dat je op een server bent zonder HTTPS. Op je webserver moet TLS geactiveerd zijn om servers te kunnen volgen. + +Het ziet ernaar uit dat je op een server bent zonder HTTPS. Op je webserver moet TLS geactiveerd zijn om servers te kunnen volgen. 17 Add following - Abonneren + Voeg volgend toe 21 + + Filter... + Filtreren... + + 27 + + ID ID @@ -866,6 +1757,27 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 11 + + Accepted + Geaccepteerd + + 32 + + + + Pending + In behandeling + + 33 + + + + Redundancy allowed + Overtolligheid toegelaten + + 22 + + Manage follows Abonnementen beheren @@ -873,9 +1785,30 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 2 + + Following + Volgend + + 5 + + + + Follow + Volg + + 7 + + + + Followers + Volgers + + 9 + + Jobs list - Lijst van jobs + Banenlijst 2 @@ -887,6 +1820,20 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 19 + + Processed on + Behandeld op + + 22 + + + + Finished on + Voltooid op + + 23 + + Create user Gebruiker aanmaken @@ -910,7 +1857,7 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge mail@example.com - mail@example.org + mail@voorbeeld.org 21 @@ -935,6 +1882,13 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 65 + + Daily video quota + Dagelijks videoquotum + + 72 + + Users list Gebruikerslijst @@ -942,6 +1896,13 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 2 + + Batch actions + Batchacties + + 19 + + Username Gebruikersnaam @@ -949,6 +1910,65 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 40 + + (banned) + (verbannen) + + 65 + + + + Go to the account page + Ga naar accountpagina + + 133 + + + + User's email must be verified to login + Gebruiker's e-mail moet geverifieerd zijn om in te loggen + + 72 + + + + User's email is verified / User can login without email verification + Gebruiker's e-mail is geverifieerd / Gebruiker kan inloggen zonder e-mailverificatie + + 76 + + + + Ban reason: + Reden van verbanning: + + 95 + + + + Moderation comment + Beheerdersopmerking + + 3 + + + + + This comment can only be seen by you or the other moderators. + + +Deze opmerking kan alleen door jou en andere beheerders gezien worden. + + 17 + + + + Update this comment + Werk deze comment bij + + 25 + + Reporter Melder @@ -963,6 +1983,13 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 14 + + State + Status + + 11 + + Go to the account Naar account gaan @@ -977,6 +2004,69 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 33 + + Actions + Acties + + 35 + + + + Reason: + Reden: + + 53 + + + + Moderation comment: + Beheerderopmerking: + + 57 + + + + Video name + Videonaam + + 8 + + + + Sensitive + Gevoelig + + 9 + + + + Date + Datum + + 11 + + + + Blacklist reason: + Reden voor de zwarte lijst: + + 43 + + + + Moderation + Beheer + + 2 + + + + Video abuses + Videomisbruik + + 5 + + Blacklisted videos Video's op zwarte lijst @@ -984,18 +2074,39 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 7 - - My settings - Mijn instellingen + + Muted accounts + Gedempte accounts - 3 + 2 - - My videos - Mijn video's + + Muted servers + Gedempte servers - 14 + 11 + + + + Account + Account + + 12 + + + + Muted at + Gedempt bij + + 13 + + + + Unmute + Demping opheffen + + 23 @@ -1009,28 +2120,67 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge Profile Profiel - 8 + 7 Video settings Video-instellingen - 15 + 16 + + + + Danger zone + Gevarenzone + + 19 + + + + Change ownership + Verander eigenaar + + 46 + + + + Select the next owner + Selecteer de volgende eigenaar + + 9 + + + + + Cancel + + +Annuleren + + 35 - views - Video’s - aantal keer bekeken + - weergaven 19 + + Blacklisted + Op de zwarte lijst + + 22 + + Cancel - Annuleren + +Annuleren 30 @@ -1056,6 +2206,13 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 6 + + Example: my_channel + Bijvoorbeeld: mijn_kanaal + + 15 + + Display name Weergavenaam @@ -1066,12 +2223,26 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge Short text to tell people how they can support your channel (membership platform...).<br /><br /> When you will upload a video in this channel, the video support field will be automatically filled by this text. - Korte tekst om mensen te vertellen hoe ze je kanaal kunnen ondersteunen (lidmaatschap…).<br/><br/> -Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "ondersteun"-veld. + Korte tekst om mensen te vertellen hoe ze je kanaal kunnen ondersteunen (lidmaatschapsplatform…).<br /><br /> +Als je een video uploadt op dit kanaal, wordt deze tekst ingevuld in het "ondersteun"-veld. 52 + + Target + Doelwit + + 8 + + + + You don't have any subscriptions yet. + Je hebt nog geen abonnementen. + + 1 + + Created by Gemaakt door @@ -1086,6 +2257,75 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 16 + + Accept ownership + Accepteer eigenaar + + 3 + + + + Select the target channel + Selecteer het doelwitkanaal + + 9 + + + + Initiator + Initiatiefnemer + + 13 + + + + + Created + + + + Gecreëerd op + + + + 15 + + + + Status + Status + + 19 + + + + Action + Actie + + 20 + + + + + + + 39 + + + + Refuse + Weigeren + + 47 + + + + Muted instances + Gedempte instanties + + 2 + + Change password Wachtwoord veranderen @@ -1093,6 +2333,13 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 30 + + Current password + Huidige wachtwoord + + 7 + + New password Nieuw wachtwoord @@ -1114,8 +2361,17 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 3 + + Use WebTorrent to exchange parts of the video with others + Gebruik WebTorrent om delen van de video over te maken naar anderen + + 21 + + - Automatically plays videoAutomatically plays video + Automatically plays video + Video automatisch afspelen + 28 @@ -1128,11 +2384,25 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders Update my profile - Update mijn profiel + Werk mijn profiel bij 27 + + subscribers + abonnees + + 10 + + + + Change the avatar + Verander de avatar + + 15 + + (extensions: , max size: ) (extensies: , maximale grootte: ) @@ -1140,15 +2410,84 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 18 + + Once you delete your account, there is no going back. Please be certain. + Als je je account verwijdert, kan je niet meer terug. +Wees alstublieft zeker. + + 2 + + + + Delete your account + Verwijder jouw account + + 4 + + Sorry, but we couldn't find the page you were looking for. - Sorry, maar die pagina kon niet gevonden worden. + +Sorry, maar die pagina kon niet gevonden worden. + 1 + + + Verify account email confirmation + + +Verifieer e-mailbevestiging van account + + 2 + + + + + Your email has been verified and you may now login. Redirecting... + + +Jouw e-mail is geverifieerd en je mag nu inloggen. +Je wordt doorverwezen... + + 6 + + + + An error occurred. + Er is een probleem opgetreden. + + 11 + + + + + Request email for account verification + + +Vraag e-mail voor accountverificatie aan + + 2 + + + + Send verification email + Verzend e-mail voor verificatie + + 17 + + + + This instance does not require email verification. + Deze instantie heeft geen verificatie door e-mail nodig. + + 20 + + Support this channel Ondersteun dit kanaal @@ -1163,6 +2502,20 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 17 + + URL + URL + + 17 + + + + You can import any URL <a href='https://rg3.github.io/youtube-dl/supportedsites.html' target='_blank' rel='noopener noreferrer'>supported by youtube-dl</a> or URL that points to a raw MP4 file. You should make sure you have diffusion rights over the content it points to, otherwise it could cause legal trouble to yourself and your instance. + Je kan elke URL importeren <a href='https://rg3.github.io/youtube-dl/supportedsites.html' target='_blank' rel='noopener noreferrer'>ondersteunt door youtube-dl</a> of elke URL die naar een rauw MP4 bestand wijst. Je moet zeker weten dat je de diffusierechten hebt over de inhoud waar het naar wijst, anders kan het wettelijke problemen aan jou of je instantie geven. + + 9 + + Channel Kanaal @@ -1172,11 +2525,37 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders Privacy - Zichtbaarheid + Privacy 159 + + Sorry, but something went wrong + Sorry, er is iets fout gegaan + + 49 + + + + + Congratulations, the video behind will be imported! You can already add information about this video. + + +Gefeliciteerd, de video achter zal worden geimporteerd! Je kan nu al informatie over deze video toevoegen. + + + + 46 + + + + Update + Bijwerken + + 92 + + Select the file to upload Selecteer het bestand om te uploaden @@ -1184,18 +2563,132 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 6 + + Scheduled + Ingeroosterd + + 25 + + Publish will be available when upload is finished Publiceren is mogelijk wanneer de upload voltooid is - 53 + 58 Publish Publiceren - 60 + 65 + + + + Select the torrent to import + Selecteer de torrent om te importeren + + 6 + + + + Or + Of + + 11 + + + + Paste magnet URI + Plak magnet URL + + 14 + + + + You can import any torrent file that points to a mp4 file. You should make sure you have diffusion rights over the content it points to, otherwise it could cause legal trouble to yourself and your instance. + Je kan elk torrentbestand importeren die wijst naar een mp4 bestand. Je moet zeker weten dat je de diffusierechten over de inhoud waar het naar wijst hebt, anders kan het wettelijke problemen aan jezelf en je instantie geven. + + 17 + + + + + Congratulations, the video will be imported with BitTorrent! You can already add information about this video. + + +Gefeliciteerd, de video zal geimporteerd worden met BitTorrent! +Je kan nu al informatie toevoegen over deze video. + + + + 53 + + + + Import + Importeer + + 3 + + + + Upload + Uploaden + + 4 + + + + Upload a file + Upload een bestand + + 10 + + + + Import with URL + Importeer met URL + + 17 + + + + Import with torrent + Importeer met torrent + + 24 + + + + Add caption + Voeg ondertiteling toe + + 5 + + + + Select the caption file + Selecteer het ondertitelingsbestand + + 24 + + + + + This will replace an existing caption! + + +Dit zal een bestaande ondertiteling vervangen! + + 29 + + + + Add this caption + Voeg deze ondertiteling toe + + 40 @@ -1212,16 +2705,37 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 191 + + Tags could be used to suggest relevant recommendations.</br>Press Enter to add a new tag. + Tags kunnen gebruikt worden om relevante aanraders te suggesteren. </br>Druk op Enter om een nieuwe tag toe te voegen. + + 18 + + + + + Tag + Tag + + 21 + + + + Enter a new tag + Vul een nieuwe tag in + + 21 + + Video descriptions are truncated by default and require manual action to expand them. - Videobeschrijvingen worden standaard gedeeltelijk weergegeven, de kijker kan ze handmatig openvouwen. + Videobeschrijvingen worden standaard gedeeltelijk weergegeven en moeten handmatig opengevouwen worden. 28 Schedule publication () - Publicatie uitstellen () + Publicatie inroosteren op () 105 @@ -1242,7 +2756,7 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders Enable video comments - Videoreacties toelaten + Videoreacties inschakelen 125 @@ -1251,7 +2765,14 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders Wait transcoding before publishing the video Wacht tot het transcoderen voltooid is om de video te publiceren - 130 + 131 + + + + If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. + Als je beslist om niet te wachten totdat de transcoding compleet is voordat je de video publiceert, kan de video onspeelbaar zijn totdat de transcoding eindigt. + + 132 @@ -1261,18 +2782,84 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 4 + + Add another caption + Voeg nog een ondertiteling toe + + 147 + + + + See the subtitle file + Zie het ondertitelingsbestand + + 156 + + + + Already uploaded ✔ + Al geupload ✔ + + 160 + + + + Will be created on update + Wordt gecreëerd bij bijwerking + + 168 + + + + Cancel create + Annuleer creatie + + 170 + + + + Will be deleted on update + Wordt verwijdert bij bijwerking + + 176 + + + + Cancel deletion + Annuleer verwijdering + + 178 + + + + + No captions for now. + + +Geen ondertiteling voor nu. + + 183 + + + + Captions + Ondertiteling + + 140 + + Upload thumbnail Thumbnail uploaden - 195 + 196 Upload preview Voorvertoning uploaden - 202 + 203 @@ -1284,26 +2871,238 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders Short text to tell people how they can support you (membership platform...). - Korte tekst om mensen te vertellen hoe ze je kanaal kunnen ondersteunen (bv. door gelddonaties). + Korte tekst om mensen te vertellen hoe ze je kanaal kunnen ondersteunen (lidmaatschapsplatforms...). - 209 + 210 Advanced settings Geavanceerde instellingen - 190 + 191 Update + + updaten 2 + + Download video + Download video + + 3 + + + + Direct download + Directe download + + 27 + + + + Torrent (.torrent file) + Torrent (.torrent bestand) + + 32 + + + + Torrent (magnet link) + Torrent (magnet link) + + 37 + + + + + Cancel + + +Annuleren + + 47 + + + + Download + Downloaden + + 84 + + + + Report video + Rapporteer video + + 3 + + + + Share + Deel + + 74 + + + + QR-Code + QR-Code + + 29 + + + + Embed + Inbedden + + 34 + + + + + The url is not secured (no HTTPS), so the embed video won't work on HTTPS websites (web browsers block non secured HTTP requests on HTTPS websites). + + +Deze url is niet beveiligd (geen HTTPS), dus de ingebedde video werkt niet op HTTPS websites (web browsers blokkeren onbeveiligde HTTP verzoeken op HTTPS websites). + + 45 + + + + Close + Sluiten + + 51 + + + + Blacklist video + Video op de zwarte lijst zetten + + 3 + + + + + The video is being imported, it will be available when the import is finished. + + +De video wordt geimporteerd, hij zal beschikbaar worden wanneer de import klaar is. + + 11 + + + + + The video is being transcoded, it may not work properly. + + +De video wordt getranscode, hij kan misschien niet naar behoren werken. + + 15 + + + + + This video will be published on . + + +Deze video wordt gepubliceerd op . + + 19 + + + + This video is blacklisted. + Deze video staat op de zwarte lijst. + + 24 + + + + + Published - views + + +Gepubliceerde - weergaven + + 37 + + + + + Published - views + + +Gepubliceerde - weergaven + + 46 + + + + Like this video + Like deze video + + 57 + + + + Dislike this video + Dislike deze video + + 64 + + + + Download the video + Download de video + + 83 + + + + Report + Rapporteer + + 88 + + + + Report this video + Rapporteer deze video + + 87 + + + + Update this video + Werk deze video bij + + 91 + + + + Blacklist + Zet op de zwarte lijst + + 96 + + + + Blacklist this video + Zet deze video op de zwarte lijst + + 95 + + Unblacklist Van zwarte lijst halen @@ -1311,6 +3110,764 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 100 + + Unblacklist this video + Haal deze video van de zwarte lijst + + 99 + + + + Delete this video + Verwijder deze video + + 103 + + + + Go the channel page + Ga naar kanaalpagina + + 123 + + + + By + Door + + 134 + + + + Show more + Laat meer zien + + 146 + + + + Show less + Laat minder zien + + 152 + + + + Friendly Reminder: + Vriendelijke Herinnering: + + 208 + + + + + the sharing system used for this video implies that some technical information about your system (such as a public IP address) can be sent to other peers. + + + Uit het deelsysteem gebruikt voor deze video blijkt het dat sommige technische informatie over jouw systeem (zoals een openbaar IP adres) verstuurd kan worden naar andere peers. + + + 209 + + + + More information + Meer informatie + + 212 + + + + Get more information + Krijg meer informatie + + 212 + + + + + OK + + + OK + + + 215 + + + + + Other videos + + + Andere videos + + + 2 + + + + + Comments + + + Reacties + + + 3 + + + + No comments. + Geen reacties + + 17 + + + + View all replies + Laat alle antwoorden zien + + 54 + + + + + Comments are disabled. + + + Reacties zijn uitgeschakeld. + + + 63 + + + + Add comment... + Voeg reactie toe... + + 6 + + + + + Post comment + + + Post reactie. + + + 20 + + + + You are one step away from commenting + Je bent een stap verwijderd van reageren + + 28 + + + + + If you have an account on this instance, you can login: + + + Als je een account hebt op deze instantie, kan je inloggen: + + + 32 + + + + login to comment + log in om te reageren + + 35 + + + + + Otherwise you can comment using an account on any ActivityPub-compatible instance. + On most platforms, you can find the video by typing its URL in the search bar and then comment it + from within the software's interface. + + + Anders kan je reageren door een account te gebruiken op welke ActivityPub-compatibele instatie dan ook. + Op de meeste platforms kan je de video vinden door zijn URL in de zoekbalk te typen en vervolgens het vanuit binnenin de software's interface te reageren. + + 36 + + + + + If you have an account on Mastodon or Pleroma, you can open it directly in their interface: + + +Als je een account op Mastodon of Pleroma hebt, kan je het direct openen vanuit hun interface: + + 41 + + + + Highlighted comment + Belichte reactie + + 5 + + + + Reply + Antwoord + + 14 + + + + No description + Geen beschrijving + + 1 + + + + Published videos + Gepubliceerde videos + + 1 + + + + Published videos + Videos gepubliceerd + + 1 + + + + 240p + 240p + + 1 + + + + 360p + 360p + + 1 + + + + 480p + 480p + + 1 + + + + 720p + 720p + + 1 + + + + 1080p + 1080p + + 1 + + + + Auto (via ffmpeg) + Auto (via ffmpeg) + + 1 + + + + Configuration updated. + Configuratie bijgewerkt. + + 1 + + + + Unlimited + Oneindig + + 1 + + + + 100MB + 100MB + + 1 + + + + 500MB + 500MB + + 1 + + + + 1GB + 1GB + + 1 + + + + 5GB + 5GB + + 1 + + + + 20GB + 20GB + + 1 + + + + 50GB + 50GB + + 1 + + + + 10MB + 10MB + + 1 + + + + 50MB + 50MB + + 1 + + + + 2GB + 2GB + + 1 + + + + is not valid + is niet valide + + 1 + + + + You need to specify hosts to follow. + Je moet de hosts specificeren om te volgen. + + 1 + + + + Hosts need to be unique. + Hosts moeten uniek zijn. + + 1 + + + + If you confirm, you will send a follow request to: - + Als je bevestigd, verzend je een volgverzoek naar: - + + 1 + + + + Follow new server(s) + Volg nieuwe server(s) + + 1 + + + + Follow request(s) sent! + Volgverzoek(en) verstuurd! + + 1 + + + + Do you really want to unfollow ? + Wil je echt onvolgen? + + 1 + + + + Unfollow + Onvolgen + + 1 + + + + You are not following anymore. + Je volgt niet meer. + + 1 + + + + enabled + ingeschakeld + + 1 + + + + disabled + uitgeschakeld + + 1 + + + + Redundancy for is + Overtolligheid voor is + + 1 + + + + Account unmuted by your instance. + Account niet meer gedempt door jouw instantie. + + 1 + + + + Instance unmuted by your instance. + Instantie niet meer gedempt door jouw instantie. + + 1 + + + + Comment updated. + Reactie bijgewerkt. + + 1 + + + + Delete this report + Verwijder deze rapportage + + 1 + + + + Update moderation comment + Werk beheerder-reactie bij + + 1 + + + + Mark as accepted + Markeer als geaccepteerd + + 1 + + + + Mark as rejected + Markeer als afgewezen + + 1 + + + + Do you really want to delete this abuse report? + Wil je echt dit misbruiksrapportage verwijderen? + + 1 + + + + Abuse deleted. + Misbruik verwijdert. + + 1 + + + + Do you really want to remove this video from the blacklist? It will be available again in the videos list. + Wil je deze video echt verwijderen van je zwarte lijst? Hij zal weer beschikbaar zijn in de videolijst. + + 1 + + + + Video removed from the blacklist. + Video verwijdert van de zwarte lijst. + + 1 + + + + User created. + Gebruiker verwijdert. + + 1 + + + + User updated. + Gebruiker bijgewerkt. + + 1 + + + + Update user + Werk gebruiker bij + + 1 + + + + Unban + Onverban + + 1 + + + + Set Email as Verified + Zet E-mail als Geverifieerd + + 1 + + + + You cannot ban root. + Je kan root niet verbannen. + + 1 + + + + Do you really want to unban users? + Wil jij echt gebruikers onverbannen? + + 1 + + + + users unbanned. + gebruikers onverbannen. + + 1 + + + + You cannot delete root. + Je kan root niet verwijderen. + + 1 + + + + If you remove these users, you will not be able to create others with the same username! + Als jij deze gebruikers verwijdert, kan je niet meer anderen maken met dezelfde gebruikersnaam! + + 1 + + + + users deleted. + gebruikers verwijdert. + + 1 + + + + users email set as verified. + gebruikers'' gezet als geverifieerd. + + 1 + + + + Account unmuted. + Account niet meer gedempt. + + 1 + + + + Instance unmuted. + Instantie niet meer gedempt. + + 1 + + + + Ownership accepted + Eigendom geaccepteerd + + 1 + + + + Password updated. + Wachtwoord bijgewerkt. + + 1 + + + + You current password is invalid. + Jouw huide wachtwoord is invalide. + + 1 + + + + Are you sure you want to delete your account? This will delete all you data, including channels, videos etc. + Weet je zeker dat je jouw account wil verwijderen? Dit verwijdert al jouw data, inclusief kanalen, videos etc. + + 1 + + + + Type your username to confirm + Typ je gebruikersnaam in om te bevestigen + + 1 + + + + Delete my account + Verwijder mijn account + + 1 + + + + Your account is deleted. + Jouw account is verwijdert. + + 1 + + + + Profile updated. + Profiel bijgewerkt. + + 1 + + + + Avatar changed. + Avatar verandert. + + 1 + + + + Information updated. + Informatie bijgewerkt. + + 1 + + + + Video channel created. + Videokanaal gecreëerd. + + 1 + + + + This name already exists on this instance. + Deze naam bestaat al op deze instantie. + + 1 + + + + Create + Creeër + + 1 + + + + Video channel updated. + Videokanaal bijgewerkt. + + 1 + + + + Video channel deleted. + Videokanaal verwijdert. + + 1 + + + + My videos + Mijn video's + + 1 + + + + Do you really want to delete videos? + Wil jij echt videos verwijderen? + + 1 + + + + videos deleted. + videos verwijdert. + + 1 + + + + Do you really want to delete ? + Weet jij zeker dat je wilt verwijderen? + + 1 + + + + Video deleted. + Video verwijdert. + + 1 + + + + Published + Gepubliceerd + + 1 + + Publication scheduled on Publicatie uitgesteld tot @@ -1318,23 +3875,1699 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 1 + + Waiting transcoding + Wachten op transcoding + + 1 + + + + To transcode + Om te transcoden + + 1 + + + + To import + Om te importeren + + 1 + + + + Ownership change request sent. + Eigenaarsveranderingsaanvrag gestuurd. + + 1 + + + + My library + Mijn bibliotheek + + 1 + + + + My channels + Mijn kanalen + + 1 + + + + My subscriptions + Mijn abonnementen + + 1 + + + + Misc + Varia + + 1 + + + + Ownership changes + Veranderingen van eigenaar + + 1 + + + + My settings + Mijn instellingen + + 1 + + + + An email with verification link will be sent to . + Een e-mail met verificatielink wordt verstuurd naar . + + 1 + + + + Unable to find user id or verification string. + Niet in staat om gebruikersid of verificatiestring te vinden. + + 1 + + + + Subscribe to the account + Abonneer op het account + + 1 + + + + Focus the search bar + Focus de zoekbalk + + 1 + + + + Toggle the left menu + Schakel het linker menu aan of uit + + 1 + + + + Go to the videos overview page + Ga naar de video-overzichtspagina + + 1 + + + + Go to the trending videos page + Ga naar de trending videos pagina + + 1 + + + + Go to the recently added videos page + Ga naar recent toegevoegde videos pagina + + 1 + + + + Go to the local videos page + Ga naar de locale videos pagina + + 1 + + + + Go to the videos upload page + Ga naar de videos uploadpagina + + 1 + + + + Toggle Dark theme + Schakel donker thema aan of uit + + 1 + + + + Go to my subscriptions + Ga naar mijn abonnementen + + 1 + + + + Go to my videos + Ga naar mijn videos + + 1 + + + + Go to my imports + Ga naar mijn imports + + 1 + + + + Go to my channels + Ga naar mijn kanalen + + 1 + + + + Cannot retrieve OAuth Client credentials: . + + Kan niet credenties van OAuth Client verkrijgen: . + + + 1 + + + + Ensure you have correctly configured PeerTube (config/ directory), in particular the "webserver" section. + Weet zeker dat je correct PeerTube geconfigureerd hebt (config/directory), vooral de "webserver" sectie. + + 1 + + + + Error + Fout + + 1 + + + + You need to reconnect. + Je moet opnieuw verbinden. + + 1 + + + + Confirm + Bevestigen + + 1 + + + + Keyboard Shortcuts: + Keyboard Shortcuts: + + 1 + + + + Info + Info + + 1 + + + + Success + Success + + 1 + + + + Incorrect username or password. + Incorrecte gebruikersnaam of wachtwoord. + + 1 + + + + You account is blocked. + Jouw account is geblokkeerd. + + 1 + + + + An email with the reset password instructions will be sent to . + Een e-mail met de wachtwoord reset instructies wordt gestuurd naar . + + 1 + + + + Your password has been successfully reset! + Jouw wachtwoord is succesvol gereset! + + 1 + + + + Today + Vandaag + + 1 + + + + Last 7 days + Laatste 7 dagen + + 1 + + + + Last 30 days + Laatste 30 dagen + + 1 + + + + Last 365 days + Laatste 365 dagen + + 1 + + + + Short (< 4 min) + Kort (< 4 min) + + 1 + + + + Long (> 10 min) + Long (> 10 min) + + 1 + + + + Medium (4-10 min) + Middelmatig (4-10 min) + + 1 + + + + Relevance + Relevantie + + 1 + + + + Publish date + Publicatiedatum + + 1 + + + + Views + Weergaven + + 1 + + + + Search + Zoeken + + 1 + + + + Instance name is required. + Instantienaam is vereist. + + 1 + + + + Short description should not be longer than 250 characters. + Korte beschrijvingen moeten niet langer zijn dan 250 karakters. + + 1 + + + + Twitter username is required. + Twitter gebruikersnaam is vereist. + + 1 + + + + Previews cache size is required. + Cachegrootte van voorvertoning is vereist. + + 1 + + + + Previews cache size must be greater than 1. + Cachegrootte van voorvertoning moet groter zijn dan 1. + + 1 + + + + Previews cache size must be a number. + Cachegrootte van voorvertoning moet een nummer zijn. + + 1 + + + + Captions cache size is required. + Cachegrootte van ondertiteling is vereist. + + 1 + + + + Captions cache size must be greater than 1. + Cachegrootte van ondertiteling moet groter zijn dan 1. + + 1 + + + + Captions cache size must be a number. + Cachegrootte van ondertiteling moet een nummer zijn. + + 1 + + + + Signup limit is required. + Inschrijflimiet is vereist. + + 1 + + + + Signup limit must be greater than 1. + Inschrijflimiet moet groter zijn dan 1. + + 1 + + + + Signup limit must be a number. + Inschrijflimiet moet een nummer zijn. + + 1 + + + + Admin email is required. + Administrator e-mail is vereist. + + 1 + + + + Admin email must be valid. + Administrator e-mail moet valide zijn. + + 1 + + + + Transcoding threads is required. + Transcoding threads zijn vereist. + + 1 + + + + Transcoding threads must be greater or equal to 0. + Transcoding threads moeten groter of gelijk zijn aan 0. + + 1 + + + + Email is required. + E-mail is vereist. + + 1 + + + + Email must be valid. + E-mail moet valide zijn. + + 1 + + + + Username is required. + Gebruikersnaam is vereist. + + 1 + + + + Password is required. + Wachtwoord is vereist. + + 1 + + + + Confirmation of the password is required. + Bevestiging van het wachtwoord is vereist. + + 1 + + + + Password must be at least 6 characters long. + Wachtwoord moet minstens 6 karakters lang zijn. + + 1 + + + + Password cannot be more than 255 characters long. + Wachtwoord kan niet langer zijn dan 255 karakters. + + 1 + + + + The new password and the confirmed password do not correspond. + Het nieuwe wachtwoord en het bevestigde wachtwoord zijn niet hetzelfde. + + 1 + + + + Video quota is required. + Videoquotum is vereist. + + 1 + + + + Quota must be greater than -1. + Quota moet groter zijn dan -1 + + 1 + + + + Daily upload limit is required. + Dagelijks uploadlimiet is vereist. + + 1 + + + + Daily upload limit must be greater than -1. + Dagelijks uploadlimiet moet groter zijn dan -1. + + 1 + + + + User role is required. + Gebruikersrol is vereist. + + 1 + + Display name is required. - Een weergavenaam is verplicht + Een weergavenaam is verplicht. 1 - - Display name must be at least 3 characters long. - Je weergavenaam moet minstens 3 tekens lang zijn. + + Description must be at least 3 characters long. + Beschrijvingen moeten minstens 3 karakters lang zijn. 1 - - Display name cannot be more than 120 characters long. - Je weergavenaam kan niet langer dan 120 tekens zijn. + + Description cannot be more than 1000 characters long. + Beschrijvingen mogen niet langer dan 1000 karakters zijn. + + 1 + + + + You must to agree with the instance terms in order to registering on it. + Je moet akkoord gaan met de instantie's termijnen om erop te registreren. + + 1 + + + + Ban reason must be at least 3 characters long. + Verbanningsreden moet minstens 3 karakters zijn. + + 1 + + + + Ban reason cannot be more than 250 characters long. + Verbanningsreden kan niet langer dan 250 tekens zijn. + + 1 + + + + Report reason is required. + Rapportagereden is vereist. + + 1 + + + + Report reason must be at least 2 characters long. + Rapportagereden moet minstens 2 tekens zijn. + + 1 + + + + Moderation comment is required. + Beheersreactie is vereist. + + 1 + + + + Moderation comment must be at least 2 characters long. + Beheersreactie moet minstens 2 karakters zijn. + + 1 + + + + The channel is required. + Het kanaal is vereist. + + 1 + + + + Blacklist reason must be at least 2 characters long. + Zwartelijstreden moet minstens 2 karakters zijn. + + 1 + + + + Blacklist reason cannot be more than 300 characters long. + Zwartelijstreden kan niet langer dan 300 karakters zijn. + + 1 + + + + Video caption language is required. + Video ondertitelingstaal is vereist. + + 1 + + + + Video caption file is required. + Video ondertitelingsbestand is vereist. + + 1 + + + + The username is required. + De gebruikersnaam is vereist. + + 1 + + + + You can only transfer ownership to a local account + Je kan alleen je eigendom transporteren naar een lokaal account + + 1 + + + + Name is required. + Naam is vereist. + + 1 + + + + Support text must be at least 3 characters long. + Supporttekst moet minstens 3 karakters zijn. + + 1 + + + + Support text cannot be more than 1000 characters long. + Supporttekst mag niet meer zijn dan 1000 karakters. + + 1 + + + + Comment is required. + Reactie is vereist. + + 1 + + + + Comment must be at least 2 characters long. + Reactie moet minstens 2 karakters zijn. + + 1 + + + + Comment cannot be more than 3000 characters long. + Reactie kan niet meer dan 3000 karakters zijn. + + 1 + + + + Video name is required. + Videonaam is vereist. + + 1 + + + + Video name must be at least 3 characters long. + Videonaam moet minstens 3 karakters zijn. + + 1 + + + + Video name cannot be more than 120 characters long. + Videonaam kan niet meer dan 120 karakters zijn. + + 1 + + + + Video privacy is required. + Videoprivacy is vereist. + + 1 + + + + Video channel is required. + Videokanaal is vereist. + + 1 + + + + Video description must be at least 3 characters long. + Videobeschrijving moet minstens 3 karakters zijn. + + 1 + + + + Video description cannot be more than 10000 characters long. + Videobeschrijving kan niet meer dan 10000 karakters zijn. + + 1 + + + + A tag should be more than 2 characters long. + Een tag moet minstens 2 karakters zijn. + + 1 + + + + A tag should be less than 30 characters long. + Een tag moet minder dan 30 karakters zijn. + + 1 + + + + Video support must be at least 3 characters long. + Videosupport moet minstens 3 karakters zijn. + + 1 + + + + Video support cannot be more than 1000 characters long. + Videosupport kan niet meer dan 1000 karakters zijn. + + 1 + + + + A date is required to schedule video update. + Een datum is vereist om videoupdates in te roosteren. + + 1 + + + + This file is too large. + Dit bestand is te groot. + + 1 + + + + All unsaved data will be lost, are you sure you want to leave this page? + Alle onopgeslagen data zal verloren worden, weet je zeker dat je deze pagina wil verlaten? + + 1 + + + + Warning + Waarschuwing + + 1 + + + + Sunday + Zondag + + 1 + + + + Monday + Maandag + + 1 + + + + Tuesday + Dinsdag + + 1 + + + + Wednesday + Woensdag + + 1 + + + + Thursday + Donderdag + + 1 + + + + Friday + Vrijdag + + 1 + + + + Saturday + Zaterdag + + 1 + + + + Sun + Zon + + 1 + + + + Mon + Maa + + 1 + + + + Tue + Din + + 1 + + + + Wed + Woe + + 1 + + + + Thu + Don + + 1 + + + + Fri + Vri + + 1 + + + + Sat + Zat + + 1 + + + + Su + Zon + + 1 + + + + Mo + Ma + + 1 + + + + Tu + Di + + 1 + + + + We + Wo + + 1 + + + + Th + Do + + 1 + + + + Fr + Vr + + 1 + + + + Sa + Za + + 1 + + + + January + Januari + + 1 + + + + February + Februari + + 1 + + + + March + Maart + + 1 + + + + April + April + + 1 + + + + May + Mei + + 1 + + + + June + Juni + + 1 + + + + July + July + + 1 + + + + August + Augustus + + 1 + + + + September + September + + 1 + + + + October + Oktober + + 1 + + + + November + November + + 1 + + + + December + December + + 1 + + + + Jan + Jan + + 1 + + + + Feb + Feb + + 1 + + + + Mar + Mar + + 1 + + + + Apr + Apr + + 1 + + + + Jun + Jun + + 1 + + + + Jul + Jul + + 1 + + + + Aug + Aug + + 1 + + + + Sep + Sep + + 1 + + + + Oct + Oct + + 1 + + + + Nov + Nov + + 1 + + + + Dec + Dec + + 1 + + + + Clear + Wissen + + 1 + + + + yy-mm-dd + jj-mm-dd + + 1 + + + + Transcode your videos in multiple resolutions + Transcodeer je videos in meerdere resoluties + + 1 + + + + HTTP import (YouTube, Vimeo, direct URL...) + HTTP import(Youtube, Vimeo, directe URL...) + + 1 + + + + Torrent import + Torrentimport + + 1 + + + + ~ + ~ + + 1 + + + + {VAR_PLURAL, plural, =1 {minute} other {minutes} } + {VAR_PLURAL, plural, =1 {minute} other {minutes} } + + 1 + + + + of full HD videos + aan full HD videos + + 1 + + + + of HD videos + aan HD videos + + 1 + + + + of average quality videos + aan gemiddelde kwaliteit videos + + 1 + + + + years ago + jaar geleden + + 1 + + + + months ago + maanden geleden + + 1 + + + + month ago + maand geleden + + 1 + + + + weeks ago + weken geleden + + 1 + + + + week ago + week geleden + + 1 + + + + days ago + dagen geleden + + 1 + + + + day ago + dag geleden + + 1 + + + + hours ago + uren geleden + + 1 + + + + hour ago + uur geleden + + 1 + + + + min ago + min geleden + + 1 + + + + sec ago + sec geleden + + 1 + + + + Markdown compatible that supports: + Markeer compatibele dat support: + + 1 + + + + Emphasis + Nadruk + + 1 + + + + Links + Links + + 1 + + + + New lines + Nieuwe lijnen + + 1 + + + + Lists + Lijsten + + 1 + + + + Images + Afbeeldingen + + 1 + + + + users banned. + gebruikers verbannen. + + 1 + + + + User banned. + Gebruiker verbannen. + + 1 + + + + Do you really want to unban ? + Weet je zeker dat je wilt onverbannen? + + 1 + + + + User unbanned. + Gebruiker onverbannen. + + 1 + + + + If you remove this user, you will not be able to create another with the same username! + Als je deze gebruiker verwijdert, is het niet meer mogelijk om een andere te maken met dezelfde gebruikersnaam! + + 1 + + + + User deleted. + Gebruiker verwijdert. + + 1 + + + + User email set as verified + Gebruiker e-mail gezet als geverifieerd + + 1 + + + + Account muted. + Account gedempt. + + 1 + + + + Instance muted. + Instantie gedempt. + + 1 + + + + Account muted by the instance. + Account gedempt door de instantie. + + 1 + + + + Account unmuted by the instance. + Account niet meer gedempt door de instantie. + + 1 + + + + Instance muted by the instance. + Instantie gedempt door de instantie. + + 1 + + + + Instance unmuted by the instance. + Instantie niet meer gedempt door de instantie. + + 1 + + + + Mute this account + Demp dit account + + 1 + + + + Unmute this account + Dempt dit account niet meer + + 1 + + + + Mute the instance + Demp de instantie + + 1 + + + + Unmute the instance + Demp de instantie niet meer + + 1 + + + + Mute this account by your instance + Demp dit account door jouw instantie + + 1 + + + + Unmute this account by your instance + Demp dit account niet meer door jouw instantie + + 1 + + + + Mute the instance by your instance + Demp de instantie door jouw instantie + + 1 + + + + Unmute the instance by your instance + Demp de instantie niet meer door jouw instantie + + 1 + + + + Request is too large for the server. Please contact you administrator if you want to increase the limit size. + Verzoek te groot voor de server. Alstublieft bereikt de administrator als je de limietgrote wilt vergroten. + + 1 + + + + Too many attempts, please try again after minutes. + Te vaak geprobeerd, probeer alstublieft weer na minuten. + + 1 + + + + Too many attempts, please try again later. + Te vaak geprobeerd, probeer alstublieft later. + + 1 + + + + Server error. Please retry later. + Serverfout. Probeer later alstublieft weer. + + 1 + + + + Subscribed to + Abonneer op + + 1 + + + + Subscribed + Geabonneert + + 1 + + + + Unsubscribed from + Ongeabonneert van + + 1 + + + + Unsubscribed + Ongeabonneert + + 1 + + + + Moderator + Beheerder + + 1 + + + + Only I can see this video + Ik kan deze video alleen zien + + 1 + + + + Only people with the private link can see this video + Alleen mensen met de privélink kunnen deze video zien + + 1 + + + + Anyone can see this video + Iedereen kan deze video zien + + 1 + + + + Welcome! Now please check your emails to verify your account and complete signup. + Welkom! Check alstublieft nu jouw e-mails om jouw accont te verifieren en de inschrijving te voltooien + + 1 + + + + You are now logged in as ! + Je bent nu ingelogd als ! + + 1 + + + + Video to import updated. + Video naar import bijgewerkt. + + 1 + + + + Your video was uploaded to your account and is private. + Jouw video is geupload naar jouw account en is privé. + + + 1 + + + + But associated data (tags, description...) will be lost, are you sure you want to leave this page? + Maar geassocieerde data(tags, beschrijving...) zullen verloren raken, weet je zeker dat je deze pagina wilt verlaten? + + 1 + + + + Your video is not uploaded yet, are you sure you want to leave this page? + Jouw video is nog niet geupload, weet je zeker dat je deze pagina wilt verlaten? + + 1 + + + + Upload cancelled + Upload geannuleerd + + 1 + + + + Your video quota is exceeded with this video (video size: , used: , quota: ) + Jouw videoquotum is overschreden met deze video (videogrootte: , gebruikt: , quotum: ) + + 1 + + + + Your daily video quota is exceeded with this video (video size: , used: , quota: ) + Jouw dagelijkse videoquotum is overschreden met deze video (videogrootte: , gebruikt: , quotum: ) + + 1 + + + + Video published. + Video gepubliceerd. + + 1 + + + + Video updated. + Video geupdate. + + 1 + + + + replies will be deleted too. + reacties zullen ook worden verwijdert. + + 1 + + + + Video blacklisted. + Video op de zwarte lijst. + + 1 + + + + Copied + Gekopieerd + + 1 + + + + Video reported. + Video gerapporteerd. + + 1 + + + + Start at + Start op + + 1 + + + + Like the video + Like de video + + 1 + + + + Dislike the video + Dislike de video + + 1 + + + + Do you really want to delete this video? + Weet je zeker dat je de video wil verwijderen? + + 1 + + + + likes / dislikes + likes / dislikes + + 1 + + + + This video contains mature or explicit content. Are you sure you want to watch it? + Deze video bevat volwassen of expliciete inhoud. Weet je zeker dat je hem wilt kijken? + + 1 + + + + Mature or explicit content + Volwassen of expliciete content + + 1 + + + + Videos from your subscriptions + Videos van jou abonnementen 1 diff --git a/client/src/locale/target/angular_oc.xml b/client/src/locale/target/angular_oc.xml index 26ff5264e..106de7d5e 100644 --- a/client/src/locale/target/angular_oc.xml +++ b/client/src/locale/target/angular_oc.xml @@ -227,6 +227,57 @@ 11 + + You don't have notifications. + Avètz pas cap de notificacion. + + 1 + + + + + published a new video + + + a publicat una nòva vidèo + + + 7 + + + + + commented your video + + + a comentat vòstra vidèo + + + 23 + + + + + Your video has been published + + + Vòstra vidèo es publicada + + + 27 + + + + + + + + + + + 57 + + Unlisted Pas listada @@ -434,6 +485,13 @@ 25 + + + + + 11 + + Login @@ -499,7 +557,7 @@ Password Senhal - 12 + 13 @@ -513,7 +571,7 @@ Login Connexion - 38 + 36 @@ -541,7 +599,7 @@ Send me an email to reset my password Me mandar un corrièl per reïnicializar lo senhal - 75 + 80 @@ -610,7 +668,7 @@ Signup Inscripcion - 88 + 78 @@ -680,7 +738,18 @@ Change the language Cambiar la lenga - 88 + 86 + + + + + Help to translate PeerTube! + + + Ajudatz a traduire PeerTube ! + + + 8 @@ -691,7 +760,7 @@ Mon perfil public - 18 + 16 @@ -702,7 +771,7 @@ Mon compte - 22 + 20 @@ -713,7 +782,7 @@ Mas vidèos - 26 + 24 @@ -724,14 +793,14 @@ Desconnexion - 30 + 28 Create an account Crear un compte - 39 + 37 @@ -745,49 +814,49 @@ Subscriptions Abonaments - 47 + 45 Overview Apercebut - 52 + 50 Trending Tendéncias - 57 + 55 Recently added Apondons recents - 62 + 60 Local Localas - 67 + 65 More Mai - 72 + 70 Administration Administracion - 76 + 74 @@ -801,14 +870,42 @@ Show keyboard shortcuts Mostrar los acorchis clavièr - 91 + 89 Toggle dark interface Passar a l’interfàcia escura - 94 + 92 + + + + View your notifications + Veire vòstras notificacions + + 3 + + + + Notifications + Notificacions + + 10 + + + + Update your notification preferences + Actualizar vòstras preferéncias de notificacion + + 15 + + + + See all your notifications + Veire totas vòstras notificacions + + 22 @@ -913,14 +1010,14 @@ Display unlisted and private videos Mostrar las vidèos pas listadas e las privadas - 11 + 14 No results. Cap de resultat - 17 + 20 @@ -978,15 +1075,57 @@ 7 - - - About instance - - - A prepaus de l’instància - + + Contact administrator + Contactar l’administrator de - 1 + 3 + + + + Your name + Vòstre nom + + 11 + + + + Your email + Vòstra adreça + + 20 + + + + Your message + Vòstre messatge + + 29 + + + + + Cancel + + + Anullar + + + 26 + + + + Submit + Mandar + + 31 + + + + About instance + A prepaus de l’instància + + 4 @@ -1000,45 +1139,14 @@ Terms Tèrmes - 44 + 39 User registration is allowed and Las inscripcions son autorizadas e - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - aquesta instància provesís un quòta de basa de d’espaci per las vidèos de sos utilizaires. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - aquesta instància fornís un espaci sens limit per las vidèos de sos utilizaires. - - - 31 - - - - - User registration is currently not allowed. - - Las inscriptions son pas pel moment possiblas - - 36 + 29 @@ -1393,49 +1501,49 @@ Short description Descripcion corta - 22 + 21 Default client route Rota del client per defaut - 55 + 48 Videos Overview Apercebuts de las vidèos - 58 + 51 Videos Trending Vidèos a la mòda - 59 + 52 Videos Recently Added Vidèos ajustadas recentament - 60 + 53 Local videos Vidèos localas - 61 + 54 Policy on videos containing sensitive content Politica tocant las vidèos amb de contengut sensible - 70 + 61 @@ -1470,23 +1578,44 @@ Signup enabled Inscripcions activadas - 93 + 84 Signup requires email verification L’inscripcion demanda una verificacion d’adreça electronica - 100 + 91 Signup limit Limit d’inscripcions + + 96 + + + + Users + Utilizaires 105 + + User default video quota + Quòta per defaut per utilizaire + + 109 + + + + User default daily upload limit + Quòta jornalièr de mandadís per defaut dels utilizaires + + 121 + + Import Importar @@ -1498,49 +1627,28 @@ Video import with HTTP URL (i.e. YouTube) enabled Import vidèo amb URL HTTP (per exemple YouTube) activat - 120 + 141 Video import with a torrent file or a magnet URI enabled Import de vidèos via un fichièr torretn o un magnet URI activat - 127 + 148 Administrator Administrator - 131 + 155 Admin email Adreça de l’admin - 134 - - - - Users - Utilizaires - - 144 - - - - User default video quota - Quòta per defaut per utilizaire - - 147 - - - - User default daily upload limit - Quòta jornalièr de mandadís per defaut dels utilizaires - - 161 + 158 @@ -1561,30 +1669,19 @@ Your Twitter username Vòstre nom d’utilizaire Twitter - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Indica lo compte Twitter del site o de la plataforma ont lo contengut foguèt publicat. - 184 + 187 Instance whitelisted by Twitter Instàncias en lista blanca per Twitter - - 198 - - - - If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br /> - If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.<br /><br /> - Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> to see if you instance is whitelisted. - Se vòstra instància es mesa en lista blanca per Twitter, un lector vidèo serà integrat pel fil Twitter sul partatge d’una vidèo PeerTube.<br /> - Se l’instància es pas en lista blanca, utilizam un imatge amb un ligam que mena a l’instància PeerTube.<br /><br /> - Clicatz aquesta bóstia, salvagardatz la configuracion e ensajatz amb l’URL d’una vidèo de vòstra instància (https://exemple.com/videos/watch/blabla) sus <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> per veire se vòstra instància es en lista blanca. 199 @@ -1600,35 +1697,35 @@ Transcoding Transcodatge - 210 + 215 Transcoding enabled Transcodatge activat - 215 + 221 If you disable transcoding, many videos from your users will not work! Se desactivatz lo transcodatge, un fum de vidèos de vòstres utilizaires foncionaràn pas ! - 216 + 222 Transcoding threads Transcodatge dels threads - 223 + 237 Resolution enabled Resolucion activada - 239 + 252 @@ -1643,82 +1740,47 @@ - 244 + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Qualques fichièrs son pas federats (apercebuts, legendas). Los recuperam de l’instància d’origina estant e los metèm en cache. - 249 + 265 Previews cache size Talha del cache d’apercebut - 254 + 271 Video captions cache size Talha del cache per las legendas de las vidèos - 265 + 280 Customizations Personalizacions - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Escrivètz dirèctament de JavaScript còdi.<br />Exemple : <pre>console.log('mon instància es tròp crana');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - Escrivètz dirèctament lo còdi CSS. Exemple :<br /> - <pre> - body - background-color: red; - - </pre> - - Prefixatz amb <em>#custom-css</em> per subrecargar los estiles. Exemple : - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1727,21 +1789,21 @@ Advanced configuration Configuracion avançada - 207 + 212 Update configuration Actualizar la configuracion - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Sembla que la configuracion es invalida. Mercés de cercar d’errors possiblas pels diferents onglets. - 326 + 341 @@ -2037,21 +2099,21 @@ User's email must be verified to login Lo corrièl de l’utilizaire deu èsser verificat abans la connexion - 70 + 72 User's email is verified / User can login without email verification Lo corrièl de l’utilizaire es verificat / Pòt se connectar sens verificacion de l’adreça - 74 + 76 Ban reason: Rason del bandiment : - 92 + 95 @@ -2118,7 +2180,7 @@ Actions Accions - 33 + 35 @@ -2153,14 +2215,14 @@ Date Data - 10 + 11 Blacklist reason: Rason de la mesa en lista negra : - 41 + 43 @@ -2219,69 +2281,6 @@ 23 - - My settings - Mos paramètres - - 3 - - - - My library - Ma bibliotèca - - 7 - - - - My channels - Mas cadenas - - 12 - - - - My videos - Mas vidèos - - 14 - - - - My subscriptions - Mos abonaments - - 16 - - - - My imports - Mas importacions - - 18 - - - - Misc - Divèrs - - 24 - - - - Muted instances - Instàncias mudas - - 2 - - - - Ownership changes - Cambiaments de proprietats - - 33 - - Video quota: Quòta vidèo : @@ -2293,21 +2292,21 @@ Profile Perfil - 8 + 7 Video settings Paramètres vidèo - 15 + 16 Danger zone Zòna perilhosa - 18 + 19 @@ -2335,13 +2334,6 @@ 35 - - Submit - Mandar - - 24 - - - views - vistas @@ -2500,6 +2492,13 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 47 + + Muted instances + Instàncias mudas + + 2 + + Change password Cambiar lo senhal @@ -2598,6 +2597,13 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 4 + + Web + Site web + + 3 + + Sorry, but we couldn't find the page you were looking for. @@ -2748,14 +2754,14 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto Publish will be available when upload is finished La publicacion serà possibla un còp lo mandadís acabat - 53 + 58 Publish Publicar - 60 + 65 @@ -2938,14 +2944,14 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto Wait transcoding before publishing the video Esperar lo transcodatge abans de publicar la vidèo - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Se decidissètz d’esperar pas lo transcodatge abans de publicar la vidèo, serà pas legibla fins a la fin del transcodatge. - 131 + 132 @@ -2959,49 +2965,49 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto Add another caption Ajustar una legenda mai - 146 + 147 See the subtitle file Veire lo fichièr de sostítols - 155 + 156 Already uploaded ✔ Ja enviada ✔ - 159 + 160 Will be created on update Serà creada en actualizar - 167 + 168 Cancel create Anullar la creacion - 169 + 170 Will be deleted on update Serà suprimida en actualizar - 175 + 176 Cancel deletion Anullar la supression - 177 + 178 @@ -3012,28 +3018,28 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto Encara cap de legendas. - 182 + 183 Captions Legendas - 139 + 140 Upload thumbnail Enviar una vinheta d’apercebut - 195 + 196 Upload preview Enviar un apercebut - 202 + 203 @@ -3047,14 +3053,14 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto Short text to tell people how they can support you (membership platform...). Pichon tèxte per explicar al monde cossí pòdon vos sosténer (plataforma pels sòcis...). - 209 + 210 Advanced settings Paramètres avançats - 190 + 191 @@ -3121,17 +3127,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 3 - - - Cancel - - - Anullar - - - 19 - - Share Partejar @@ -3518,13 +3513,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 14 - - Error getting about from server - Error en recuperar las informacions de la seccion «A prepaus» del servidor - - 1 - - No description Cap de descripcion @@ -3546,13 +3534,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Error - Error - - 1 - - 240p 240p @@ -3595,13 +3576,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Success - Succès - - 1 - - Configuration updated. Configuracion actualizada. @@ -3987,6 +3961,13 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 + + Preferences saved + Preferéncias salvagardadas + + 1 + + Profile updated. Perfil actualizat @@ -4036,20 +4017,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Volètz vertadièrament suprimir  ? Aquò suprimarà tanben totas las vidèos enviadas a la cadena. - - 1 - - - - Please type the name of the video channel to confirm - Tornatz picar lo nom de la cadena per confirmar - - 1 - - Video channel deleted. Cadena vidèo suprimida. @@ -4057,6 +4024,13 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 + + My videos + Mas vidèos + + 1 + + Do you really want to delete videos? Volètz vertadièrament suprimir vidèos ? @@ -4127,16 +4101,58 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Channels - Cadenas + + My library + Ma bibliotèca 1 - - Video imports - Imports vidèo + + My channels + Mas cadenas + + 1 + + + + My subscriptions + Mos abonaments + + 1 + + + + My history + Mon istoric + + 1 + + + + Misc + Divèrs + + 1 + + + + Ownership changes + Cambiaments de proprietats + + 1 + + + + My settings + Mos paramètres + + 1 + + + + My notifications + Mas notificacions 1 @@ -4262,6 +4278,13 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 + + Error + Error + + 1 + + You need to reconnect. Vos cal vos reconnectar. @@ -4283,6 +4306,20 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 + + Info + Info + + 1 + + + + Success + Succès + + 1 + + Incorrect username or password. Nom d’utilizaire o senhal incorrècte. @@ -4500,6 +4537,27 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 + + Email is required. + L’adreça electronica es requesida. + + 1 + + + + Email must be valid. + L’adreça electronica deu èsser valida. + + 1 + + + + Your name is required. + Vòstre nom es requesit + + 1 + + Username is required. Lo nom d’utilizaire es requesit. @@ -4521,37 +4579,16 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Username must be at least 3 characters long. - Lo nom d’utilizaire deu conténer almens 3 caractèrs. + + Username must be at least 1 character long. + Lo nom d’utilizaire deu almens conténer 1 caractèr. 1 - - Username cannot be more than 20 characters long. - Lo nom d’utilizaire pòt pas conténer mai de 20 caractèrs. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Lo nom d’utilizaire deu èsser alfanumeric e en minuscula. - - 1 - - - - Email is required. - L’adreça electronica es requesida. - - 1 - - - - Email must be valid. - L’adreça electronica deu èsser valida. + + Username cannot be more than 50 characters long. + Lo nom d’utilizaire pòt pas conténer mai de 50 caractèrs. 1 @@ -4619,16 +4656,16 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Display name must be at least 3 characters long. - L’escais-nom deu almens conténer 3 caractèrs. + + Display name must be at least 1 character long. + Lo nom public deu almens conténer 1 caractèr. 1 - - Display name cannot be more than 120 characters long. - L’escais-nom pòt pas conténer mai de 120 caractèrs. + + Display name cannot be more than 50 characters long. + Lo nom public pòt pas conténer mai de 50 caractèrs. 1 @@ -4682,13 +4719,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Report reason cannot be more than 300 characters long. - La rason del senhalament pòt pas conténer mai de 300 caractèrs. - - 1 - - Moderation comment is required. Lo comentari de moderacion es requesit. @@ -4703,13 +4733,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Moderation comment cannot be more than 300 characters long. - Lo comentari de moderacion pòt pas conténer mai de 300 caractèrs. - - 1 - - The channel is required. La cadena es requesida. @@ -4766,23 +4789,16 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Name must be at least 3 characters long. - Lo nom deu almens conténer 3 caractèrs. + + Name must be at least 1 character long. + Lo nom deu almens conténer 1 caractèr. 1 - - Name cannot be more than 20 characters long. - Lo nom pòt pas conténer mai de 20 caractèrs. - - 1 - - - - Name should be only lowercase alphanumeric characters. - Lo nom deu èsser alfanumeric e en minuscula + + Name cannot be more than 50 characters long. + Lo nom pòt pas conténer mai de 50 caractèrs. 1 @@ -5599,13 +5615,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Subscribed - Abonat - - 1 - - Subscribed to S’abonèt a @@ -5613,9 +5622,9 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Unsubscribed - Pas mai abonat + + Subscribed + Abonat 1 @@ -5627,6 +5636,13 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 + + Unsubscribed + Pas mai abonat + + 1 + + Moderator Moderator @@ -5697,13 +5713,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Info - Info - - 1 - - Upload cancelled Mandadís anullat @@ -5711,13 +5720,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - We are sorry but PeerTube cannot handle videos > 8GB - O planhèm mas PeerTube pòt pas gerir de vidèos de mai de 8 Go - - 1 - - Your video quota is exceeded with this video (video size: , used: , quota: ) Vòstre quòta de vidèo es excedit amb aquesta vidèo (talha vidèo : , utilizat : , quòta : ) diff --git a/client/src/locale/target/angular_pl_PL.xml b/client/src/locale/target/angular_pl_PL.xml index e8494997a..6d5a06e53 100644 --- a/client/src/locale/target/angular_pl_PL.xml +++ b/client/src/locale/target/angular_pl_PL.xml @@ -342,7 +342,7 @@ Password Hasło - 12 + 13 @@ -356,7 +356,7 @@ Login Zaloguj się - 38 + 36 @@ -384,7 +384,7 @@ Send me an email to reset my password Wyślij mi wiadomość e-mail przywracającą hasło - 75 + 80 @@ -448,7 +448,7 @@ Signup Zarejestruj się - 88 + 78 @@ -498,7 +498,7 @@ Change the language Zmień język - 88 + 86 @@ -509,7 +509,7 @@ Mój profil publiczny - 18 + 16 @@ -520,7 +520,7 @@ Moje konto - 22 + 20 @@ -531,7 +531,7 @@ Moje filmy - 26 + 24 @@ -542,14 +542,14 @@ Wyloguj się - 30 + 28 Create an account Utwórz konto - 39 + 37 @@ -563,49 +563,49 @@ Subscriptions Subskrybcje - 47 + 45 Overview Przegląd - 52 + 50 Trending Na czasie - 57 + 55 Recently added Ostatnio dodane - 62 + 60 Local Lokalne - 67 + 65 More Więcej - 72 + 70 Administration Administracja - 76 + 74 @@ -619,7 +619,7 @@ Toggle dark interface Przełącz ciemny interfejs - 94 + 92 @@ -724,7 +724,7 @@ No results. Brak wyników. - 17 + 20 @@ -771,15 +771,22 @@ 7 - + - About instance - + Cancel + - O instancji - + Anuluj + - 1 + 26 + + + + Submit + Wyślij + + 31 @@ -793,47 +800,14 @@ Terms Zasady - 44 + 39 User registration is allowed and Rejestracja użytkowników jest dozwolona i - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - ta instancja oferuje podstawową powierzchnię na filmy swoich użytkowników. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - ta instancja oferuje nieograniczoną powierzchnię na filmy dla swoich użytkowników. - - - 31 - - - - - User registration is currently not allowed. - - - Rejestracja użytkowników nie jest obecnie dozwolona. - - - 36 + 29 @@ -1118,47 +1092,47 @@ Short description Krótki opis - 22 + 21 Default client routeDefault client route - 55 + 48 Videos Overview Przegląd Filmów - 58 + 51 Videos Trending Filmy na czasie - 59 + 52 Videos Recently Added Ostatnio dodane filmy - 60 + 53 Local videos Lokalne filmy - 61 + 54 Policy on videos containing sensitive content Polityka dotycząca filmów zawierających wrażliwą zawartość - 70 + 61 @@ -1193,23 +1167,44 @@ Signup enabled Wymagana rejestracja - 93 + 84 Signup requires email verification Rejestracja wymaga weryfikacji emaila - 100 + 91 Signup limit Limit rejestracji + + 96 + + + + Users + Użytkownicy 105 + + User default video quota + Domyślna powierzchnia na filmy dla użytkownika + + 109 + + + + User default daily upload limit + Domyślny limit dziennego wysyłania przez użytkownika + + 121 + + Import Importuj @@ -1221,35 +1216,14 @@ Administrator Administrator - 131 + 155 Admin email E-mail administratora - 134 - - - - Users - Użytkownicy - - 144 - - - - User default video quota - Domyślna powierzchnia na filmy dla użytkownika - - 147 - - - - User default daily upload limit - Domyślny limit dziennego wysyłania przez użytkownika - - 161 + 158 @@ -1270,21 +1244,21 @@ Your Twitter username Twoja nazwa użytkownika na Twitterze - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Oznacza konto Twittera dla strony lub platformy na której została opublikowana zawartość. - 184 + 187 Instance whitelisted by Twitter Instancja jest na białej liście Twittera - 198 + 199 @@ -1298,35 +1272,35 @@ Transcoding Transkodowanie - 210 + 215 Transcoding enabled Transkodowanie jest włączone - 215 + 221 If you disable transcoding, many videos from your users will not work! Jeżeli wyłączysz transkodowanie, wiele filmów od użytkowników może nie działać! - 216 + 222 Transcoding threads Wątki transkodowania - 223 + 237 Resolution enabled Włączono rozdzielczość - 239 + 252 @@ -1341,56 +1315,56 @@ - 244 + 260 Previews cache size Rozmiar pamięci podręcznej podglądu - 254 + 271 Customizations Dostosowywanie - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Wprowadź kod JavaScript.<br />Przykład: <pre>console.log('moja instancja jest świetna');</pre> - 281 + 297 Advanced configuration Zaawansowana konfiguracja - 207 + 212 Update configuration Aktualizuj konfigurację - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Wygląda na to, że konfiguracja jest nieprawidłowa. Poszukaj możliwych błędów w innych kartach. - 326 + 341 @@ -1669,7 +1643,7 @@ Actions Akcje - 33 + 35 @@ -1683,7 +1657,7 @@ Date Data - 10 + 11 @@ -1700,48 +1674,6 @@ 7 - - My settings - Moje ustawienia - - 3 - - - - My library - Moja biblioteka - - 7 - - - - My channels - Moje kanały - - 12 - - - - My videos - Moje filmy - - 14 - - - - My subscriptions - Moje subskrybcje - - 16 - - - - My imports - Moje importy - - 18 - - Video quota: Powierzchnia na filmy: @@ -1753,14 +1685,14 @@ Profile Profil - 8 + 7 Video settings Ustawienia wideo - 15 + 16 @@ -1774,13 +1706,6 @@ 35 - - Submit - Wyślij - - 24 - - - views - wyświetlenia @@ -2012,14 +1937,14 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia Publish will be available when upload is finished Opublikuj automatycznie po ukończeniu wysyłania - 53 + 58 Publish Opublikuj - 60 + 65 @@ -2131,7 +2056,7 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia Wait transcoding before publishing the video Poczekaj na transkodowanie przed opublikowaniem filmu - 130 + 131 @@ -2145,14 +2070,14 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia Upload thumbnail Wyślij miniaturę - 195 + 196 Upload preview Podgląd wysyłania - 202 + 203 @@ -2166,14 +2091,14 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia Short text to tell people how they can support you (membership platform...). Krótki tekst informujący innych, jak mogą Cię wesprzeć (platforma członkowska…). - 209 + 210 Advanced settings Ustawienia zaawansowane - 190 + 191 @@ -2240,17 +2165,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 3 - - - Cancel - - - Anuluj - - - 19 - - Share Udostępnij @@ -2526,13 +2440,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 14 - - Error getting about from server - Błąd podczas uzyskiwania informacji z serwera - - 1 - - No description Brak opisu @@ -2554,13 +2461,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Error - Błąd - - 1 - - 240p 240p @@ -2596,13 +2496,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Success - Pomyślnie - - 1 - - Configuration updated. Zaktualizowano konfigurację. @@ -2848,20 +2741,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Czy na pewno chcesz usunąć ? Skutkuje to usunięciem wszystkich filmów wysłanych na ten kanał. - - 1 - - - - Please type the name of the video channel to confirm - Wprowadź nazwę kanału wideo, aby potwierdzić - - 1 - - Video channel deleted. Usunięto kanał wideo . @@ -2869,6 +2748,13 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 + + My videos + Moje filmy + + 1 + + Do you really want to delete videos? Czy na pewno chcesz usunąć filmów? @@ -2925,9 +2811,30 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Channels - Kanały + + My library + Moja biblioteka + + 1 + + + + My channels + Moje kanały + + 1 + + + + My subscriptions + Moje subskrybcje + + 1 + + + + My settings + Moje ustawienia 1 @@ -2955,6 +2862,13 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 + + Error + Błąd + + 1 + + You need to reconnect. Musisz połączyć się ponownie. @@ -2969,6 +2883,20 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 + + Info + Informacja + + 1 + + + + Success + Pomyślnie + + 1 + + Your password has been successfully reset! Pomyślnie zresetowano hasło! @@ -3130,6 +3058,20 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 + + Email is required. + Adres e-mail jest wymagany. + + 1 + + + + Email must be valid. + Adres e-mail musi być prawidłowy. + + 1 + + Username is required. Nazwa użytkownika jest wymagana. @@ -3151,41 +3093,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Username must be at least 3 characters long. - Nazwa użytkownika musi zawierać przynajmniej 3 znaki. - - 1 - - - - Username cannot be more than 20 characters long. - Nazwa użytkownika nie może być dłuższa niż 20 znaków. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Nazwa użytkownika może zawierać tylko małe znaki alfanumeryczne. - - 1 - - - - Email is required. - Adres e-mail jest wymagany. - - 1 - - - - Email must be valid. - Adres e-mail musi być prawidłowy. - - 1 - - Password must be at least 6 characters long. Hasło musi składać się z przynajmniej 6 znaków. @@ -3235,20 +3142,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Display name must be at least 3 characters long. - Nazwa wyświetlana musi zawierać przynajmniej 3 znaki. - - 1 - - - - Display name cannot be more than 120 characters long. - Nazwa wyświetlana nie może zawierać więcej niż 120 znaków. - - 1 - - Description must be at least 3 characters long. Opis musi zawierać przynajmniej 3 znaki. @@ -3270,13 +3163,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Report reason cannot be more than 300 characters long. - Przyczyna zgłoszenia nie może zawierać więcej niż 300 znaków. - - 1 - - The username is required. Nazwa użytkownika jest wymagana. @@ -3291,27 +3177,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Name must be at least 3 characters long. - Nazwa musi zawierać przynajmniej 3 znaki. - - 1 - - - - Name cannot be more than 20 characters long. - Nazwa nie może być dłuższa niż 20 znaków. - - 1 - - - - Name should be only lowercase alphanumeric characters. - Nazwa może zawierać tylko małe znaki alfanumeryczne. - - 1 - - Support text must be at least 3 characters long. Tekst o wsparciu musi zawierać przynajmniej 3 znaki. @@ -4003,13 +3868,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Info - Informacja - - 1 - - Upload cancelled Anulowano wysyłanie diff --git a/client/src/locale/target/angular_pt_BR.xml b/client/src/locale/target/angular_pt_BR.xml index 71aeac8d5..0227115e3 100644 --- a/client/src/locale/target/angular_pt_BR.xml +++ b/client/src/locale/target/angular_pt_BR.xml @@ -370,7 +370,7 @@ Password Senha - 12 + 13 @@ -384,7 +384,7 @@ Login Entrar - 38 + 36 @@ -412,7 +412,7 @@ Send me an email to reset my password Me envie um e-mail para redefinir minha senha - 75 + 80 @@ -476,7 +476,7 @@ Signup Inscrever-se - 88 + 78 @@ -533,7 +533,7 @@ Change the language Alterar o idioma - 88 + 86 @@ -544,7 +544,7 @@ Meu perfil público - 18 + 16 @@ -555,7 +555,7 @@ Minha conta - 22 + 20 @@ -566,7 +566,7 @@ Meus vídeos - 26 + 24 @@ -577,14 +577,14 @@ Sair - 30 + 28 Create an account Criar uma conta - 39 + 37 @@ -598,49 +598,49 @@ Subscriptions Inscrições - 47 + 45 Overview Visão geral - 52 + 50 Trending Tendências - 57 + 55 Recently added Adicionado recentemente - 62 + 60 Local Local - 67 + 65 More Mais - 72 + 70 Administration Administração - 76 + 74 @@ -654,7 +654,7 @@ Toggle dark interface Alternar interface escura - 94 + 92 @@ -759,7 +759,7 @@ No results. Nenhum resultado. - 17 + 20 @@ -806,15 +806,22 @@ 7 - + - About instance - + Cancel + - Sobre a instância - + Cancelar + - 1 + 26 + + + + Submit + Enviar + + 31 @@ -828,47 +835,14 @@ Terms Termos - 44 + 39 User registration is allowed and Registro de usuários não está permitida e - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - esta instância fornece uma cota base de espaço para os vídeos de seus usuários. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - esta instância fornece espaço ilimitado para os vídeos de seus usuários. - - - 31 - - - - - User registration is currently not allowed. - - - Registro de usuários atualmente não está permitido. - - - 36 + 29 @@ -1177,49 +1151,49 @@ Short description Descrição curta - 22 + 21 Default client route Rota padrão do cliente - 55 + 48 Videos Overview Visão geral dos vídeos - 58 + 51 Videos Trending Vídeos em Tendência - 59 + 52 Videos Recently Added Vídeos Adicionados Recentemente - 60 + 53 Local videos Vídeos locais - 61 + 54 Policy on videos containing sensitive content Política sobre vídeos que possuem conteúdo sensível - 70 + 61 @@ -1254,23 +1228,44 @@ Signup enabled Inscrição permitida - 93 + 84 Signup requires email verification Inscrição requer verificação de email - 100 + 91 Signup limit Limite de inscrições + + 96 + + + + Users + Usuários 105 + + User default video quota + Cota padrão de vídeos do usuário + + 109 + + + + User default daily upload limit + Padrão de limite diário de upload + + 121 + + Import Importar @@ -1282,42 +1277,21 @@ Video import with a torrent file or a magnet URI enabled Importação de vídeo com um arquivo torrent ou URI magnética habilitada - 127 + 148 Administrator Administrador - 131 + 155 Admin email Email de administrador - 134 - - - - Users - Usuários - - 144 - - - - User default video quota - Cota padrão de vídeos do usuário - - 147 - - - - User default daily upload limit - Padrão de limite diário de upload - - 161 + 158 @@ -1338,21 +1312,21 @@ Your Twitter username Seu nome de usuário no Twitter - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Indica a conta Twitter do sítio web ou plataforma em que o conteúdo foi publicado. - 184 + 187 Instance whitelisted by Twitter Instância listada como permitida pelo Twitter - 198 + 199 @@ -1366,35 +1340,35 @@ Transcoding Transcodificação - 210 + 215 Transcoding enabled Transcodificação ativada - 215 + 221 If you disable transcoding, many videos from your users will not work! Se você desativar a transcodificação, muitos vídeos dos seus usuários não funcionarão! - 216 + 222 Transcoding threads Threads de transcodificação - 223 + 237 Resolution enabled Resolução habilitada - 239 + 252 @@ -1409,82 +1383,47 @@ - 244 + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Alguns arquivos não são federados (pré-visualizações, legendas ocultas). Nós as obtivemos diretamente da instância de origem e a colocamos em cache. - 249 + 265 Previews cache size Tamanho do cache de pré-visualizações - 254 + 271 Video captions cache size Tamanho do cache de legendas ocultas de vídeos - 265 + 280 Customizations Personalizações - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Escreva diretamente código JavaScript.<br />Exemplo: <pre>console.log('minha instância é demais');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - Escreva código CSS diretamente. Exemplo:<br /> - <pre> - body - background-color: red; - - </pre> - - Preceda com <em>#custom-css</em> para sobrescrever estilos. Exemplo: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1493,21 +1432,21 @@ Advanced configuration Configurações avançadas - 207 + 212 Update configuration Atualizar configuração - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Aparentemente a configuração está valida. Por favor procure potenciais erros nas diferentes abas. - 326 + 341 @@ -1761,7 +1700,7 @@ Ban reason: Motivo do banimento: - 92 + 95 @@ -1828,7 +1767,7 @@ Actions Ações - 33 + 35 @@ -1863,14 +1802,14 @@ Date Data - 10 + 11 Blacklist reason: Motivo da lista negra: - 41 + 43 @@ -1894,55 +1833,6 @@ 7 - - My settings - Minhas configurações - - 3 - - - - My library - Minha biblioteca - - 7 - - - - My channels - Meus canais - - 12 - - - - My videos - Meus vídeos - - 14 - - - - My subscriptions - Minhas inscrições - - 16 - - - - My imports - Minhas importações - - 18 - - - - Ownership changes - Mudanças de dono - - 33 - - Video quota: Cota de vídeo: @@ -1954,21 +1844,21 @@ Profile Perfil - 8 + 7 Video settings Configurações de vídeo - 15 + 16 Danger zone Zona perigosa - 18 + 19 @@ -1996,13 +1886,6 @@ 35 - - Submit - Enviar - - 24 - - - views - visualizações @@ -2162,6 +2045,13 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 30 + + Current password + Senha atual + + 7 + + New password Nova senha @@ -2368,14 +2258,14 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen Publish will be available when upload is finished A publicação estará disponível quando o envio terminar - 53 + 58 Publish Publicar - 60 + 65 @@ -2537,14 +2427,14 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen Wait transcoding before publishing the video Aguarde a transcodificação antes de publicar o vídeo - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Se você decidir não aguardar a transcodificação antes de publicar o vídeo, ele poderá não ser reproduzido até que a transcodificação termine. - 131 + 132 @@ -2558,49 +2448,49 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen Add another caption Adicionar outra legenda oculta - 146 + 147 See the subtitle file Veja o arquivo de legenda - 155 + 156 Cancel create Cancelar criação - 169 + 170 Cancel deletion Cancelar exclusão - 177 + 178 Captions Legendas ocultas - 139 + 140 Upload thumbnail Enviar miniatura - 195 + 196 Upload preview Enviar pré-visualização - 202 + 203 @@ -2614,14 +2504,14 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen Short text to tell people how they can support you (membership platform...). Texto curto para dizer às pessoas como elas podem apoiar você (plataforma de membros, etc.). - 209 + 210 Advanced settings Configurações avançadas - 190 + 191 @@ -2688,17 +2578,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 3 - - - Cancel - - - Cancelar - - - 19 - - Share Compartilhar @@ -3034,13 +2913,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 14 - - Error getting about from server - Erro ao obter detalhes do servidor - - 1 - - No description Nenhuma descrição @@ -3062,20 +2934,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Error - Erro - - 1 - - - - Success - Sucesso - - 1 - - Configuration updated. Configuração atualizada. @@ -3328,20 +3186,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Você realmente deseja excluir ? Isso também excluirá todos os vídeos enviados neste canal. - - 1 - - - - Please type the name of the video channel to confirm - Por favor, digite o nome do canal de vídeo para confirmar - - 1 - - Video channel deleted. Canal de vídeo excluído. @@ -3349,6 +3193,13 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 + + My videos + Meus vídeos + + 1 + + Do you really want to delete videos? Você realmente deseja excluir vídeos? @@ -3419,16 +3270,37 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Channels - Canais + + My library + Minha biblioteca 1 - - Video imports - Importações de vídeos + + My channels + Meus canais + + 1 + + + + My subscriptions + Minhas inscrições + + 1 + + + + Ownership changes + Mudanças de dono + + 1 + + + + My settings + Minhas configurações 1 @@ -3463,6 +3335,13 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 + + Error + Erro + + 1 + + You need to reconnect. você precisa se reconectar. @@ -3477,6 +3356,20 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 + + Info + Info + + 1 + + + + Success + Sucesso + + 1 + + Incorrect username or password. Nome de usuário ou senha incorretos. @@ -3694,6 +3587,20 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 + + Email is required. + E-mail é necessário. + + 1 + + + + Email must be valid. + E-mail deve ser válido. + + 1 + + Username is required. Nome de usuário é necessário. @@ -3715,41 +3622,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Username must be at least 3 characters long. - Nome de usuário deve ter pelo menos 3 caracteres. - - 1 - - - - Username cannot be more than 20 characters long. - Nome de usuário não pode ter mais que 20 caracteres. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Nome de usuário deve ter apenas caracteres alfanuméricos minúsculos. - - 1 - - - - Email is required. - E-mail é necessário. - - 1 - - - - Email must be valid. - E-mail deve ser válido. - - 1 - - Password must be at least 6 characters long. Senha deve ter pelo menos 6 caracteres. @@ -3813,20 +3685,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Display name must be at least 3 characters long. - Nome de exibição deve ter pelo menos 3 caracteres. - - 1 - - - - Display name cannot be more than 120 characters long. - Nome de exibição não pode ter mais que 120 caracteres. - - 1 - - Description must be at least 3 characters long. Descrição deve ter pelo menos 3 caracteres. @@ -3869,13 +3727,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Report reason cannot be more than 300 characters long. - Motivo da denúncia não pode ter mais que 300 caracteres. - - 1 - - Moderation comment is required. Comentário de moderação é obrigatório. @@ -3890,13 +3741,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Moderation comment cannot be more than 300 characters long. - Comentário de moderação não pode ter mais de 300 caracteres. - - 1 - - The channel is required. O canal é obrigatório. @@ -3946,27 +3790,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Name must be at least 3 characters long. - Nome deve ter pelo menos 3 caracteres. - - 1 - - - - Name cannot be more than 20 characters long. - Nome não pode ter mais de 20 caracteres. - - 1 - - - - Name should be only lowercase alphanumeric characters. - Nome deve ser apenas caracteres alfanuméricos minúsculos. - - 1 - - Support text must be at least 3 characters long. Texto de apoio deve ter pelo menos 3 caracteres. @@ -4646,13 +4469,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Subscribed - Inscrito - - 1 - - Subscribed to Inscrito em @@ -4660,9 +4476,9 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Unsubscribed - Desinscrito + + Subscribed + Inscrito 1 @@ -4674,6 +4490,13 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 + + Unsubscribed + Desinscrito + + 1 + + Only I can see this video Apenas eu posso ver este vídeo @@ -4723,13 +4546,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Info - Info - - 1 - - Upload cancelled Envio cancelado @@ -4737,13 +4553,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Lamentamos, mas o PeerTube não consegue lidar com vídeos> 8GB - - 1 - - Your video quota is exceeded with this video (video size: , used: , quota: ) Sua quota de vídeos é excedida com este vídeo (tamanho do vídeo: , utilizado: , quota: ) diff --git a/client/src/locale/target/angular_ru_RU.xml b/client/src/locale/target/angular_ru_RU.xml index db2a690d5..b3e2afb96 100644 --- a/client/src/locale/target/angular_ru_RU.xml +++ b/client/src/locale/target/angular_ru_RU.xml @@ -356,7 +356,7 @@ Password Пароль - 12 + 13 @@ -370,7 +370,7 @@ Login Авторизация - 38 + 36 @@ -398,7 +398,7 @@ Send me an email to reset my password Отправить пароль на электронную почту - 75 + 80 @@ -462,7 +462,7 @@ Signup Зарегистрироваться - 88 + 78 @@ -519,7 +519,7 @@ Change the language Изменить язык - 88 + 86 @@ -530,7 +530,7 @@ Мой побличный профиль - 18 + 16 @@ -541,7 +541,7 @@ Моя учетная запись - 22 + 20 @@ -552,7 +552,7 @@ Мои видео - 26 + 24 @@ -563,14 +563,14 @@ Выйти - 30 + 28 Create an account Создать учетную запись - 39 + 37 @@ -584,49 +584,49 @@ Subscriptions Подписки - 47 + 45 Overview Общий вид - 52 + 50 Trending Тенденции - 57 + 55 Recently added Недавно добавленный - 62 + 60 Local Локальный - 67 + 65 More Больше - 72 + 70 Administration Администрация - 76 + 74 @@ -640,7 +640,7 @@ Toggle dark interface Изменить интерфейс - 94 + 92 @@ -745,7 +745,7 @@ No results. Нет результатов - 17 + 20 @@ -792,15 +792,11 @@ 7 - - - About instance - - - О Инстанци - + + Submit + Отправить - 1 + 31 @@ -814,47 +810,14 @@ Terms Условия пользователя - 44 + 39 User registration is allowed and Создания учетной записи разрешено и - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - этот сервер предоставляет места для видео для пользователей. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - этот сервер предоставляет неограниченное место для пользователей. - - - 31 - - - - - User registration is currently not allowed. - - - Создание учетной записи не разрешено в данный момент. - - - 36 + 29 @@ -1163,49 +1126,49 @@ Short description Краткое описание - 22 + 21 Default client route Default client route - 55 + 48 Videos Overview Все видео - 58 + 51 Videos Trending Тенденции видео - 59 + 52 Videos Recently Added Недавно добавленное видео - 60 + 53 Local videos Местное видео - 61 + 54 Policy on videos containing sensitive content Политика касательно видео содержащих нежелательный контент - 70 + 61 @@ -1240,23 +1203,44 @@ Signup enabled Регистрация активирована - 93 + 84 Signup requires email verification Для регистрации нужно подтвержение через электронную почту - 100 + 91 Signup limit Лимит регистрации + + 96 + + + + Users + Пользователи 105 + + User default video quota + Квота видео по умолчанию на одного пользователя + + 109 + + + + User default daily upload limit + Ежедневный лимит загрузок по умолчанию на одгого пользователя + + 121 + + Import Импортировать @@ -1268,42 +1252,21 @@ Video import with a torrent file or a magnet URI enabled Импорт видео с помощью файла торент или magnet URI активирован - 127 + 148 Administrator Администратор - 131 + 155 Admin email Электронная почта администратора - 134 - - - - Users - Пользователи - - 144 - - - - User default video quota - Квота видео по умолчанию на одного пользователя - - 147 - - - - User default daily upload limit - Ежедневный лимит загрузок по умолчанию на одгого пользователя - - 161 + 158 @@ -1324,21 +1287,21 @@ Your Twitter username Ваше имя пользователя в Twitter - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Показывает учетнаю запись в Twitter сайта или платформы с которых было опубликован контент - 184 + 187 Instance whitelisted by Twitter Сервер имеет аккредитацию Twitter - 198 + 199 @@ -1352,35 +1315,35 @@ Transcoding Транскодирование - 210 + 215 Transcoding enabled Транскодирование активировано - 215 + 221 If you disable transcoding, many videos from your users will not work! Если вы дезактивируете транскодирование, многие видео пользователей перестанут работать - 216 + 222 Transcoding threads Количество threads для транскодирования - 223 + 237 Resolution enabled Разрешение активировано - 239 + 252 @@ -1395,82 +1358,47 @@ - 244 + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Некоторые миниатюры не федератные (миниатюры, названия). Они взяты непосредственно из их оригинального сервера и мы их не храним. - 249 + 265 Previews cache size Размер кеша предпросмотра - 254 + 271 Video captions cache size Размер кеша предпросмотра надписей - 265 + 280 Customizations Персонализация - 275 + 289 JavaScript Ява Скрипт - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Напишите непосредственно код Ява Скрипта .<br />Пример : <pre>console.log('мой сервер крут');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - Напишите непосредственно код CSS. Пример:<br /> - <pre> - body - background-color: red; - - </pre> - - Начните с <em>#custom-css</em> чтоб получить приоритет. Пример: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1479,21 +1407,21 @@ Advanced configuration Продвинутая конфигурация - 207 + 212 Update configuration Обновить конфигурацию - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Конфигурация неудачная. Пожалуйста, найдите потенциальную ошибку в разных окнах. - 326 + 341 @@ -1740,7 +1668,7 @@ Ban reason: Причины бана: - 92 + 95 @@ -1807,7 +1735,7 @@ Actions Действия - 33 + 35 @@ -1842,14 +1770,14 @@ Date Дата - 10 + 11 Blacklist reason: Причина блокирования: - 41 + 43 @@ -1873,55 +1801,6 @@ 7 - - My settings - Мои настройки - - 3 - - - - My library - Моя библиотека - - 7 - - - - My channels - Мои каналы - - 12 - - - - My videos - Мои видео - - 14 - - - - My subscriptions - Мои подписки - - 16 - - - - My imports - Мои импортированные видео - - 18 - - - - Ownership changes - Смена собственника - - 33 - - Video quota: Квота видео @@ -1933,21 +1812,21 @@ Profile Профиль - 8 + 7 Video settings Настройки видео - 15 + 16 Danger zone Орасная зона - 18 + 19 @@ -1975,13 +1854,6 @@ 35 - - Submit - Отправить - - 24 - - - views - просмотры @@ -2279,6 +2151,48 @@ When you will upload a video in this channel, the video support field will be au 17 + + My videos + Мои видео + + 1 + + + + My library + Моя библиотека + + 1 + + + + My channels + Мои каналы + + 1 + + + + My subscriptions + Мои подписки + + 1 + + + + Ownership changes + Смена собственника + + 1 + + + + My settings + Мои настройки + + 1 + + Transcoding threads is required. Транскодирование потоки требуется. @@ -2307,13 +2221,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Username must be at least 3 characters long. - Имя пользователя должно быть длиной не менее 3-х символов. - - 1 - - Password must be at least 6 characters long. Пароль должен быть длиной не менее 6 символов. @@ -2321,13 +2228,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Display name must be at least 3 characters long. - Отображаемое имя должно иметь длину не менее 3-х символов. - - 1 - - Description must be at least 3 characters long. Описание должно быть длиной не менее 3-х символов. @@ -2363,13 +2263,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Name must be at least 3 characters long. - Длина имени должна быть не менее 3 символов. - - 1 - - Support text must be at least 3 characters long. Текст поддержки должен содержать не менее 3 символов. diff --git a/client/src/locale/target/angular_sv_SE.xml b/client/src/locale/target/angular_sv_SE.xml index eadcfa444..ffa8b19ca 100644 --- a/client/src/locale/target/angular_sv_SE.xml +++ b/client/src/locale/target/angular_sv_SE.xml @@ -499,7 +499,7 @@ Password Lösenord - 12 + 13 @@ -513,7 +513,7 @@ Login Logga in - 38 + 36 @@ -541,7 +541,7 @@ Send me an email to reset my password Skicka ett e-postmeddelande för att återställa mitt lösenord - 75 + 80 @@ -612,7 +612,7 @@ Signup Registrering - 88 + 78 @@ -682,7 +682,7 @@ Change the language Ändra språk - 88 + 86 @@ -693,7 +693,7 @@ Min offentliga profil - 18 + 16 @@ -704,7 +704,7 @@ Mitt konto - 22 + 20 @@ -715,7 +715,7 @@ Mina videor - 26 + 24 @@ -726,14 +726,14 @@ Logga ut - 30 + 28 Create an account Skapa ett konto - 39 + 37 @@ -747,49 +747,49 @@ Subscriptions Prenumerationer - 47 + 45 Overview Översikt - 52 + 50 Trending Populärt - 57 + 55 Recently added Nyligen tillagt - 62 + 60 Local Lokalt - 67 + 65 More Mer - 72 + 70 Administration Administration - 76 + 74 @@ -803,14 +803,14 @@ Show keyboard shortcuts Visa kortkommandon - 91 + 89 Toggle dark interface Växla mörkt gränssnitt - 94 + 92 @@ -915,14 +915,14 @@ Display unlisted and private videos Visa olistade och privata videor - 11 + 14 No results. Inga resultat. - 17 + 20 @@ -980,15 +980,22 @@ 7 - + - About instance - + Cancel + - Om instansen - + Avbryt + - 1 + 26 + + + + Submit + Skicka + + 31 @@ -1002,47 +1009,14 @@ Terms Villkor - 44 + 39 User registration is allowed and Användarregistrering är tillåten och - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - den här instansen tillhandahåller en grundkvot på utrymme för sina användares videor. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - den här instansen tillhandahåller obegränsat utrymme för sina användares videor. - - - 31 - - - - - User registration is currently not allowed. - - - Användarregistrering tillåts inte för tillfället. - - - 36 + 29 @@ -1319,22 +1293,30 @@ - MutedMuted + Muted + Ignorerad + 13 - Muted by your instanceMuted by your instance + Muted by your instance + Ignorerad av din instans + 14 - Instance mutedInstance muted + Instance muted + Instans ignorerad + 15 - Instance muted by your instanceInstance muted by your instance + Instance muted by your instance + Instans ignorerad av din instans + 16 @@ -1391,49 +1373,49 @@ Short description Kort beskrivning - 22 + 21 Default client route Klientens standardrouting - 55 + 48 Videos Overview Videoöversikt - 58 + 51 Videos Trending Populära videor - 59 + 52 Videos Recently Added Nyligen tillagda videor - 60 + 53 Local videos Lokala videor - 61 + 54 Policy on videos containing sensitive content Policy för videor med känsligt innehåll - 70 + 61 @@ -1468,23 +1450,44 @@ Signup enabled Registrering aktiverad - 93 + 84 Signup requires email verification Registrering kräver e-postverifikation - 100 + 91 Signup limit Registreringsgräns + + 96 + + + + Users + Användare 105 + + User default video quota + Standardkvot för användares videor + + 109 + + + + User default daily upload limit + Standarduppladdningsgräns för användare + + 121 + + Import Importera @@ -1496,49 +1499,28 @@ Video import with HTTP URL (i.e. YouTube) enabled Videoimport med HTTP-URL tillåten (t.ex. YouTube) - 120 + 141 Video import with a torrent file or a magnet URI enabled Videoimport med torrentfil eller magnet-URI är tillåten - 127 + 148 Administrator Administratör - 131 + 155 Admin email Administratörens e-postadress - 134 - - - - Users - Användare - - 144 - - - - User default video quota - Standardkvot för användares videor - - 147 - - - - User default daily upload limit - Standarduppladdningsgräns för användare - - 161 + 158 @@ -1559,21 +1541,21 @@ Your Twitter username Ditt användarnamn på Twitter - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. Webbplatsens eller plattformens Twitterkonto, på vilken innehållet publicerades. - 184 + 187 Instance whitelisted by Twitter Instans vitlistad av Twitter - 198 + 199 @@ -1587,35 +1569,35 @@ Transcoding Omkodning - 210 + 215 Transcoding enabled Omkodning aktiverad - 215 + 221 If you disable transcoding, many videos from your users will not work! Om du avaktiverar omkodning, kommer många av dina användares videor inte fungera! - 216 + 222 Transcoding threads Omkodningstrådar - 223 + 237 Resolution enabled Upplösningen tillåten - 239 + 252 @@ -1630,82 +1612,47 @@ - 244 + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Vissa filer är inte federerade (till exempel förhandsvisningar och undertexter). Vi kan hämta dem direkt från ursprungsinstansen och cachelagra dem. - 249 + 265 Previews cache size Förhandsvisningens cachestorlek - 254 + 271 Video captions cache size Undertexternas cachestorlek - 265 + 280 Customizations Anpassningar - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Skriv direkt med JavaScript-kod.<br />Exempel: <pre>console.log('min instans är fantastisk');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - Skriv CSS-kod direkt. Exempel:<br /> - <pre> - body - background-color: red; - - </pre> - - Lägg till <em>#custom-css</em> först för att åsidosätta stilmallen. Exempel: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1714,21 +1661,21 @@ Advanced configuration Avancerade inställningar - 207 + 212 Update configuration Uppdatera inställningar - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. Det verkar som att konfigurationen inte stämmer. Sök efter eventuella fel i de olika flikarna. - 326 + 341 @@ -2015,11 +1962,25 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a 133 + + User's email must be verified to login + Användarens e-post måste verifieras innan inloggning + + 72 + + + + User's email is verified / User can login without email verification + Användarens e-post har verifierats / Användaren behöver inte verifiera sin e-post för att logga in + + 76 + + Ban reason: Blockeringsanledning: - 92 + 95 @@ -2086,7 +2047,7 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a Actions Åtgärder - 33 + 35 @@ -2121,14 +2082,14 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a Date Datum - 10 + 11 Blacklist reason: Anledning för svartlistning: - 41 + 43 @@ -2153,12 +2114,16 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a - Muted accountsMuted accounts + Muted accounts + Ignorerade konton + 2 - Muted serversMuted servers + Muted servers + Ignorerade servrar + 11 @@ -2170,76 +2135,19 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a - Muted at Muted at + Muted at + Ignorerad på + 13 - UnmuteUnmute + Unmute + Sluta ignorera + 23 - - My settings - Mina inställningar - - 3 - - - - My library - Mitt bibliotek - - 7 - - - - My channels - Mina kanaler - - 12 - - - - My videos - Mina videor - - 14 - - - - My subscriptions - Mina prenumerationer - - 16 - - - - My imports - Mina importeringar - - 18 - - - - Misc - Diverse - - 24 - - - - Muted instancesMuted instances - 2 - - - - Ownership changes - Ändringar av ägarskap - - 33 - - Video quota: Videokvot: @@ -2251,21 +2159,21 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a Profile Profil - 8 + 7 Video settings Videoinställningar - 15 + 16 Danger zone Riskzon - 18 + 19 @@ -2293,13 +2201,6 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a 35 - - Submit - Skicka - - 24 - - - views - visningar @@ -2459,6 +2360,13 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 47 + + Muted instances + Ignorerade instanser + + 2 + + Change password Ändra lösenord @@ -2664,6 +2572,13 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 159 + + Sorry, but something went wrong + Någonting har tyvärr gått fel + + 49 + + Congratulations, the video behind will be imported! You can already add information about this video. @@ -2700,14 +2615,14 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt Publish will be available when upload is finished Du kan publicera när uppladdningen är klar - 53 + 58 Publish Publisera - 60 + 65 @@ -2890,14 +2805,14 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt Wait transcoding before publishing the video Publicera video när omkodningen är avklarad - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Om du väljer att inte vänta på omkodningen innan publicering, kommer videon inte gå att spela förrän omkodningen är färdig. - 131 + 132 @@ -2911,49 +2826,49 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt Add another caption Lägg till ännu en text - 146 + 147 See the subtitle file Se undertextfilen - 155 + 156 Already uploaded ✔ Redan uppladdad ✔ - 159 + 160 Will be created on update Kommer skapas vid uppdatering - 167 + 168 Cancel create Avbryt skapande - 169 + 170 Will be deleted on update Kommer raderas vid uppdatering - 175 + 176 Cancel deletion Avbryt radering - 177 + 178 @@ -2964,28 +2879,28 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt Inga undertexter för tillfället. - 182 + 183 Captions Texter - 139 + 140 Upload thumbnail Ladda upp miniatyrbild - 195 + 196 Upload preview Ladda upp förhandsvisning - 202 + 203 @@ -2999,14 +2914,14 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt Short text to tell people how they can support you (membership platform...). Kort text för att berätta hur andra kan stödja dig (medlemsplattform …). - 209 + 210 Advanced settings Avancerade inställningar - 190 + 191 @@ -3073,17 +2988,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 3 - - - Cancel - - - Avbryt - - - 19 - - Share Dela @@ -3309,7 +3213,7 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt the sharing system used for this video implies that some technical information about your system (such as a public IP address) can be sent to other peers. - den här videons delningssystem medför att en del teknisk information om ditt system (såsom publik IP-adress) kan skickas till andra serventer. + den här videons delningssystem gör att en del teknisk information om ditt system (som publik IP-adress) kan skickas till andra serventer. 209 @@ -3470,13 +3374,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 14 - - Error getting about from server - Kan inte hämta information om instansen från servern - - 1 - - No description Ingen beskrivning @@ -3498,13 +3395,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Error - Fel - - 1 - - 240p 240p @@ -3547,13 +3437,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Success - Åtgärden lyckades - - 1 - - Configuration updated. Konfigurering uppdaterad. @@ -3716,12 +3599,16 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt - Account unmuted by your instance.Account unmuted by your instance. + Account unmuted by your instance. + Kontot ignoreras inte längre av din instans. + 1 - Instance unmuted by your instance.Instance unmuted by your instance. + Instance unmuted by your instance. + Instansen ignoreras inte längre av din instans. + 1 @@ -3816,6 +3703,13 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + Set Email as Verified + Markera e-post som verifierad + + 1 + + You cannot ban root. Du kan inte blockera root. @@ -3858,13 +3752,24 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + users email set as verified. + användares e-post har markerats som verifierade. + + 1 + + - Account unmuted.Account unmuted. + Account unmuted. + Kontot ignoreras inte längre. + 1 - Instance unmuted.Instance unmuted. + Instance unmuted. + Instansen ignoreras inte längre. + 1 @@ -3966,20 +3871,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Vill du verkligen radera ? Det kommer radera samtliga videor som laddats upp till kanalen. - - 1 - - - - Please type the name of the video channel to confirm - Fyll i kanalens namn för att bekräfta - - 1 - - Video channel deleted. Kanalen har raderats. @@ -3987,6 +3878,13 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + My videos + Mina videor + + 1 + + Do you really want to delete videos? Vill du verkligen radera videor? @@ -4057,16 +3955,44 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Channels - Kanaler + + My library + Mitt bibliotek 1 - - Video imports - Videoimporteringar + + My channels + Mina kanaler + + 1 + + + + My subscriptions + Mina prenumerationer + + 1 + + + + Misc + Diverse + + 1 + + + + Ownership changes + Ändringar av ägarskap + + 1 + + + + My settings + Mina inställningar 1 @@ -4192,6 +4118,13 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + Error + Fel + + 1 + + You need to reconnect. Du måste återansluta. @@ -4213,6 +4146,20 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + Info + Information + + 1 + + + + Success + Åtgärden lyckades + + 1 + + Incorrect username or password. Felaktigt användarnamn eller lösenord. @@ -4430,6 +4377,20 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + Email is required. + E-postadress måste uppges. + + 1 + + + + Email must be valid. + E-postadressen måste vara giltig. + + 1 + + Username is required. Användarnamn måste fyllas i. @@ -4451,41 +4412,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Username must be at least 3 characters long. - Användarnamnet måste innehålla minst tre tecken. - - 1 - - - - Username cannot be more than 20 characters long. - Användarnamnet får inte vara mer än 20 tecken långt. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Användarnamnet får endast bestå av små bokstäver och siffror. - - 1 - - - - Email is required. - E-postadress måste uppges. - - 1 - - - - Email must be valid. - E-postadressen måste vara giltig. - - 1 - - Password must be at least 6 characters long. Lösenordet måste innehålla minst sex tecken. @@ -4549,20 +4475,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Display name must be at least 3 characters long. - Visningsnamnet måste innehålla minst tre tecken. - - 1 - - - - Display name cannot be more than 120 characters long. - Visningsnamnet får inte vara mer än 120 tecken långt. - - 1 - - Description must be at least 3 characters long. Beskrivningen måste innehålla minst tre tecken. @@ -4612,13 +4524,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Report reason cannot be more than 300 characters long. - Orsak för rapportering får inte vara mer än 300 tecken lång. - - 1 - - Moderation comment is required. Moderationskommentar krävs. @@ -4633,13 +4538,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Moderation comment cannot be more than 300 characters long. - Moderationskommentaren får inte vara mer än 300 tecken lång. - - 1 - - The channel is required. Kanalen måste anges. @@ -4696,27 +4594,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Name must be at least 3 characters long. - Namnet måste innehålla minst tre tecken. - - 1 - - - - Name cannot be more than 20 characters long. - Namnet får inte vara mer än 20 tecken långt. - - 1 - - - - Name should be only lowercase alphanumeric characters. - Namnet kan endast bestå av små bokstäver och siffror - - 1 - - Support text must be at least 3 characters long. Supporttexten måste innehålla minst tre tecken. @@ -5396,73 +5273,108 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + User email set as verified + Användaren s e-post har markerats som verifierad. + + 1 + + - Account muted.Account muted. + Account muted. + Kontot ignoreras. + 1 - Instance muted.Instance muted. + Instance muted. + Instansen ignoreras. + 1 - Account muted by the instance.Account muted by the instance. + Account muted by the instance. + Kontot ignoreras av instansen. + 1 - Account unmuted by the instance.Account unmuted by the instance. + Account unmuted by the instance. + Kontot ignoreras inte längre av instansen. + 1 - Instance muted by the instance.Instance muted by the instance. + Instance muted by the instance. + Instansen ignoreras av instansen. + 1 - Instance unmuted by the instance.Instance unmuted by the instance. + Instance unmuted by the instance. + Instansen ignoreras inte längre av instansen. + 1 - Mute this accountMute this account + Mute this account + Ignorera det här kontot + 1 - Unmute this accountUnmute this account + Unmute this account + Sluta ignorera det här kontot + 1 - Mute the instanceMute the instance + Mute the instance + Ignorera instansen + 1 - Unmute the instanceUnmute the instance + Unmute the instance + Sluta ignorera instansen + 1 - Mute this account by your instanceMute this account by your instance + Mute this account by your instance + Ignorera det här kontot av din instans + 1 - Unmute this account by your instanceUnmute this account by your instance + Unmute this account by your instance + Sluta ignorera det här kontot av din instans + 1 - Mute the instance by your instanceMute the instance by your instance + Mute the instance by your instance + Ignorera instansen av din instans + 1 - Unmute the instance by your instanceUnmute the instance by your instance + Unmute the instance by your instance + Sluta ignorera instansen av din instans + 1 @@ -5494,13 +5406,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Subscribed - Prenumererar - - 1 - - Subscribed to Prenumererar på @@ -5508,9 +5413,9 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Unsubscribed - Prenumeration avbruten + + Subscribed + Prenumererar 1 @@ -5522,6 +5427,13 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + Unsubscribed + Prenumeration avbruten + + 1 + + Moderator Moderator @@ -5592,13 +5504,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Info - Information - - 1 - - Upload cancelled Uppladdningen avbröts @@ -5606,13 +5511,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Vi ber om ursäkt, PeerTube kan tyvärr inte hantera videor större än 8GB - - 1 - - Your video quota is exceeded with this video (video size: , used: , quota: ) Den här videon kommer överskrida din videokvot (videostorlek: , använt: , kvot: ) diff --git a/client/src/locale/target/angular_ta.xml b/client/src/locale/target/angular_ta.xml index 35385cfdb..abd878aaa 100644 --- a/client/src/locale/target/angular_ta.xml +++ b/client/src/locale/target/angular_ta.xml @@ -201,14 +201,14 @@ Password கடவுச்சொல் - 12 + 13 Login உள்நுழை - 38 + 36 @@ -257,7 +257,7 @@ Change the language மொழியை மாற்று - 88 + 86 @@ -268,28 +268,28 @@ வெளியேறு - 30 + 28 Create an account கணக்கை உருவாக்கு - 39 + 37 Recently added சமீபத்தியவை - 62 + 60 More மேலும் - 72 + 70 @@ -352,7 +352,7 @@ No results. முடிவுகள் இல்லை. - 17 + 20 @@ -394,7 +394,7 @@ Users பயணர்கள் - 144 + 105 @@ -408,7 +408,7 @@ Your Twitter username உங்கள் Twitter பயணர்பெயர் - 181 + 184 @@ -422,7 +422,7 @@ JavaScript JavaScript - 278 + 294 diff --git a/client/src/locale/target/angular_zh_Hans_CN.xml b/client/src/locale/target/angular_zh_Hans_CN.xml index c8ed702f8..09ed78392 100644 --- a/client/src/locale/target/angular_zh_Hans_CN.xml +++ b/client/src/locale/target/angular_zh_Hans_CN.xml @@ -499,7 +499,7 @@ Password 密码 - 12 + 13 @@ -513,7 +513,7 @@ Login 登录 - 38 + 36 @@ -541,7 +541,7 @@ Send me an email to reset my password 发送密码重置邮件 - 75 + 80 @@ -610,7 +610,7 @@ Signup 注册 - 88 + 78 @@ -680,7 +680,7 @@ Change the language 更改语言 - 88 + 86 @@ -691,7 +691,7 @@ 我的公开个人资料 - 18 + 16 @@ -702,7 +702,7 @@ 我的帐户 - 22 + 20 @@ -713,7 +713,7 @@ 我的视频 - 26 + 24 @@ -724,14 +724,14 @@ 注销 - 30 + 28 Create an account 创建帐户 - 39 + 37 @@ -745,49 +745,49 @@ Subscriptions 订阅内容 - 47 + 45 Overview 总览 - 52 + 50 Trending 时下流行 - 57 + 55 Recently added 最近添加 - 62 + 60 Local 本地 - 67 + 65 More 更多 - 72 + 70 Administration 管理 - 76 + 74 @@ -801,14 +801,14 @@ Show keyboard shortcuts 显示键盘快捷键 - 91 + 89 Toggle dark interface 切换夜间模式 - 94 + 92 @@ -913,14 +913,14 @@ Display unlisted and private videos 显示不公开和私享视频 - 11 + 14 No results. 没有结果。 - 17 + 20 @@ -978,15 +978,22 @@ 7 - + - About instance - + Cancel + - 关于实例 - + 取消 + - 1 + 26 + + + + Submit + 提交 + + 31 @@ -1000,47 +1007,14 @@ Terms 条款 - 44 + 39 User registration is allowed and 当前开放注册，并且 - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - 本实例为用户上传的视频提供 的基本存储空间。 - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - 本实例为用户上传的视频提供无限制的存储空间。 - - - 31 - - - - - User registration is currently not allowed. - - - 当前不开放注册。 - - - 36 + 29 @@ -1395,49 +1369,49 @@ Short description 简介 - 22 + 21 Default client route 首页默认内容 - 55 + 48 Videos Overview 视频总览 - 58 + 51 Videos Trending 时下流行的视频 - 59 + 52 Videos Recently Added 最近添加的视频 - 60 + 53 Local videos 本地视频 - 61 + 54 Policy on videos containing sensitive content 针对包含敏感内容视频的策略 - 70 + 61 @@ -1472,23 +1446,44 @@ Signup enabled 开放注册 - 93 + 84 Signup requires email verification 注册需要验证电子邮件地址 - 100 + 91 Signup limit 注册限制 + + 96 + + + + Users + 用户 105 + + User default video quota + 用户默认视频存储空间大小 + + 109 + + + + User default daily upload limit + 用户默认单日上传限额 + + 121 + + Import 导入 @@ -1500,49 +1495,28 @@ Video import with HTTP URL (i.e. YouTube) enabled 允许通过 HTTP URL（例如 YouTube）导入视频 - 120 + 141 Video import with a torrent file or a magnet URI enabled 允许通过种子文件或磁力链导入视频 - 127 + 148 Administrator 管理员 - 131 + 155 Admin email 管理员电子邮件地址 - 134 - - - - Users - 用户 - - 144 - - - - User default video quota - 用户默认视频存储空间大小 - - 147 - - - - User default daily upload limit - 用户默认单日上传限额 - - 161 + 158 @@ -1563,21 +1537,21 @@ Your Twitter username 您的 Twitter 用户名 - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. 显示此内容所在的发布平台对应的 Twitter 帐户。 - 184 + 187 Instance whitelisted by Twitter 实例已进入 Twitter 白名单 - 198 + 199 @@ -1591,35 +1565,35 @@ Transcoding 转码 - 210 + 215 Transcoding enabled 启用转码 - 215 + 221 If you disable transcoding, many videos from your users will not work! 如果禁用转码，用户上传的视频很有可能无法正常播放！ - 216 + 222 Transcoding threads 转码线程数 - 223 + 237 Resolution enabled 启用 分辨率 - 239 + 252 @@ -1634,82 +1608,47 @@ - 244 + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. 部分文件不会自动同步（如预览图、字幕）。我们会直接从源实例拉取并进行缓存。 - 249 + 265 Previews cache size 预览图缓存大小 - 254 + 271 Video captions cache size 视频字幕缓存大小 - 265 + 280 Customizations 自定义 - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> 在此处直接输入 JavaScript 代码。<br />示例：<pre>console.log('我的实例太棒了');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - 在此处直接输入 CSS 代码。示例：<br /> - <pre> - body - background-color: red; - - </pre> - - 您可以通过插入 <em>#custom-css</em> 来覆盖样式设置。示例： - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1718,21 +1657,21 @@ Advanced configuration 高级设置 - 207 + 212 Update configuration 更新设置 - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. 设置信息不合法。请检查各选项卡中的设置是否存在错误。 - 326 + 341 @@ -2028,7 +1967,7 @@ Ban reason: 封禁理由： - 92 + 95 @@ -2095,7 +2034,7 @@ Actions 操作 - 33 + 35 @@ -2130,14 +2069,14 @@ Date 日期 - 10 + 11 Blacklist reason: 黑名单理由： - 41 + 43 @@ -2196,69 +2135,6 @@ 23 - - My settings - 我的设置 - - 3 - - - - My library - 我的库 - - 7 - - - - My channels - 我的频道 - - 12 - - - - My videos - 我的视频 - - 14 - - - - My subscriptions - 我的订阅 - - 16 - - - - My imports - 我的导入 - - 18 - - - - Misc - 杂项 - - 24 - - - - Muted instances - 已屏蔽的实例 - - 2 - - - - Ownership changes - 视频转移 - - 33 - - Video quota: 视频存储空间： @@ -2270,21 +2146,21 @@ Profile 个人资料 - 8 + 7 Video settings 视频设置 - 15 + 16 Danger zone 危险选项 - 18 + 19 @@ -2312,13 +2188,6 @@ 35 - - Submit - 提交 - - 24 - - - views - 次观看 @@ -2478,6 +2347,13 @@ When you will upload a video in this channel, the video support field will be au 47 + + Muted instances + 已屏蔽的实例 + + 2 + + Change password 更改密码 @@ -2719,14 +2595,14 @@ When you will upload a video in this channel, the video support field will be au Publish will be available when upload is finished 上传完毕后即可发布 - 53 + 58 Publish 发布 - 60 + 65 @@ -2909,14 +2785,14 @@ When you will upload a video in this channel, the video support field will be au Wait transcoding before publishing the video 等待转码完毕后再发布视频 - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. 如果您选择不等待转码就发布视频，则视频在转码完毕前很有可能无法正常播放。 - 131 + 132 @@ -2930,49 +2806,49 @@ When you will upload a video in this channel, the video support field will be au Add another caption 添加字幕 - 146 + 147 See the subtitle file 查看字幕文件 - 155 + 156 Already uploaded ✔ 已上传 ✔ - 159 + 160 Will be created on update 将在更新时创建 - 167 + 168 Cancel create 取消创建 - 169 + 170 Will be deleted on update 将在更新时删除 - 175 + 176 Cancel deletion 取消删除 - 177 + 178 @@ -2983,28 +2859,28 @@ When you will upload a video in this channel, the video support field will be au 当前没有字幕。 - 182 + 183 Captions 字幕 - 139 + 140 Upload thumbnail 上传缩略图 - 195 + 196 Upload preview 上传预览图 - 202 + 203 @@ -3018,14 +2894,14 @@ When you will upload a video in this channel, the video support field will be au Short text to tell people how they can support you (membership platform...). 用一段简短的文字告知观众支持您的频道的方法（赞助社区等）。 - 209 + 210 Advanced settings 高级设置 - 190 + 191 @@ -3092,17 +2968,6 @@ When you will upload a video in this channel, the video support field will be au 3 - - - Cancel - - - 取消 - - - 19 - - Share 分享 @@ -3488,13 +3353,6 @@ When you will upload a video in this channel, the video support field will be au 14 - - Error getting about from server - 从服务器获取关于信息时发生错误 - - 1 - - No description 没有说明 @@ -3516,13 +3374,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Error - 错误 - - 1 - - 240p 240p @@ -3565,13 +3416,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Success - 成功 - - 1 - - Configuration updated. 设置已更新。 @@ -3993,20 +3837,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - 您确定要删除 吗？这将同时删除上传至该频道的所有视频。 - - 1 - - - - Please type the name of the video channel to confirm - 输入视频频道的显示名以确认操作 - - 1 - - Video channel deleted. 视频频道 已删除。 @@ -4014,6 +3844,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + My videos + 我的视频 + + 1 + + Do you really want to delete videos? 您确定要删除 个视频吗？ @@ -4084,16 +3921,44 @@ When you will upload a video in this channel, the video support field will be au 1 - - Channels - 频道 + + My library + 我的库 1 - - Video imports - 导入的视频 + + My channels + 我的频道 + + 1 + + + + My subscriptions + 我的订阅 + + 1 + + + + Misc + 杂项 + + 1 + + + + Ownership changes + 视频转移 + + 1 + + + + My settings + 我的设置 1 @@ -4219,6 +4084,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + Error + 错误 + + 1 + + You need to reconnect. 请重新进行授权。 @@ -4240,6 +4112,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Info + 提示 + + 1 + + + + Success + 成功 + + 1 + + Incorrect username or password. 用户名或密码不正确。 @@ -4457,6 +4343,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Email is required. + 请输入电子邮件地址。 + + 1 + + + + Email must be valid. + 请输入合法的电子邮件地址。 + + 1 + + Username is required. 请输入用户名。 @@ -4478,41 +4378,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Username must be at least 3 characters long. - 用户名应至少 3 个字符。 - - 1 - - - - Username cannot be more than 20 characters long. - 用户名不能超过 20 个字符。 - - 1 - - - - Username should be only lowercase alphanumeric characters. - 用户名只能使用小写字母和数字。 - - 1 - - - - Email is required. - 请输入电子邮件地址。 - - 1 - - - - Email must be valid. - 请输入合法的电子邮件地址。 - - 1 - - Password must be at least 6 characters long. 密码应至少 6 个字符。 @@ -4576,20 +4441,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Display name must be at least 3 characters long. - 显示名称应至少 3 个字符。 - - 1 - - - - Display name cannot be more than 120 characters long. - 显示名称不能超过 120 个字符。 - - 1 - - Description must be at least 3 characters long. 说明应至少 3 个字符。 @@ -4639,13 +4490,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Report reason cannot be more than 300 characters long. - 举报理由不能超过 300 个字符。 - - 1 - - Moderation comment is required. 请输入运营备注信息。 @@ -4660,13 +4504,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Moderation comment cannot be more than 300 characters long. - 运营备注信息不能超过 300 个字符。 - - 1 - - The channel is required. 必须指定频道。 @@ -4723,27 +4560,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Name must be at least 3 characters long. - 频道用户名应至少 3 个字符。 - - 1 - - - - Name cannot be more than 20 characters long. - 频道用户名不能超过 20 个字符。 - - 1 - - - - Name should be only lowercase alphanumeric characters. - 频道用户名只能使用小写字母和数字。 - - 1 - - Support text must be at least 3 characters long. 支持信息应至少 3 个字符。 @@ -5549,13 +5365,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Subscribed - 已订阅 - - 1 - - Subscribed to 成功订阅 @@ -5563,9 +5372,9 @@ When you will upload a video in this channel, the video support field will be au 1 - - Unsubscribed - 已退订 + + Subscribed + 已订阅 1 @@ -5577,6 +5386,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + Unsubscribed + 已退订 + + 1 + + Moderator 监察员 @@ -5633,13 +5449,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Info - 提示 - - 1 - - Upload cancelled 上传已取消 @@ -5647,13 +5456,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - We are sorry but PeerTube cannot handle videos > 8GB - 非常抱歉，PeerTube 不支持 8GB 以上的视频 - - 1 - - Your video quota is exceeded with this video (video size: , used: , quota: ) 此视频已超出您的视频存储总空间（视频大小：，当前已使用：，总空间：） diff --git a/client/src/locale/target/angular_zh_Hant_TW.xml b/client/src/locale/target/angular_zh_Hant_TW.xml index 028520a6e..c1aefbb40 100644 --- a/client/src/locale/target/angular_zh_Hant_TW.xml +++ b/client/src/locale/target/angular_zh_Hant_TW.xml @@ -497,7 +497,7 @@ Password 密碼 - 12 + 13 @@ -511,7 +511,7 @@ Login 登入 - 38 + 36 @@ -539,7 +539,7 @@ Send me an email to reset my password 傳送電子郵件給我以重設我的密碼 - 75 + 80 @@ -606,7 +606,7 @@ Signup 註冊 - 88 + 78 @@ -674,7 +674,7 @@ Change the language 變更語言 - 88 + 86 @@ -685,7 +685,7 @@ 我的公開個人資料 - 18 + 16 @@ -696,7 +696,7 @@ 我的帳號 - 22 + 20 @@ -707,7 +707,7 @@ 我的影片 - 26 + 24 @@ -718,14 +718,14 @@ 登出 - 30 + 28 Create an account 建立帳號 - 39 + 37 @@ -739,49 +739,49 @@ Subscriptions 訂閱 - 47 + 45 Overview 概覽 - 52 + 50 Trending 趨勢 - 57 + 55 Recently added 最近新增 - 62 + 60 Local 本地 - 67 + 65 More 更多 - 72 + 70 Administration 管理 - 76 + 74 @@ -795,14 +795,14 @@ Show keyboard shortcuts 顯示鍵盤快捷鍵 - 91 + 89 Toggle dark interface 切換至暗色介面 - 94 + 92 @@ -907,14 +907,14 @@ Display unlisted and private videos 顯示未列出與私密影片 - 11 + 14 No results. 沒有結果 - 17 + 20 @@ -972,13 +972,22 @@ 7 - + - About instance - - 關於 實體 + Cancel + + + 取消 + - 1 + 26 + + + + Submit + 遞交 + + 31 @@ -992,41 +1001,14 @@ Terms 條款 - 44 + 39 User registration is allowed and 允許使用者註冊與 - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - 此實體提供了基本配額 空間給它的使用者的影片。 - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - 此實體提供了無限的影片空間給它的使用者。 - - 31 - - - - - User registration is currently not allowed. - - 目前不允許使用者註冊。 - - 36 + 29 @@ -1353,49 +1335,49 @@ Short description 短描述 - 22 + 21 Default client route 預設客戶端路由 - 55 + 48 Videos Overview 影片概覽 - 58 + 51 Videos Trending 影片趨勢 - 59 + 52 Videos Recently Added 最近新增的影片 - 60 + 53 Local videos 本地影片 - 61 + 54 Policy on videos containing sensitive content 包含敏感內容的影片政策 - 70 + 61 @@ -1430,23 +1412,44 @@ Signup enabled 已啟用註冊 - 93 + 84 Signup requires email verification 註冊需要電子郵件驗證 - 100 + 91 Signup limit 限制註冊 + + 96 + + + + Users + 使用者 105 + + User default video quota + 使用者預設影片配額 + + 109 + + + + User default daily upload limit + 預設使用者每日上傳限制 + + 121 + + Import 匯入 @@ -1458,49 +1461,28 @@ Video import with HTTP URL (i.e. YouTube) enabled 以 HTTP URL 匯入影片（如 YouTube）已啟用 - 120 + 141 Video import with a torrent file or a magnet URI enabled 已啟用種子檔案或磁力連結匯入影片 - 127 + 148 Administrator 管理員 - 131 + 155 Admin email 管理電子郵件 - 134 - - - - Users - 使用者 - - 144 - - - - User default video quota - 使用者預設影片配額 - - 147 - - - - User default daily upload limit - 預設使用者每日上傳限制 - - 161 + 158 @@ -1521,30 +1503,19 @@ Your Twitter username 您的 Twitter 使用者名稱 - 181 + 184 Indicates the Twitter account for the website or platform on which the content was published. 指示發佈影片的網頁或平臺的 Twitter 帳號 - 184 + 187 Instance whitelisted by Twitter 由 Twitter 列入白名單的實體 - - 198 - - - - If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br /> - If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.<br /><br /> - Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> to see if you instance is whitelisted. - 如果您的實體在 Twitter 的白名單裡面，PeerTube 的影片分享將會在 Twitter 的推文中嵌入影片播放器。<br /> - 如果實體不在白名單中，我們會使用一張圖片連結卡片並重新導向至您的 PeerTube 實體。<br /><br /> - 在此勾選框打勾，儲存設定並使用您實體的影片 URL (https://example.com/videos/watch/blabla)在 <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> 上測試以檢視您的實體是否在白名單內。 199 @@ -1560,35 +1531,35 @@ Transcoding 轉換編碼 - 210 + 215 Transcoding enabled 轉換編碼已啟用 - 215 + 221 If you disable transcoding, many videos from your users will not work! 若您停用轉換編碼，從您的使用者們而來的許多影片將會無法運作！ - 216 + 222 Transcoding threads 轉換編碼執行緒 - 223 + 237 Resolution enabled 解析度 已啟用 - 239 + 252 @@ -1603,82 +1574,47 @@ - 244 + 260 Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. 有一些檔案並未聯盟化（預覽、字幕）。我們會直接從原始實體擷取它們並快取。 - 249 + 265 Previews cache size 預覽快取大小 - 254 + 271 Video captions cache size 影片字幕快取大小 - 265 + 280 Customizations 自訂 - 275 + 289 JavaScript JavaScript - 278 + 294 Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> 直接編寫 JavaScript 程式碼。<br />範例：<pre>console.log('my instance is amazing');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - 直接撰寫 CSS 程式碼。範例：<br /> - <pre> - body - background-color: red; - - </pre> - - 附加 <em>#custom-css</em> 以覆寫樣式。範例： - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1687,21 +1623,21 @@ Advanced configuration 進階設定 - 207 + 212 Update configuration 更新設定 - 325 + 340 It seems the configuration is invalid. Please search potential errors in the different tabs. 設定似乎無效。請在不同的分頁中搜尋潛在的錯誤。 - 326 + 341 @@ -1987,21 +1923,21 @@ User's email must be verified to login 使用者的電子郵件必須驗證過才能登入 - 70 + 72 User's email is verified / User can login without email verification 使用者的電子郵件已驗證／使用者可以不透過電子郵件驗證登入 - 74 + 76 Ban reason: 阻擋理由： - 92 + 95 @@ -2068,7 +2004,7 @@ Actions 動作 - 33 + 35 @@ -2103,14 +2039,14 @@ Date 日期 - 10 + 11 Blacklist reason: 黑名單理由： - 41 + 43 @@ -2169,69 +2105,6 @@ 23 - - My settings - 我的設定 - - 3 - - - - My library - 我的媒體庫 - - 7 - - - - My channels - 我的頻道 - - 12 - - - - My videos - 我的影片 - - 14 - - - - My subscriptions - 我的訂閱 - - 16 - - - - My imports - 我的匯入 - - 18 - - - - Misc - 雜項 - - 24 - - - - Muted instances - 已靜音的實體 - - 2 - - - - Ownership changes - 所有權變更 - - 33 - - Video quota: 影片配額： @@ -2243,21 +2116,21 @@ Profile 簡介 - 8 + 7 Video settings 影片設定 - 15 + 16 Danger zone 危險區域 - 18 + 19 @@ -2285,13 +2158,6 @@ 35 - - Submit - 遞交 - - 24 - - - views - 次檢視 @@ -2450,6 +2316,13 @@ When you will upload a video in this channel, the video support field will be au 47 + + Muted instances + 已靜音的實體 + + 2 + + Change password 變更密碼 @@ -2694,14 +2567,14 @@ When you will upload a video in this channel, the video support field will be au Publish will be available when upload is finished 上傳完成時將可發佈 - 53 + 58 Publish 發佈 - 60 + 65 @@ -2882,14 +2755,14 @@ When you will upload a video in this channel, the video support field will be au Wait transcoding before publishing the video 正等待發佈影片前的轉換編碼 - 130 + 131 If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. 如果您決定不要等待在發佈影片前的轉換編碼，它可能會在轉換編碼結束前都無法播放。 - 131 + 132 @@ -2903,49 +2776,49 @@ When you will upload a video in this channel, the video support field will be au Add another caption 新增其他字幕 - 146 + 147 See the subtitle file 檢視字幕檔案 - 155 + 156 Already uploaded ✔ 已上傳 ✔ - 159 + 160 Will be created on update 將在更新時建立 - 167 + 168 Cancel create 取消建立 - 169 + 170 Will be deleted on update 將在更新時刪除 - 175 + 176 Cancel deletion 取消刪除 - 177 + 178 @@ -2956,28 +2829,28 @@ When you will upload a video in this channel, the video support field will be au 現在沒有字幕。 - 182 + 183 Captions 字幕 - 139 + 140 Upload thumbnail 上傳縮圖 - 195 + 196 Upload preview 上傳預覽 - 202 + 203 @@ -2991,14 +2864,14 @@ When you will upload a video in this channel, the video support field will be au Short text to tell people how they can support you (membership platform...). 告訴人們他們可以如何支援您（成員平臺等）的短文 - 209 + 210 Advanced settings 進階設定 - 190 + 191 @@ -3065,17 +2938,6 @@ When you will upload a video in this channel, the video support field will be au 3 - - - Cancel - - - 取消 - - - 19 - - Share 分享 @@ -3460,13 +3322,6 @@ When you will upload a video in this channel, the video support field will be au 14 - - Error getting about from server - 取得關於伺服器的錯誤 - - 1 - - No description 沒有描述 @@ -3488,13 +3343,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Error - 錯誤 - - 1 - - 240p 240p @@ -3537,13 +3385,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Success - 成功 - - 1 - - Configuration updated. 設定已更新。 @@ -3978,20 +3819,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - 您真的想要刪除 嗎？這也會刪除所有上傳到這個頻道的影片。 - - 1 - - - - Please type the name of the video channel to confirm - 請輸入影片頻道的名稱以確認 - - 1 - - Video channel deleted. 影片頻道 已刪除。 @@ -3999,6 +3826,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + My videos + 我的影片 + + 1 + + Do you really want to delete videos? 您真的想要刪除 影片嗎？ @@ -4069,16 +3903,44 @@ When you will upload a video in this channel, the video support field will be au 1 - - Channels - 頻道 + + My library + 我的媒體庫 1 - - Video imports - 影片匯入 + + My channels + 我的頻道 + + 1 + + + + My subscriptions + 我的訂閱 + + 1 + + + + Misc + 雜項 + + 1 + + + + Ownership changes + 所有權變更 + + 1 + + + + My settings + 我的設定 1 @@ -4204,6 +4066,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + Error + 錯誤 + + 1 + + You need to reconnect. 您需要重新連線。 @@ -4225,6 +4094,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Info + 資訊 + + 1 + + + + Success + 成功 + + 1 + + Incorrect username or password. 不正確的使用者名稱或密碼。 @@ -4442,6 +4325,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Email is required. + 電子郵件必填。 + + 1 + + + + Email must be valid. + 電子郵件必須為有效電子郵件。 + + 1 + + Username is required. 使用者名稱必填。 @@ -4463,41 +4360,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Username must be at least 3 characters long. - 使用者名稱必須至少 3 個字元長。 - - 1 - - - - Username cannot be more than 20 characters long. - 使用者名稱不能多於 20 個字元。 - - 1 - - - - Username should be only lowercase alphanumeric characters. - 使用者名稱應該僅有小寫英數字元。 - - 1 - - - - Email is required. - 電子郵件必填。 - - 1 - - - - Email must be valid. - 電子郵件必須為有效電子郵件。 - - 1 - - Password must be at least 6 characters long. 密碼必須至少 6 個字元長。 @@ -4561,20 +4423,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Display name must be at least 3 characters long. - 顯示名稱必須至少 3 個字元長。 - - 1 - - - - Display name cannot be more than 120 characters long. - 顯示名稱不能多於 120 個字元。 - - 1 - - Description must be at least 3 characters long. 描述必須至少 3 個字元長。 @@ -4624,13 +4472,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Report reason cannot be more than 300 characters long. - 回報理由不能多於 300 個字元。 - - 1 - - Moderation comment is required. 管理評論必填。 @@ -4645,13 +4486,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Moderation comment cannot be more than 300 characters long. - 管理評論無法多於 300 個字元。 - - 1 - - The channel is required. 頻道必填。 @@ -4708,27 +4542,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Name must be at least 3 characters long. - 名稱必須至少 3 個字元。 - - 1 - - - - Name cannot be more than 20 characters long. - 名稱不能超過 20 個字元。 - - 1 - - - - Name should be only lowercase alphanumeric characters. - 名稱應該只有小寫英數字元。 - - 1 - - Support text must be at least 3 characters long. 支援文字必須至少 3 個字元長。 @@ -5541,13 +5354,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Subscribed - 已訂閱 - - 1 - - Subscribed to 訂閱 @@ -5555,9 +5361,9 @@ When you will upload a video in this channel, the video support field will be au 1 - - Unsubscribed - 已取消訂閱 + + Subscribed + 已訂閱 1 @@ -5569,6 +5375,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + Unsubscribed + 已取消訂閱 + + 1 + + Moderator 主持人 @@ -5639,13 +5452,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Info - 資訊 - - 1 - - Upload cancelled 已取消上傳 @@ -5653,13 +5459,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - We are sorry but PeerTube cannot handle videos > 8GB - 我們很抱歉，但 PeerTube 無法處理大於 8GB 的影片 - - 1 - - Your video quota is exceeded with this video (video size: , used: , quota: ) 您的影片配額已因此影片超過（影片大小：, used: ，配額：） diff --git a/client/src/locale/target/iso639_nl_NL.xml b/client/src/locale/target/iso639_nl_NL.xml index 9c0e2fd9e..b3a4ff541 100644 --- a/client/src/locale/target/iso639_nl_NL.xml +++ b/client/src/locale/target/iso639_nl_NL.xml @@ -5,7 +5,7 @@ Afar - Afar + Ver Abkhazian @@ -43,6 +43,10 @@ Avaric Avaars + + Kotava + Kotava + Aymara Aymara @@ -167,6 +171,10 @@ English Engels + + Esperanto + Esperanto + Estonian Ests @@ -311,6 +319,10 @@ Javanese Javaans + + Lojban + Lojban + Japanese Japans @@ -495,6 +507,10 @@ Nyanja Nyanja + + Occitan + Occitan + Ojibwa Ojibwe @@ -671,6 +687,10 @@ Tigrinya Tigrinya + + Klingon + Klingon + Tonga (Tonga Islands) Tongaans diff --git a/client/src/locale/target/player_nl_NL.xml b/client/src/locale/target/player_nl_NL.xml index 5b689f2a2..45bc76a55 100644 --- a/client/src/locale/target/player_nl_NL.xml +++ b/client/src/locale/target/player_nl_NL.xml @@ -347,6 +347,10 @@ Speed Snelheid + + Subtitles/CC + Ondertiteling/CC + peers peers diff --git a/client/src/locale/target/server_cs_CZ.json b/client/src/locale/target/server_cs_CZ.json index 060658c80..e013a910f 100644 --- a/client/src/locale/target/server_cs_CZ.json +++ b/client/src/locale/target/server_cs_CZ.json @@ -1 +1 @@ -{"Music":"Hudba","Films":"Filmy","Vehicles":"Auta","Art":"Umění","Sports":"Sport","Travels":"Cestování","Gaming":"Hry","People":"Lidé","Comedy":"Komedie","Entertainment":"Zábava","News & Politics":"Zprávy a politika","How To":"Jak na to","Education":"Výukové","Activism":"Aktivismus","Science & Technology":"Věda a technologie","Animals":"Zvířata","Kids":"Děti","Food":"Jídlo a vaření","Attribution":"Uveďte autora","Attribution - Share Alike":"Uveďte autora - Zachovejte licenci","Attribution - No Derivatives":"Uveďte autora - Nezpracovávejte","Attribution - Non Commercial":"Uveďte autora - Nešiřte dílo komerčně","Attribution - Non Commercial - Share Alike":"Uveďte autora - Nešiřte dílo komerčně - Zachovejte licenci","Attribution - Non Commercial - No Derivatives":"Uveďte autora - Nešiřte dílo komerčně - Nezpracovávejte","Public Domain Dedication":"Volné dílo","Public":"Veřejné","Unlisted":"Nezobrazeno","Private":"Soukromé","Published":"Publikované","Pending":"Čekající","Success":"Úspěch","Failed":"Neúspěch","Misc":"Různé","Unknown":"Neznámé","Afar":"Afarština","Abkhazian":"Abcházština","Afrikaans":"Afrikánština","Akan":"Akanština","Amharic":"Amharština","Arabic":"Arabština","Aragonese":"Aragonština","American Sign Language":"Americká znaková řeč","Assamese":"Ásámština","Avaric":"Avarština","Kotava":"Kotava","Aymara":"Ajmarština","Azerbaijani":"Ázerbájdžánština","Bashkir":"Baškirština","Bambara":"Bambarština","Belarusian":"Běloruština","Bengali":"Bengálština","British Sign Language":"Britská znaková řeč","Bislama":"Bislamština","Tibetan":"Tibetština","Bosnian":"Bosenština","Breton":"Bretonština","Bulgarian":"Bulharština","Brazilian Sign Language":"Brazilská znaková řeč","Catalan":"Katalánština","Czech":"Čeština","Chamorro":"Chamorro","Chechen":"Čečenština","Chuvash":"Čuvaština","Cornish":"Kornština","Corsican":"Korsičtina","Cree":"Kríjština","Czech Sign Language":"Česká znaková řeč","Chinese Sign Language":"Čínská znaková řeč","Welsh":"Velština","Danish":"Dánština","German":"Němčina","Dhivehi":"Maledivština","Danish Sign Language":"Dánská znaková řeč","Dzongkha":"Dzongkä","Modern Greek (1453-)":"Moderní řečtina","English":"Angličtina","Esperanto":"Esperanto","Estonian":"Estonština","Basque":"Baskičtina","Ewe":"Eveština","Faroese":"Faerština","Persian":"Perština","Fijian":"Fidžijština","Finnish":"Finština","French":"Francouzština","Western Frisian":"Západofríština","French Sign Language":"Francouzská znaková řeč","Fulah":"Fulbština","Scottish Gaelic":"Skotská gaelština","Irish":"Irština","Galician":"Galicijština","Manx":"Manština","Guarani":"Guaranština","German Sign Language":"Německá znaková řeč","Gujarati":"Gudžarátština","Haitian":"Haitská kreolština","Hausa":"Hauština","Serbo-Croatian":"Srcbochorvatšinta","Hebrew":"Hebrejština","Herero":"Herero","Hindi":"Hindština","Hiri Motu":"Hiri Motu","Croatian":"Chorvatština","Hungarian":"Maďarština","Armenian":"Arménština","Igbo":"Igboština","Sichuan Yi":"Nuosu","Inuktitut":"Inuktitutština","Indonesian":"Indonéština","Inupiaq":"Inupiaq","Icelandic":"Islandština","Italian":"Italština","Javanese":"Javánština","Lojban":"Lojban","Japanese":"Japonština","Japanese Sign Language":"Japonská znaková řeč","Kalaallisut":"Grónština","Kannada":"Kannadština","Kashmiri":"Kašmírština","Georgian":"Gruzínština","Kanuri":"Kanurijština","Kazakh":"Kazaština","Khmer":"Khmerština","Kikuyu":"Kikujština","Kinyarwanda":"Rwandština","Kirghiz":"Kyrgyzština","Komi":"Komi","Kongo":"Konžština","Korean":"Korejština","Kuanyama":"Kuanyama","Kurdish":"Kurdština","Lao":"Laoština","Latvian":"Lotyština","Limburgan":"Limburština","Lingala":"Ngalština","Lithuanian":"Litevština","Luxembourgish":"Lucemburština","Luba-Katanga":"Luba-Katanga","Ganda":"Gandština","Marshallese":"Maršálština","Malayalam":"Malajálamština","Marathi":"Maráthština","Macedonian":"Makedonština","Malagasy":"Malgaština","Maltese":"Maltština","Mongolian":"Mongolština","Maori":"Maorština","Malay (macrolanguage)":"Malajština","Burmese":"Barmština","Nauru":"Naurština","Navajo":"Navažština","South Ndebele":"Jižní ndebelština","North Ndebele":"Severní ndebelština","Ndonga":"Ndondština","Nepali (macrolanguage)":"Nepálština","Dutch":"Dánština","Norwegian Nynorsk":"Norština Nynorsk","Norwegian Bokmål":"Norština Bokmål","Norwegian":"Norština ","Nyanja":"Čičevština","Occitan":"Okcitánština","Ojibwa":"Ojibwa","Oriya (macrolanguage)":"Urijština","Oromo":"Oromština","Ossetian":"Osetština","Panjabi":"Paňdžábština","Pakistan Sign Language":"Pakistánská znaková řeč","Polish":"Polština","Portuguese":"Portugalština","Pushto":"Paštština","Quechua":"Kečuánština","Romansh":"Rétorománština","Romanian":"Rumunština","Russian Sign Language":"Ruská znaková řeč","Rundi":"Kirundi","Russian":"Ruština","Sango":"Sango","Saudi Arabian Sign Language":"Saudská arabská znaková řeč","South African Sign Language":"Jihoafrická znaková řeč","Sinhala":"Sinhálština","Slovak":"Slovenština","Slovenian":"Slovinština","Northern Sami":"Severní sámština","Samoan":"Samojština","Shona":"Shona","Sindhi":"Sindhština","Somali":"Somálština","Southern Sotho":"Jižní sotština","Spanish":"Španělština","Albanian":"Albánština","Sardinian":"Sardínština","Serbian":"Srbština","Swati":"Swati","Sundanese":"Sundština","Swahili (macrolanguage)":"Svahilština","Swedish":"Švédština","Swedish Sign Language":"Švédská znaková řeč","Tahitian":"Tahitština","Tamil":"Tamilština","Tatar":"Tatarština","Telugu":"Telugština","Tajik":"Tádžičtina","Tagalog":"Tagalog","Thai":"Thajština","Tigrinya":"Tigrinya","Klingon":"Klingonština","Tonga (Tonga Islands)":"Tongánština","Tswana":"Setswanština","Tsonga":"Tsongština","Turkmen":"Turkmenština","Turkish":"Turečtina","Twi":"Twi","Uighur":"Ujgurština","Ukrainian":"Ukrajinština","Urdu":"Urdština","Uzbek":"Uzbečtina","Venda":"Vendština","Vietnamese":"Vietnamština","Walloon":"Valonština","Wolof":"Wolof ","Xhosa":"Xhoština","Yiddish":"Jidiš","Yoruba":"Jorubština","Zhuang":"Čuangština","Chinese":"Čínština","Zulu":"Zuluština"} \ No newline at end of file +{"Music":"Hudba","Films":"Filmy","Vehicles":"Auta","Art":"Umění","Sports":"Sport","Travels":"Cestování","Gaming":"Hry","People":"Lidé","Comedy":"Komedie","Entertainment":"Zábava","News & Politics":"Zprávy a politika","How To":"Jak na to","Education":"Výukové","Activism":"Aktivismus","Science & Technology":"Věda a technologie","Animals":"Zvířata","Kids":"Děti","Food":"Jídlo a vaření","Attribution":"Uveďte autora","Attribution - Share Alike":"Uveďte autora - Zachovejte licenci","Attribution - No Derivatives":"Uveďte autora - Nezpracovávejte","Attribution - Non Commercial":"Uveďte autora - Nešiřte dílo komerčně","Attribution - Non Commercial - Share Alike":"Uveďte autora - Nešiřte dílo komerčně - Zachovejte licenci","Attribution - Non Commercial - No Derivatives":"Uveďte autora - Nešiřte dílo komerčně - Nezpracovávejte","Public Domain Dedication":"Volné dílo","Public":"Veřejné","Unlisted":"Nezobrazeno","Private":"Soukromé","Published":"Publikované","To transcode":"K transkódování","To import":"To import","Pending":"Čekající","Success":"Úspěch","Failed":"Neúspěch","Misc":"Různé","Unknown":"Neznámé","Afar":"Afarština","Abkhazian":"Abcházština","Afrikaans":"Afrikánština","Akan":"Akanština","Amharic":"Amharština","Arabic":"Arabština","Aragonese":"Aragonština","American Sign Language":"Americká znaková řeč","Assamese":"Ásámština","Avaric":"Avarština","Kotava":"Kotava","Aymara":"Ajmarština","Azerbaijani":"Ázerbájdžánština","Bashkir":"Baškirština","Bambara":"Bambarština","Belarusian":"Běloruština","Bengali":"Bengálština","British Sign Language":"Britská znaková řeč","Bislama":"Bislamština","Tibetan":"Tibetština","Bosnian":"Bosenština","Breton":"Bretonština","Bulgarian":"Bulharština","Brazilian Sign Language":"Brazilská znaková řeč","Catalan":"Katalánština","Czech":"Čeština","Chamorro":"Chamorro","Chechen":"Čečenština","Chuvash":"Čuvaština","Cornish":"Kornština","Corsican":"Korsičtina","Cree":"Kríjština","Czech Sign Language":"Česká znaková řeč","Chinese Sign Language":"Čínská znaková řeč","Welsh":"Velština","Danish":"Dánština","German":"Němčina","Dhivehi":"Maledivština","Danish Sign Language":"Dánská znaková řeč","Dzongkha":"Dzongkä","Modern Greek (1453-)":"Moderní řečtina","English":"Angličtina","Esperanto":"Esperanto","Estonian":"Estonština","Basque":"Baskičtina","Ewe":"Eveština","Faroese":"Faerština","Persian":"Perština","Fijian":"Fidžijština","Finnish":"Finština","French":"Francouzština","Western Frisian":"Západofríština","French Sign Language":"Francouzská znaková řeč","Fulah":"Fulbština","Scottish Gaelic":"Skotská gaelština","Irish":"Irština","Galician":"Galicijština","Manx":"Manština","Guarani":"Guaranština","German Sign Language":"Německá znaková řeč","Gujarati":"Gudžarátština","Haitian":"Haitská kreolština","Hausa":"Hauština","Serbo-Croatian":"Srcbochorvatšinta","Hebrew":"Hebrejština","Herero":"Herero","Hindi":"Hindština","Hiri Motu":"Hiri Motu","Croatian":"Chorvatština","Hungarian":"Maďarština","Armenian":"Arménština","Igbo":"Igboština","Sichuan Yi":"Nuosu","Inuktitut":"Inuktitutština","Indonesian":"Indonéština","Inupiaq":"Inupiaq","Icelandic":"Islandština","Italian":"Italština","Javanese":"Javánština","Lojban":"Lojban","Japanese":"Japonština","Japanese Sign Language":"Japonská znaková řeč","Kalaallisut":"Grónština","Kannada":"Kannadština","Kashmiri":"Kašmírština","Georgian":"Gruzínština","Kanuri":"Kanurijština","Kazakh":"Kazaština","Khmer":"Khmerština","Kikuyu":"Kikujština","Kinyarwanda":"Rwandština","Kirghiz":"Kyrgyzština","Komi":"Komi","Kongo":"Konžština","Korean":"Korejština","Kuanyama":"Kuanyama","Kurdish":"Kurdština","Lao":"Laoština","Latvian":"Lotyština","Limburgan":"Limburština","Lingala":"Ngalština","Lithuanian":"Litevština","Luxembourgish":"Lucemburština","Luba-Katanga":"Luba-Katanga","Ganda":"Gandština","Marshallese":"Maršálština","Malayalam":"Malajálamština","Marathi":"Maráthština","Macedonian":"Makedonština","Malagasy":"Malgaština","Maltese":"Maltština","Mongolian":"Mongolština","Maori":"Maorština","Malay (macrolanguage)":"Malajština","Burmese":"Barmština","Nauru":"Naurština","Navajo":"Navažština","South Ndebele":"Jižní ndebelština","North Ndebele":"Severní ndebelština","Ndonga":"Ndondština","Nepali (macrolanguage)":"Nepálština","Dutch":"Dánština","Norwegian Nynorsk":"Norština Nynorsk","Norwegian Bokmål":"Norština Bokmål","Norwegian":"Norština ","Nyanja":"Čičevština","Occitan":"Okcitánština","Ojibwa":"Ojibwa","Oriya (macrolanguage)":"Urijština","Oromo":"Oromština","Ossetian":"Osetština","Panjabi":"Paňdžábština","Pakistan Sign Language":"Pakistánská znaková řeč","Polish":"Polština","Portuguese":"Portugalština","Pushto":"Paštština","Quechua":"Kečuánština","Romansh":"Rétorománština","Romanian":"Rumunština","Russian Sign Language":"Ruská znaková řeč","Rundi":"Kirundi","Russian":"Ruština","Sango":"Sango","Saudi Arabian Sign Language":"Saudská arabská znaková řeč","South African Sign Language":"Jihoafrická znaková řeč","Sinhala":"Sinhálština","Slovak":"Slovenština","Slovenian":"Slovinština","Northern Sami":"Severní sámština","Samoan":"Samojština","Shona":"Shona","Sindhi":"Sindhština","Somali":"Somálština","Southern Sotho":"Jižní sotština","Spanish":"Španělština","Albanian":"Albánština","Sardinian":"Sardínština","Serbian":"Srbština","Swati":"Swati","Sundanese":"Sundština","Swahili (macrolanguage)":"Svahilština","Swedish":"Švédština","Swedish Sign Language":"Švédská znaková řeč","Tahitian":"Tahitština","Tamil":"Tamilština","Tatar":"Tatarština","Telugu":"Telugština","Tajik":"Tádžičtina","Tagalog":"Tagalog","Thai":"Thajština","Tigrinya":"Tigrinya","Klingon":"Klingonština","Tonga (Tonga Islands)":"Tongánština","Tswana":"Setswanština","Tsonga":"Tsongština","Turkmen":"Turkmenština","Turkish":"Turečtina","Twi":"Twi","Uighur":"Ujgurština","Ukrainian":"Ukrajinština","Urdu":"Urdština","Uzbek":"Uzbečtina","Venda":"Vendština","Vietnamese":"Vietnamština","Walloon":"Valonština","Wolof":"Wolof ","Xhosa":"Xhoština","Yiddish":"Jidiš","Yoruba":"Jorubština","Zhuang":"Čuangština","Chinese":"Čínština","Zulu":"Zuluština"} \ No newline at end of file diff --git a/client/src/locale/target/server_fr_FR.json b/client/src/locale/target/server_fr_FR.json index eebc2f96e..64762b575 100644 --- a/client/src/locale/target/server_fr_FR.json +++ b/client/src/locale/target/server_fr_FR.json @@ -1 +1 @@ -{"Music":"Musiques","Films":"Films","Vehicles":"Transport","Art":"Art","Sports":"Sports","Travels":"Voyages","Gaming":"Jeux vidéos","People":"Personnalités","Comedy":"Humour","Entertainment":"Divertissement","News & Politics":"Actualité & Politique","How To":"Tutoriels","Education":"Éducation","Activism":"Militantisme","Science & Technology":"Science & Technologie","Animals":"Animaux","Kids":"Enfants","Food":"Cuisine","Attribution":"Attribution","Attribution - Share Alike":"Attribution - Partage dans les mêmes conditions","Attribution - No Derivatives":"Attribution - Pas d’œuvre dérivée","Attribution - Non Commercial":"Attribution - Utilisation non commerciale","Attribution - Non Commercial - Share Alike":"Attribution - Utilisation non commerciale - Partage dans les mêmes conditions","Attribution - Non Commercial - No Derivatives":"Attribution - Utilisation non commerciale - Pas d’œuvre dérivée","Public Domain Dedication":"Domaine public","Public":"Publique","Unlisted":"Non listée","Private":"Privée","Published":"Publiée","To transcode":"À transcoder","To import":"À importer","Pending":"En cours","Success":"Succès","Failed":"Échoué","Misc":"Divers","Unknown":"Inconnu","Afar":"Afar","Abkhazian":"Abkhaze","Afrikaans":"Afrikaans","Akan":"Akan","Amharic":"Amharique","Arabic":"Arabe","Aragonese":"Aragonais","American Sign Language":"Langue des signes américaine","Assamese":"Assamais","Avaric":"Avar","Kotava":"Kotava","Aymara":"Aymara","Azerbaijani":"Azéri","Bashkir":"Bachkir","Bambara":"Bambara","Belarusian":"Biélorusse","Bengali":"Bengali","British Sign Language":"Langue des signes britannique","Bislama":"Bichlamar","Tibetan":"Tibétain","Bosnian":"Bosniaque","Breton":"Breton","Bulgarian":"Bulgare","Brazilian Sign Language":"Langue des signes brésilienne","Catalan":"Catalan","Czech":"Tchèque","Chamorro":"Chamorro","Chechen":"Tchétchène","Chuvash":"Tchouvache","Cornish":"Cornique","Corsican":"Corse","Cree":"Cree","Czech Sign Language":"Langue des signes tchèque","Chinese Sign Language":"Langue des signes chinoise","Welsh":"Gallois","Danish":"Danois","German":"Allemand","Dhivehi":"Maldivien","Danish Sign Language":"Langue des signes danoise","Dzongkha":"Dzongkha","Modern Greek (1453-)":"Grec moderne (après 1453)","English":"Anglais","Esperanto":"Espéranto","Estonian":"Estonien","Basque":"Basque","Ewe":"Éwé","Faroese":"Féroïen","Persian":"Persan","Fijian":"Fidjien","Finnish":"Finnois","French":"Français","Western Frisian":"Frison occidental","French Sign Language":"Langue des signes française","Fulah":"Peul","Scottish Gaelic":"Gaélique","Irish":"Irlandais","Galician":"Galicien","Manx":"Manx","Guarani":"Guarani","German Sign Language":"Langue des signes allemande","Gujarati":"Goudjrati","Haitian":"Haïtien","Hausa":"Haoussa","Serbo-Croatian":"Serbo-croate","Hebrew":"Hébreu","Herero":"Herero","Hindi":"Hindi","Hiri Motu":"Hiri motu","Croatian":"Croate","Hungarian":"Hongrois","Armenian":"Arménien","Igbo":"Igbo","Sichuan Yi":"Yi de Sichuan","Inuktitut":"Inuktitut","Indonesian":"Indonésien","Inupiaq":"Inupiaq","Icelandic":"Islandais","Italian":"Italien","Javanese":"Javanais","Lojban":"Lojban","Japanese":"Japonais","Japanese Sign Language":"Langue des signes japonaise","Kalaallisut":"Groenlandais","Kannada":"Kannada","Kashmiri":"Kashmiri","Georgian":"Géorgien","Kanuri":"Kanouri","Kazakh":"Kazakh","Khmer":"Khmer central","Kikuyu":"Kikuyu","Kinyarwanda":"Rwanda","Kirghiz":"Kirghiz","Komi":"Kom","Kongo":"Kongo","Korean":"Coréen","Kuanyama":"Kuanyama","Kurdish":"Kurde","Lao":"Lao","Latvian":"Letton","Limburgan":"Limbourgeois","Lingala":"Lingala","Lithuanian":"Lituanien","Luxembourgish":"Luxembourgeois","Luba-Katanga":"Luba-katanga","Ganda":"Ganda","Marshallese":"Marshall","Malayalam":"Malayalam","Marathi":"Marathe","Macedonian":"Macédonien","Malagasy":"Malgache","Maltese":"Maltais","Mongolian":"Mongol","Maori":"Maori","Malay (macrolanguage)":"Malais","Burmese":"Birman","Nauru":"Nauruan","Navajo":"Navaho","South Ndebele":"Ndébélé du Sud","North Ndebele":"Ndébélé du Nord","Ndonga":"Ndonga","Nepali (macrolanguage)":"Népalais","Dutch":"Néerlandais","Norwegian Nynorsk":"Norvégien nynorsk","Norwegian Bokmål":"Norvégien bokmål","Norwegian":"Norvégien","Nyanja":"Chichewa","Occitan":"Occitane","Ojibwa":"Ojibwa","Oriya (macrolanguage)":"Oriya","Oromo":"Galla","Ossetian":"Ossète","Panjabi":"Pendjabi","Pakistan Sign Language":"Langue des signes pakistanaise","Polish":"Polonais","Portuguese":"Portugais","Pushto":"Pachto","Quechua":"Quechua","Romansh":"Romanche","Romanian":"Roumain","Russian Sign Language":"Langue des signes russe","Rundi":"Rundi","Russian":"Russe","Sango":"Sango","Saudi Arabian Sign Language":"Langue des signes saoudienne","South African Sign Language":"Langue des signes sud-africaine","Sinhala":"Singhalais","Slovak":"Slovaque","Slovenian":"Slovène","Northern Sami":"Sami du Nord","Samoan":"Samoan","Shona":"Shona","Sindhi":"Sindhi","Somali":"Somali","Southern Sotho":"Sotho du Sud","Spanish":"Espagnol","Albanian":"Albanais","Sardinian":"Sarde","Serbian":"Serbe","Swati":"Swati","Sundanese":"Soundanais","Swahili (macrolanguage)":"Swahili","Swedish":"Suédois","Swedish Sign Language":"Langue des signes suédoise","Tahitian":"Tahitien","Tamil":"Tamoul","Tatar":"Tatar","Telugu":"Télougou","Tajik":"Tadjik","Tagalog":"Tagalog","Thai":"Thaï","Tigrinya":"Tigrigna","Klingon":"Klingon","Tonga (Tonga Islands)":"Tongan (Îles Tonga)","Tswana":"Tswana","Tsonga":"Tsonga","Turkmen":"Turkmène","Turkish":"Turc","Twi":"Twi","Uighur":"Ouïgour","Ukrainian":"Ukrainien","Urdu":"Ourdou","Uzbek":"Ouszbek","Venda":"Venda","Vietnamese":"Vietnamien","Walloon":"Wallon","Wolof":"Wolof","Xhosa":"Xhosa","Yiddish":"Yiddish","Yoruba":"Yoruba","Zhuang":"Zhuang","Chinese":"Chinois","Zulu":"Zoulou"} \ No newline at end of file +{"Music":"Musiques","Films":"Films","Vehicles":"Transport","Art":"Art","Sports":"Sports","Travels":"Voyages","Gaming":"Jeux vidéos","People":"Personnalités","Comedy":"Humour","Entertainment":"Divertissement","News & Politics":"Actualité & Politique","How To":"Tutoriels","Education":"Éducation","Activism":"Militantisme","Science & Technology":"Science & Technologie","Animals":"Animaux","Kids":"Enfants","Food":"Cuisine","Attribution":"Attribution","Attribution - Share Alike":"Attribution - Partage dans les mêmes conditions","Attribution - No Derivatives":"Attribution - Pas d’œuvre dérivée","Attribution - Non Commercial":"Attribution - Utilisation non commerciale","Attribution - Non Commercial - Share Alike":"Attribution - Utilisation non commerciale - Partage dans les mêmes conditions","Attribution - Non Commercial - No Derivatives":"Attribution - Utilisation non commerciale - Pas d’œuvre dérivée","Public Domain Dedication":"Domaine public","Public":"Publique","Unlisted":"Non listée","Private":"Privée","Published":"Publiée","To transcode":"À transcoder","To import":"À importer","Pending":"En cours","Success":"Succès","Failed":"Échoué","This video does not exist.":"Cette vidéo n'existe pas.","We cannot fetch the video. Please try again later.":"Nous ne pouvons pas récupérer la vidéo. Merci de réessayer plus tard.","Sorry":"Désolé","This video is not available because the remote instance is not responding.":"Cette vidéo n'est pas disponible car l'instance distante ne répond pas.","Misc":"Divers","Unknown":"Inconnu","Afar":"Afar","Abkhazian":"Abkhaze","Afrikaans":"Afrikaans","Akan":"Akan","Amharic":"Amharique","Arabic":"Arabe","Aragonese":"Aragonais","American Sign Language":"Langue des signes américaine","Assamese":"Assamais","Avaric":"Avar","Kotava":"Kotava","Aymara":"Aymara","Azerbaijani":"Azéri","Bashkir":"Bachkir","Bambara":"Bambara","Belarusian":"Biélorusse","Bengali":"Bengali","British Sign Language":"Langue des signes britannique","Bislama":"Bichlamar","Tibetan":"Tibétain","Bosnian":"Bosniaque","Breton":"Breton","Bulgarian":"Bulgare","Brazilian Sign Language":"Langue des signes brésilienne","Catalan":"Catalan","Czech":"Tchèque","Chamorro":"Chamorro","Chechen":"Tchétchène","Chuvash":"Tchouvache","Cornish":"Cornique","Corsican":"Corse","Cree":"Cree","Czech Sign Language":"Langue des signes tchèque","Chinese Sign Language":"Langue des signes chinoise","Welsh":"Gallois","Danish":"Danois","German":"Allemand","Dhivehi":"Maldivien","Danish Sign Language":"Langue des signes danoise","Dzongkha":"Dzongkha","Modern Greek (1453-)":"Grec moderne (après 1453)","English":"Anglais","Esperanto":"Espéranto","Estonian":"Estonien","Basque":"Basque","Ewe":"Éwé","Faroese":"Féroïen","Persian":"Persan","Fijian":"Fidjien","Finnish":"Finnois","French":"Français","Western Frisian":"Frison occidental","French Sign Language":"Langue des signes française","Fulah":"Peul","Scottish Gaelic":"Gaélique","Irish":"Irlandais","Galician":"Galicien","Manx":"Manx","Guarani":"Guarani","German Sign Language":"Langue des signes allemande","Gujarati":"Goudjrati","Haitian":"Haïtien","Hausa":"Haoussa","Serbo-Croatian":"Serbo-croate","Hebrew":"Hébreu","Herero":"Herero","Hindi":"Hindi","Hiri Motu":"Hiri motu","Croatian":"Croate","Hungarian":"Hongrois","Armenian":"Arménien","Igbo":"Igbo","Sichuan Yi":"Yi de Sichuan","Inuktitut":"Inuktitut","Indonesian":"Indonésien","Inupiaq":"Inupiaq","Icelandic":"Islandais","Italian":"Italien","Javanese":"Javanais","Lojban":"Lojban","Japanese":"Japonais","Japanese Sign Language":"Langue des signes japonaise","Kalaallisut":"Groenlandais","Kannada":"Kannada","Kashmiri":"Kashmiri","Georgian":"Géorgien","Kanuri":"Kanouri","Kazakh":"Kazakh","Khmer":"Khmer central","Kikuyu":"Kikuyu","Kinyarwanda":"Rwanda","Kirghiz":"Kirghiz","Komi":"Kom","Kongo":"Kongo","Korean":"Coréen","Kuanyama":"Kuanyama","Kurdish":"Kurde","Lao":"Lao","Latvian":"Letton","Limburgan":"Limbourgeois","Lingala":"Lingala","Lithuanian":"Lituanien","Luxembourgish":"Luxembourgeois","Luba-Katanga":"Luba-katanga","Ganda":"Ganda","Marshallese":"Marshall","Malayalam":"Malayalam","Marathi":"Marathe","Macedonian":"Macédonien","Malagasy":"Malgache","Maltese":"Maltais","Mongolian":"Mongol","Maori":"Maori","Malay (macrolanguage)":"Malais","Burmese":"Birman","Nauru":"Nauruan","Navajo":"Navaho","South Ndebele":"Ndébélé du Sud","North Ndebele":"Ndébélé du Nord","Ndonga":"Ndonga","Nepali (macrolanguage)":"Népalais","Dutch":"Néerlandais","Norwegian Nynorsk":"Norvégien nynorsk","Norwegian Bokmål":"Norvégien bokmål","Norwegian":"Norvégien","Nyanja":"Chichewa","Occitan":"Occitane","Ojibwa":"Ojibwa","Oriya (macrolanguage)":"Oriya","Oromo":"Galla","Ossetian":"Ossète","Panjabi":"Pendjabi","Pakistan Sign Language":"Langue des signes pakistanaise","Polish":"Polonais","Portuguese":"Portugais","Pushto":"Pachto","Quechua":"Quechua","Romansh":"Romanche","Romanian":"Roumain","Russian Sign Language":"Langue des signes russe","Rundi":"Rundi","Russian":"Russe","Sango":"Sango","Saudi Arabian Sign Language":"Langue des signes saoudienne","South African Sign Language":"Langue des signes sud-africaine","Sinhala":"Singhalais","Slovak":"Slovaque","Slovenian":"Slovène","Northern Sami":"Sami du Nord","Samoan":"Samoan","Shona":"Shona","Sindhi":"Sindhi","Somali":"Somali","Southern Sotho":"Sotho du Sud","Spanish":"Espagnol","Albanian":"Albanais","Sardinian":"Sarde","Serbian":"Serbe","Swati":"Swati","Sundanese":"Soundanais","Swahili (macrolanguage)":"Swahili","Swedish":"Suédois","Swedish Sign Language":"Langue des signes suédoise","Tahitian":"Tahitien","Tamil":"Tamoul","Tatar":"Tatar","Telugu":"Télougou","Tajik":"Tadjik","Tagalog":"Tagalog","Thai":"Thaï","Tigrinya":"Tigrigna","Klingon":"Klingon","Tonga (Tonga Islands)":"Tongan (Îles Tonga)","Tswana":"Tswana","Tsonga":"Tsonga","Turkmen":"Turkmène","Turkish":"Turc","Twi":"Twi","Uighur":"Ouïgour","Ukrainian":"Ukrainien","Urdu":"Ourdou","Uzbek":"Ouszbek","Venda":"Venda","Vietnamese":"Vietnamien","Walloon":"Wallon","Wolof":"Wolof","Xhosa":"Xhosa","Yiddish":"Yiddish","Yoruba":"Yoruba","Zhuang":"Zhuang","Chinese":"Chinois","Zulu":"Zoulou"} \ No newline at end of file diff --git a/client/src/locale/target/server_nl_NL.xml b/client/src/locale/target/server_nl_NL.xml index 797d022c5..a53a90588 100644 --- a/client/src/locale/target/server_nl_NL.xml +++ b/client/src/locale/target/server_nl_NL.xml @@ -43,6 +43,10 @@ Entertainment Entertainment + + News & Politics + Nieuws en Politiek + How To Tutorials @@ -57,7 +61,7 @@ Science & Technology - Wetenschap & technologie + Wetenschap en technologie Animals @@ -77,7 +81,7 @@ Attribution - Share Alike - Naamsvermelding – Gelijk Delen + Naamsvermelding – Gelijken Delen Attribution - No Derivatives @@ -111,9 +115,33 @@ Private Privé + + Published + Gepubliceerd + + + To transcode + Transcoden + + + To import + Importeren + + + Pending + In behandeling + + + Success + Success + + + Failed + Gefaald + Misc - Diverse + Varia Unknown diff --git a/client/src/standalone/videos/embed.html b/client/src/standalone/videos/embed.html index b7cf13ec2..f79cf68df 100644 --- a/client/src/standalone/videos/embed.html +++ b/client/src/standalone/videos/embed.html @@ -13,7 +13,7 @@
-

Sorry

+

diff --git a/client/src/standalone/videos/embed.ts b/client/src/standalone/videos/embed.ts index 3a09f285e..54b8fb543 100644 --- a/client/src/standalone/videos/embed.ts +++ b/client/src/standalone/videos/embed.ts @@ -192,27 +192,33 @@ class PeerTubeEmbed { element.parentElement.removeChild(element) } - displayError (text: string) { + displayError (text: string, translations?: { [ id: string ]: string }) { // Remove video element if (this.videoElement) this.removeElement(this.videoElement) - document.title = 'Sorry - ' + text + const translatedText = peertubeTranslate(text, translations) + const translatedSorry = peertubeTranslate('Sorry', translations) + + document.title = translatedSorry + ' - ' + translatedText const errorBlock = document.getElementById('error-block') errorBlock.style.display = 'flex' + const errorTitle = document.getElementById('error-title') + errorTitle.innerHTML = peertubeTranslate('Sorry', translations) + const errorText = document.getElementById('error-content') - errorText.innerHTML = text + errorText.innerHTML = translatedText } - videoNotFound () { + videoNotFound (translations?: { [ id: string ]: string }) { const text = 'This video does not exist.' - this.displayError(text) + this.displayError(text, translations) } - videoFetchError () { + videoFetchError (translations?: { [ id: string ]: string }) { const text = 'We cannot fetch the video. Please try again later.' - this.displayError(text) + this.displayError(text, translations) } getParamToggle (params: URLSearchParams, name: string, defaultValue?: boolean) { @@ -268,9 +274,9 @@ class PeerTubeEmbed { ]) if (!videoResponse.ok) { - if (videoResponse.status === 404) return this.videoNotFound() + if (videoResponse.status === 404) return this.videoNotFound(serverTranslations) - return this.videoFetchError() + return this.videoFetchError(serverTranslations) } const videoInfo: VideoDetails = await videoResponse.json() @@ -308,7 +314,7 @@ class PeerTubeEmbed { this.playerOptions = videojsOptions this.player = vjs(this.videoContainerId, videojsOptions, () => { - this.player.on('customError', (event: any, data: any) => this.handleError(data.err)) + this.player.on('customError', (event: any, data: any) => this.handleError(data.err, serverTranslations)) window[ 'videojsPlayer' ] = this.player @@ -325,11 +331,11 @@ class PeerTubeEmbed { }) } - private handleError (err: Error) { + private handleError (err: Error, translations?: { [ id: string ]: string }) { if (err.message.indexOf('from xs param') !== -1) { this.player.dispose() this.videoElement = null - this.displayError('This video is not available because the remote instance is not responding.') + this.displayError('This video is not available because the remote instance is not responding.', translations) return } } diff --git a/scripts/i18n/create-custom-files.ts b/scripts/i18n/create-custom-files.ts index eed3182a6..ab28f94c8 100755 --- a/scripts/i18n/create-custom-files.ts +++ b/scripts/i18n/create-custom-files.ts @@ -42,6 +42,12 @@ values(VIDEO_CATEGORIES) .concat(values(VIDEO_PRIVACIES)) .concat(values(VIDEO_STATES)) .concat(values(VIDEO_IMPORT_STATES)) + .concat([ + 'This video does not exist.', + 'We cannot fetch the video. Please try again later.', + 'Sorry', + 'This video is not available because the remote instance is not responding.' + ]) .forEach(v => serverKeys[v] = v) // More keys @@ -103,4 +109,4 @@ function saveToXliffFile (jsonTranslations: TranslationType, cb: Function) { function handleError (err: any) { console.error(err) process.exit(-1) -} \ No newline at end of file +} From 3195cd1c118f5e020ab7e635d5a3dcdad2108b1a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 15 Jan 2019 09:25:26 +0100 Subject: [PATCH 111/137] Fix notification z-index on modals --- .../video-abuse-list/moderation-comment-modal.component.html | 4 ++-- client/src/sass/primeng-custom.scss | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html index 3a8424f68..952235c55 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html +++ b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html @@ -14,7 +14,7 @@
-
+
This comment can only be seen by you or the other moderators.
@@ -29,4 +29,4 @@
- \ No newline at end of file + diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 58a6a0004..6057b1db0 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -301,6 +301,11 @@ p-inputswitch { } p-toast { + .ui-toast { + // Modal is 10005 + z-index: 10010 !important; + } + .ui-toast-message { font-family: $main-fonts; From 44b9c0ba31c4a97e3d874f33226ad935c3a90dd5 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 15 Jan 2019 09:45:54 +0100 Subject: [PATCH 112/137] Add totalLocalVideoFilesSize in stats --- server/controllers/api/server/stats.ts | 7 +++++-- server/models/redundancy/video-redundancy.ts | 2 +- server/models/video/video-file.ts | 20 ++++++++++++++++++++ server/tests/api/server/stats.ts | 3 ++- shared/models/server/server-stats.model.ts | 1 + 5 files changed, 29 insertions(+), 4 deletions(-) diff --git a/server/controllers/api/server/stats.ts b/server/controllers/api/server/stats.ts index 85803f69e..89ffd1717 100644 --- a/server/controllers/api/server/stats.ts +++ b/server/controllers/api/server/stats.ts @@ -8,6 +8,7 @@ import { VideoCommentModel } from '../../../models/video/video-comment' import { VideoRedundancyModel } from '../../../models/redundancy/video-redundancy' import { CONFIG, ROUTE_CACHE_LIFETIME } from '../../../initializers/constants' import { cacheRoute } from '../../../middlewares/cache' +import { VideoFileModel } from '../../../models/video/video-file' const statsRouter = express.Router() @@ -16,11 +17,12 @@ statsRouter.get('/stats', asyncMiddleware(getStats) ) -async function getStats (req: express.Request, res: express.Response, next: express.NextFunction) { +async function getStats (req: express.Request, res: express.Response) { const { totalLocalVideos, totalLocalVideoViews, totalVideos } = await VideoModel.getStats() const { totalLocalVideoComments, totalVideoComments } = await VideoCommentModel.getStats() const { totalUsers } = await UserModel.getStats() const { totalInstanceFollowers, totalInstanceFollowing } = await ActorFollowModel.getStats() + const { totalLocalVideoFilesSize } = await VideoFileModel.getStats() const videosRedundancyStats = await Promise.all( CONFIG.REDUNDANCY.VIDEOS.STRATEGIES.map(r => { @@ -32,8 +34,9 @@ async function getStats (req: express.Request, res: express.Response, next: expr const data: ServerStats = { totalLocalVideos, totalLocalVideoViews, - totalVideos, + totalLocalVideoFilesSize, totalLocalVideoComments, + totalVideos, totalVideoComments, totalUsers, totalInstanceFollowers, diff --git a/server/models/redundancy/video-redundancy.ts b/server/models/redundancy/video-redundancy.ts index 8b6cd146a..8f2ef2d9a 100644 --- a/server/models/redundancy/video-redundancy.ts +++ b/server/models/redundancy/video-redundancy.ts @@ -395,7 +395,7 @@ export class VideoRedundancyModel extends Model { ] } - return VideoRedundancyModel.find(query as any) // FIXME: typings + return VideoRedundancyModel.findOne(query as any) // FIXME: typings .then((r: any) => ({ totalUsed: parseInt(r.totalUsed.toString(), 10), totalVideos: r.totalVideos, diff --git a/server/models/video/video-file.ts b/server/models/video/video-file.ts index 0fd868cd6..1f1b76c1e 100644 --- a/server/models/video/video-file.ts +++ b/server/models/video/video-file.ts @@ -120,6 +120,26 @@ export class VideoFileModel extends Model { return VideoFileModel.findById(id, options) } + static async getStats () { + let totalLocalVideoFilesSize = await VideoFileModel.sum('size', { + include: [ + { + attributes: [], + model: VideoModel.unscoped(), + where: { + remote: false + } + } + ] + } as any) + // Sequelize could return null... + if (!totalLocalVideoFilesSize) totalLocalVideoFilesSize = 0 + + return { + totalLocalVideoFilesSize + } + } + hasSameUniqueKeysThan (other: VideoFileModel) { return this.fps === other.fps && this.resolution === other.resolution && diff --git a/server/tests/api/server/stats.ts b/server/tests/api/server/stats.ts index 517b4e542..9858e2b15 100644 --- a/server/tests/api/server/stats.ts +++ b/server/tests/api/server/stats.ts @@ -39,7 +39,7 @@ describe('Test stats (excluding redundancy)', function () { } await createUser(servers[0].url, servers[0].accessToken, user.username, user.password) - const resVideo = await uploadVideo(servers[0].url, servers[0].accessToken, {}) + const resVideo = await uploadVideo(servers[0].url, servers[0].accessToken, { fixture: 'video_short.webm' }) const videoUUID = resVideo.body.video.uuid await addVideoCommentThread(servers[0].url, servers[0].accessToken, videoUUID, 'comment') @@ -60,6 +60,7 @@ describe('Test stats (excluding redundancy)', function () { expect(data.totalLocalVideoComments).to.equal(1) expect(data.totalLocalVideos).to.equal(1) expect(data.totalLocalVideoViews).to.equal(1) + expect(data.totalLocalVideoFilesSize).to.equal(218910) expect(data.totalUsers).to.equal(2) expect(data.totalVideoComments).to.equal(1) expect(data.totalVideos).to.equal(1) diff --git a/shared/models/server/server-stats.model.ts b/shared/models/server/server-stats.model.ts index a6bd2d4d3..74f3de5d3 100644 --- a/shared/models/server/server-stats.model.ts +++ b/shared/models/server/server-stats.model.ts @@ -5,6 +5,7 @@ export interface ServerStats { totalLocalVideos: number totalLocalVideoViews: number totalLocalVideoComments: number + totalLocalVideoFilesSize: number totalVideos: number totalVideoComments: number From 848f499def54db2dd36437ef0dfb74dd5041c23b Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 15 Jan 2019 11:14:12 +0100 Subject: [PATCH 113/137] Prepare Dislike/Flag/View fixes For now we Create these activities, but we should just send them directly. This fix handles correctly direct Dislikes/Flags/Views, we'll implement the sending correctly these activities in the next peertube version --- server/helpers/activitypub.ts | 4 +- .../custom-validators/activitypub/activity.ts | 99 ++-- .../custom-validators/activitypub/actor.ts | 25 +- .../custom-validators/activitypub/announce.ts | 13 - .../activitypub/cache-file.ts | 16 +- .../custom-validators/activitypub/flag.ts | 14 + .../custom-validators/activitypub/misc.ts | 24 +- .../custom-validators/activitypub/rate.ts | 15 +- .../custom-validators/activitypub/undo.ts | 20 - .../activitypub/video-comments.ts | 11 - .../custom-validators/activitypub/videos.ts | 19 - .../custom-validators/activitypub/view.ts | 10 +- server/lib/activitypub/actor.ts | 4 +- .../lib/activitypub/process/process-accept.ts | 1 - .../lib/activitypub/process/process-create.ts | 118 +---- .../activitypub/process/process-dislike.ts | 52 ++ .../lib/activitypub/process/process-flag.ts | 49 ++ .../lib/activitypub/process/process-follow.ts | 3 +- .../lib/activitypub/process/process-like.ts | 3 +- .../lib/activitypub/process/process-undo.ts | 8 +- .../lib/activitypub/process/process-view.ts | 35 ++ server/lib/activitypub/process/process.ts | 12 +- server/lib/activitypub/share.ts | 4 +- server/lib/activitypub/video-rates.ts | 4 +- server/lib/activitypub/videos.ts | 6 +- server/tests/api/check-params/contact-form.ts | 4 + server/tests/api/server/redundancy.ts | 479 ------------------ server/tests/api/server/stats.ts | 1 + shared/models/activitypub/activity.ts | 31 +- .../activitypub/objects/object.model.ts | 1 + 30 files changed, 330 insertions(+), 755 deletions(-) delete mode 100644 server/helpers/custom-validators/activitypub/announce.ts create mode 100644 server/helpers/custom-validators/activitypub/flag.ts delete mode 100644 server/helpers/custom-validators/activitypub/undo.ts create mode 100644 server/lib/activitypub/process/process-dislike.ts create mode 100644 server/lib/activitypub/process/process-flag.ts create mode 100644 server/lib/activitypub/process/process-view.ts delete mode 100644 server/tests/api/server/redundancy.ts create mode 100644 shared/models/activitypub/objects/object.model.ts diff --git a/server/helpers/activitypub.ts b/server/helpers/activitypub.ts index 79b76fa0b..f1430055f 100644 --- a/server/helpers/activitypub.ts +++ b/server/helpers/activitypub.ts @@ -106,7 +106,7 @@ function buildSignedActivity (byActor: ActorModel, data: Object) { return signJsonLDObject(byActor, activity) as Promise } -function getAPUrl (activity: string | { id: string }) { +function getAPId (activity: string | { id: string }) { if (typeof activity === 'string') return activity return activity.id @@ -123,7 +123,7 @@ function checkUrlsSameHost (url1: string, url2: string) { export { checkUrlsSameHost, - getAPUrl, + getAPId, activityPubContextify, activityPubCollectionPagination, buildSignedActivity diff --git a/server/helpers/custom-validators/activitypub/activity.ts b/server/helpers/custom-validators/activitypub/activity.ts index 2562ead9b..b24590d9d 100644 --- a/server/helpers/custom-validators/activitypub/activity.ts +++ b/server/helpers/custom-validators/activitypub/activity.ts @@ -1,26 +1,14 @@ import * as validator from 'validator' import { Activity, ActivityType } from '../../../../shared/models/activitypub' -import { - isActorAcceptActivityValid, - isActorDeleteActivityValid, - isActorFollowActivityValid, - isActorRejectActivityValid, - isActorUpdateActivityValid -} from './actor' -import { isAnnounceActivityValid } from './announce' -import { isActivityPubUrlValid } from './misc' -import { isDislikeActivityValid, isLikeActivityValid } from './rate' -import { isUndoActivityValid } from './undo' -import { isVideoCommentCreateActivityValid, isVideoCommentDeleteActivityValid } from './video-comments' -import { - isVideoFlagValid, - isVideoTorrentDeleteActivityValid, - sanitizeAndCheckVideoTorrentCreateActivity, - sanitizeAndCheckVideoTorrentUpdateActivity -} from './videos' +import { sanitizeAndCheckActorObject } from './actor' +import { isActivityPubUrlValid, isBaseActivityValid, isObjectValid } from './misc' +import { isDislikeActivityValid } from './rate' +import { sanitizeAndCheckVideoCommentObject } from './video-comments' +import { sanitizeAndCheckVideoTorrentObject } from './videos' import { isViewActivityValid } from './view' import { exists } from '../misc' -import { isCacheFileCreateActivityValid, isCacheFileUpdateActivityValid } from './cache-file' +import { isCacheFileObjectValid } from './cache-file' +import { isFlagActivityValid } from './flag' function isRootActivityValid (activity: any) { return Array.isArray(activity['@context']) && ( @@ -46,7 +34,10 @@ const activityCheckers: { [ P in ActivityType ]: (activity: Activity) => boolean Reject: checkRejectActivity, Announce: checkAnnounceActivity, Undo: checkUndoActivity, - Like: checkLikeActivity + Like: checkLikeActivity, + View: checkViewActivity, + Flag: checkFlagActivity, + Dislike: checkDislikeActivity } function isActivityValid (activity: any) { @@ -66,47 +57,79 @@ export { // --------------------------------------------------------------------------- +function checkViewActivity (activity: any) { + return isBaseActivityValid(activity, 'View') && + isViewActivityValid(activity) +} + +function checkFlagActivity (activity: any) { + return isBaseActivityValid(activity, 'Flag') && + isFlagActivityValid(activity) +} + +function checkDislikeActivity (activity: any) { + return isBaseActivityValid(activity, 'Dislike') && + isDislikeActivityValid(activity) +} + function checkCreateActivity (activity: any) { - return isViewActivityValid(activity) || - isDislikeActivityValid(activity) || - sanitizeAndCheckVideoTorrentCreateActivity(activity) || - isVideoFlagValid(activity) || - isVideoCommentCreateActivityValid(activity) || - isCacheFileCreateActivityValid(activity) + return isBaseActivityValid(activity, 'Create') && + ( + isViewActivityValid(activity.object) || + isDislikeActivityValid(activity.object) || + isFlagActivityValid(activity.object) || + + isCacheFileObjectValid(activity.object) || + sanitizeAndCheckVideoCommentObject(activity.object) || + sanitizeAndCheckVideoTorrentObject(activity.object) + ) } function checkUpdateActivity (activity: any) { - return isCacheFileUpdateActivityValid(activity) || - sanitizeAndCheckVideoTorrentUpdateActivity(activity) || - isActorUpdateActivityValid(activity) + return isBaseActivityValid(activity, 'Update') && + ( + isCacheFileObjectValid(activity.object) || + sanitizeAndCheckVideoTorrentObject(activity.object) || + sanitizeAndCheckActorObject(activity.object) + ) } function checkDeleteActivity (activity: any) { - return isVideoTorrentDeleteActivityValid(activity) || - isActorDeleteActivityValid(activity) || - isVideoCommentDeleteActivityValid(activity) + // We don't really check objects + return isBaseActivityValid(activity, 'Delete') && + isObjectValid(activity.object) } function checkFollowActivity (activity: any) { - return isActorFollowActivityValid(activity) + return isBaseActivityValid(activity, 'Follow') && + isObjectValid(activity.object) } function checkAcceptActivity (activity: any) { - return isActorAcceptActivityValid(activity) + return isBaseActivityValid(activity, 'Accept') } function checkRejectActivity (activity: any) { - return isActorRejectActivityValid(activity) + return isBaseActivityValid(activity, 'Reject') } function checkAnnounceActivity (activity: any) { - return isAnnounceActivityValid(activity) + return isBaseActivityValid(activity, 'Announce') && + isObjectValid(activity.object) } function checkUndoActivity (activity: any) { - return isUndoActivityValid(activity) + return isBaseActivityValid(activity, 'Undo') && + ( + checkFollowActivity(activity.object) || + checkLikeActivity(activity.object) || + checkDislikeActivity(activity.object) || + checkAnnounceActivity(activity.object) || + checkCreateActivity(activity.object) + ) } function checkLikeActivity (activity: any) { - return isLikeActivityValid(activity) + return isBaseActivityValid(activity, 'Like') && + isObjectValid(activity.object) } diff --git a/server/helpers/custom-validators/activitypub/actor.ts b/server/helpers/custom-validators/activitypub/actor.ts index 070632a20..c05f60f14 100644 --- a/server/helpers/custom-validators/activitypub/actor.ts +++ b/server/helpers/custom-validators/activitypub/actor.ts @@ -73,24 +73,10 @@ function isActorDeleteActivityValid (activity: any) { return isBaseActivityValid(activity, 'Delete') } -function isActorFollowActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Follow') && - isActivityPubUrlValid(activity.object) -} +function sanitizeAndCheckActorObject (object: any) { + normalizeActor(object) -function isActorAcceptActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Accept') -} - -function isActorRejectActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Reject') -} - -function isActorUpdateActivityValid (activity: any) { - normalizeActor(activity.object) - - return isBaseActivityValid(activity, 'Update') && - isActorObjectValid(activity.object) + return isActorObjectValid(object) } function normalizeActor (actor: any) { @@ -139,10 +125,7 @@ export { isActorObjectValid, isActorFollowingCountValid, isActorFollowersCountValid, - isActorFollowActivityValid, - isActorAcceptActivityValid, - isActorRejectActivityValid, isActorDeleteActivityValid, - isActorUpdateActivityValid, + sanitizeAndCheckActorObject, isValidActorHandle } diff --git a/server/helpers/custom-validators/activitypub/announce.ts b/server/helpers/custom-validators/activitypub/announce.ts deleted file mode 100644 index 0519c6026..000000000 --- a/server/helpers/custom-validators/activitypub/announce.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { isActivityPubUrlValid, isBaseActivityValid } from './misc' - -function isAnnounceActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Announce') && - ( - isActivityPubUrlValid(activity.object) || - (activity.object && isActivityPubUrlValid(activity.object.id)) - ) -} - -export { - isAnnounceActivityValid -} diff --git a/server/helpers/custom-validators/activitypub/cache-file.ts b/server/helpers/custom-validators/activitypub/cache-file.ts index bd70934c8..e2bd0c55e 100644 --- a/server/helpers/custom-validators/activitypub/cache-file.ts +++ b/server/helpers/custom-validators/activitypub/cache-file.ts @@ -1,18 +1,8 @@ -import { isActivityPubUrlValid, isBaseActivityValid } from './misc' +import { isActivityPubUrlValid } from './misc' import { isRemoteVideoUrlValid } from './videos' -import { isDateValid, exists } from '../misc' +import { exists, isDateValid } from '../misc' import { CacheFileObject } from '../../../../shared/models/activitypub/objects' -function isCacheFileCreateActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Create') && - isCacheFileObjectValid(activity.object) -} - -function isCacheFileUpdateActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Update') && - isCacheFileObjectValid(activity.object) -} - function isCacheFileObjectValid (object: CacheFileObject) { return exists(object) && object.type === 'CacheFile' && @@ -22,7 +12,5 @@ function isCacheFileObjectValid (object: CacheFileObject) { } export { - isCacheFileUpdateActivityValid, - isCacheFileCreateActivityValid, isCacheFileObjectValid } diff --git a/server/helpers/custom-validators/activitypub/flag.ts b/server/helpers/custom-validators/activitypub/flag.ts new file mode 100644 index 000000000..6452e297c --- /dev/null +++ b/server/helpers/custom-validators/activitypub/flag.ts @@ -0,0 +1,14 @@ +import { isActivityPubUrlValid } from './misc' +import { isVideoAbuseReasonValid } from '../video-abuses' + +function isFlagActivityValid (activity: any) { + return activity.type === 'Flag' && + isVideoAbuseReasonValid(activity.content) && + isActivityPubUrlValid(activity.object) +} + +// --------------------------------------------------------------------------- + +export { + isFlagActivityValid +} diff --git a/server/helpers/custom-validators/activitypub/misc.ts b/server/helpers/custom-validators/activitypub/misc.ts index 4e2c57f04..f1762d11c 100644 --- a/server/helpers/custom-validators/activitypub/misc.ts +++ b/server/helpers/custom-validators/activitypub/misc.ts @@ -28,15 +28,20 @@ function isBaseActivityValid (activity: any, type: string) { return (activity['@context'] === undefined || Array.isArray(activity['@context'])) && activity.type === type && isActivityPubUrlValid(activity.id) && - exists(activity.actor) && - (isActivityPubUrlValid(activity.actor) || isActivityPubUrlValid(activity.actor.id)) && + isObjectValid(activity.actor) && + isUrlCollectionValid(activity.to) && + isUrlCollectionValid(activity.cc) +} + +function isUrlCollectionValid (collection: any) { + return collection === undefined || + (Array.isArray(collection) && collection.every(t => isActivityPubUrlValid(t))) +} + +function isObjectValid (object: any) { + return exists(object) && ( - activity.to === undefined || - (Array.isArray(activity.to) && activity.to.every(t => isActivityPubUrlValid(t))) - ) && - ( - activity.cc === undefined || - (Array.isArray(activity.cc) && activity.cc.every(t => isActivityPubUrlValid(t))) + isActivityPubUrlValid(object) || isActivityPubUrlValid(object.id) ) } @@ -57,5 +62,6 @@ export { isUrlValid, isActivityPubUrlValid, isBaseActivityValid, - setValidAttributedTo + setValidAttributedTo, + isObjectValid } diff --git a/server/helpers/custom-validators/activitypub/rate.ts b/server/helpers/custom-validators/activitypub/rate.ts index e70bd94b8..ba68e8074 100644 --- a/server/helpers/custom-validators/activitypub/rate.ts +++ b/server/helpers/custom-validators/activitypub/rate.ts @@ -1,20 +1,13 @@ -import { isActivityPubUrlValid, isBaseActivityValid } from './misc' - -function isLikeActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Like') && - isActivityPubUrlValid(activity.object) -} +import { isActivityPubUrlValid, isObjectValid } from './misc' function isDislikeActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Create') && - activity.object.type === 'Dislike' && - isActivityPubUrlValid(activity.object.actor) && - isActivityPubUrlValid(activity.object.object) + return activity.type === 'Dislike' && + isActivityPubUrlValid(activity.actor) && + isObjectValid(activity.object) } // --------------------------------------------------------------------------- export { - isLikeActivityValid, isDislikeActivityValid } diff --git a/server/helpers/custom-validators/activitypub/undo.ts b/server/helpers/custom-validators/activitypub/undo.ts deleted file mode 100644 index 578035893..000000000 --- a/server/helpers/custom-validators/activitypub/undo.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { isActorFollowActivityValid } from './actor' -import { isBaseActivityValid } from './misc' -import { isDislikeActivityValid, isLikeActivityValid } from './rate' -import { isAnnounceActivityValid } from './announce' -import { isCacheFileCreateActivityValid } from './cache-file' - -function isUndoActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Undo') && - ( - isActorFollowActivityValid(activity.object) || - isLikeActivityValid(activity.object) || - isDislikeActivityValid(activity.object) || - isAnnounceActivityValid(activity.object) || - isCacheFileCreateActivityValid(activity.object) - ) -} - -export { - isUndoActivityValid -} diff --git a/server/helpers/custom-validators/activitypub/video-comments.ts b/server/helpers/custom-validators/activitypub/video-comments.ts index 051c4565a..0415db21c 100644 --- a/server/helpers/custom-validators/activitypub/video-comments.ts +++ b/server/helpers/custom-validators/activitypub/video-comments.ts @@ -3,11 +3,6 @@ import { ACTIVITY_PUB, CONSTRAINTS_FIELDS } from '../../../initializers' import { exists, isArray, isDateValid } from '../misc' import { isActivityPubUrlValid, isBaseActivityValid } from './misc' -function isVideoCommentCreateActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Create') && - sanitizeAndCheckVideoCommentObject(activity.object) -} - function sanitizeAndCheckVideoCommentObject (comment: any) { if (!comment || comment.type !== 'Note') return false @@ -25,15 +20,9 @@ function sanitizeAndCheckVideoCommentObject (comment: any) { ) // Only accept public comments } -function isVideoCommentDeleteActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Delete') -} - // --------------------------------------------------------------------------- export { - isVideoCommentCreateActivityValid, - isVideoCommentDeleteActivityValid, sanitizeAndCheckVideoCommentObject } diff --git a/server/helpers/custom-validators/activitypub/videos.ts b/server/helpers/custom-validators/activitypub/videos.ts index 95fe824b9..0f34aab21 100644 --- a/server/helpers/custom-validators/activitypub/videos.ts +++ b/server/helpers/custom-validators/activitypub/videos.ts @@ -14,27 +14,11 @@ import { isActivityPubUrlValid, isBaseActivityValid, setValidAttributedTo } from import { VideoState } from '../../../../shared/models/videos' import { isVideoAbuseReasonValid } from '../video-abuses' -function sanitizeAndCheckVideoTorrentCreateActivity (activity: any) { - return isBaseActivityValid(activity, 'Create') && - sanitizeAndCheckVideoTorrentObject(activity.object) -} - function sanitizeAndCheckVideoTorrentUpdateActivity (activity: any) { return isBaseActivityValid(activity, 'Update') && sanitizeAndCheckVideoTorrentObject(activity.object) } -function isVideoTorrentDeleteActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Delete') -} - -function isVideoFlagValid (activity: any) { - return isBaseActivityValid(activity, 'Create') && - activity.object.type === 'Flag' && - isVideoAbuseReasonValid(activity.object.content) && - isActivityPubUrlValid(activity.object.object) -} - function isActivityPubVideoDurationValid (value: string) { // https://www.w3.org/TR/activitystreams-vocabulary/#dfn-duration return exists(value) && @@ -103,11 +87,8 @@ function isRemoteVideoUrlValid (url: any) { // --------------------------------------------------------------------------- export { - sanitizeAndCheckVideoTorrentCreateActivity, sanitizeAndCheckVideoTorrentUpdateActivity, - isVideoTorrentDeleteActivityValid, isRemoteStringIdentifierValid, - isVideoFlagValid, sanitizeAndCheckVideoTorrentObject, isRemoteVideoUrlValid } diff --git a/server/helpers/custom-validators/activitypub/view.ts b/server/helpers/custom-validators/activitypub/view.ts index 7a3aca6f5..41d16469f 100644 --- a/server/helpers/custom-validators/activitypub/view.ts +++ b/server/helpers/custom-validators/activitypub/view.ts @@ -1,11 +1,11 @@ -import { isActivityPubUrlValid, isBaseActivityValid } from './misc' +import { isActivityPubUrlValid } from './misc' function isViewActivityValid (activity: any) { - return isBaseActivityValid(activity, 'Create') && - activity.object.type === 'View' && - isActivityPubUrlValid(activity.object.actor) && - isActivityPubUrlValid(activity.object.object) + return activity.type === 'View' && + isActivityPubUrlValid(activity.actor) && + isActivityPubUrlValid(activity.object) } + // --------------------------------------------------------------------------- export { diff --git a/server/lib/activitypub/actor.ts b/server/lib/activitypub/actor.ts index edf38bc0a..8215840da 100644 --- a/server/lib/activitypub/actor.ts +++ b/server/lib/activitypub/actor.ts @@ -4,7 +4,7 @@ import * as url from 'url' import * as uuidv4 from 'uuid/v4' import { ActivityPubActor, ActivityPubActorType } from '../../../shared/models/activitypub' import { ActivityPubAttributedTo } from '../../../shared/models/activitypub/objects' -import { checkUrlsSameHost, getAPUrl } from '../../helpers/activitypub' +import { checkUrlsSameHost, getAPId } from '../../helpers/activitypub' import { isActorObjectValid, normalizeActor } from '../../helpers/custom-validators/activitypub/actor' import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' import { retryTransactionWrapper, updateInstanceWithAnother } from '../../helpers/database-utils' @@ -42,7 +42,7 @@ async function getOrCreateActorAndServerAndModel ( recurseIfNeeded = true, updateCollections = false ) { - const actorUrl = getAPUrl(activityActor) + const actorUrl = getAPId(activityActor) let created = false let actor = await fetchActorByUrl(actorUrl, fetchType) diff --git a/server/lib/activitypub/process/process-accept.ts b/server/lib/activitypub/process/process-accept.ts index 605705ad3..ebb275e34 100644 --- a/server/lib/activitypub/process/process-accept.ts +++ b/server/lib/activitypub/process/process-accept.ts @@ -2,7 +2,6 @@ import { ActivityAccept } from '../../../../shared/models/activitypub' import { ActorModel } from '../../../models/activitypub/actor' import { ActorFollowModel } from '../../../models/activitypub/actor-follow' import { addFetchOutboxJob } from '../actor' -import { Notifier } from '../../notifier' async function processAcceptActivity (activity: ActivityAccept, targetActor: ActorModel, inboxActor?: ActorModel) { if (inboxActor === undefined) throw new Error('Need to accept on explicit inbox.') diff --git a/server/lib/activitypub/process/process-create.ts b/server/lib/activitypub/process/process-create.ts index 2e04ee843..5f4d793a5 100644 --- a/server/lib/activitypub/process/process-create.ts +++ b/server/lib/activitypub/process/process-create.ts @@ -1,36 +1,44 @@ -import { ActivityCreate, CacheFileObject, VideoAbuseState, VideoTorrentObject } from '../../../../shared' -import { DislikeObject, VideoAbuseObject, ViewObject } from '../../../../shared/models/activitypub/objects' +import { ActivityCreate, CacheFileObject, VideoTorrentObject } from '../../../../shared' import { VideoCommentObject } from '../../../../shared/models/activitypub/objects/video-comment-object' import { retryTransactionWrapper } from '../../../helpers/database-utils' import { logger } from '../../../helpers/logger' import { sequelizeTypescript } from '../../../initializers' -import { AccountVideoRateModel } from '../../../models/account/account-video-rate' import { ActorModel } from '../../../models/activitypub/actor' -import { VideoAbuseModel } from '../../../models/video/video-abuse' import { addVideoComment, resolveThread } from '../video-comments' import { getOrCreateVideoAndAccountAndChannel } from '../videos' import { forwardVideoRelatedActivity } from '../send/utils' -import { Redis } from '../../redis' import { createOrUpdateCacheFile } from '../cache-file' -import { getVideoDislikeActivityPubUrl } from '../url' import { Notifier } from '../../notifier' +import { processViewActivity } from './process-view' +import { processDislikeActivity } from './process-dislike' +import { processFlagActivity } from './process-flag' async function processCreateActivity (activity: ActivityCreate, byActor: ActorModel) { const activityObject = activity.object const activityType = activityObject.type if (activityType === 'View') { - return processCreateView(byActor, activity) - } else if (activityType === 'Dislike') { - return retryTransactionWrapper(processCreateDislike, byActor, activity) - } else if (activityType === 'Video') { + return processViewActivity(activity, byActor) + } + + if (activityType === 'Dislike') { + return retryTransactionWrapper(processDislikeActivity, activity, byActor) + } + + if (activityType === 'Flag') { + return retryTransactionWrapper(processFlagActivity, activity, byActor) + } + + if (activityType === 'Video') { return processCreateVideo(activity) - } else if (activityType === 'Flag') { - return retryTransactionWrapper(processCreateVideoAbuse, byActor, activityObject as VideoAbuseObject) - } else if (activityType === 'Note') { - return retryTransactionWrapper(processCreateVideoComment, byActor, activity) - } else if (activityType === 'CacheFile') { - return retryTransactionWrapper(processCacheFile, byActor, activity) + } + + if (activityType === 'Note') { + return retryTransactionWrapper(processCreateVideoComment, activity, byActor) + } + + if (activityType === 'CacheFile') { + return retryTransactionWrapper(processCacheFile, activity, byActor) } logger.warn('Unknown activity object type %s when creating activity.', activityType, { activity: activity.id }) @@ -55,56 +63,7 @@ async function processCreateVideo (activity: ActivityCreate) { return video } -async function processCreateDislike (byActor: ActorModel, activity: ActivityCreate) { - const dislike = activity.object as DislikeObject - const byAccount = byActor.Account - - if (!byAccount) throw new Error('Cannot create dislike with the non account actor ' + byActor.url) - - const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: dislike.object }) - - return sequelizeTypescript.transaction(async t => { - const rate = { - type: 'dislike' as 'dislike', - videoId: video.id, - accountId: byAccount.id - } - - const [ , created ] = await AccountVideoRateModel.findOrCreate({ - where: rate, - defaults: Object.assign({}, rate, { url: getVideoDislikeActivityPubUrl(byActor, video) }), - transaction: t - }) - if (created === true) await video.increment('dislikes', { transaction: t }) - - if (video.isOwned() && created === true) { - // Don't resend the activity to the sender - const exceptions = [ byActor ] - - await forwardVideoRelatedActivity(activity, t, exceptions, video) - } - }) -} - -async function processCreateView (byActor: ActorModel, activity: ActivityCreate) { - const view = activity.object as ViewObject - - const options = { - videoObject: view.object, - fetchType: 'only-video' as 'only-video' - } - const { video } = await getOrCreateVideoAndAccountAndChannel(options) - - await Redis.Instance.addVideoView(video.id) - - if (video.isOwned()) { - // Don't resend the activity to the sender - const exceptions = [ byActor ] - await forwardVideoRelatedActivity(activity, undefined, exceptions, video) - } -} - -async function processCacheFile (byActor: ActorModel, activity: ActivityCreate) { +async function processCacheFile (activity: ActivityCreate, byActor: ActorModel) { const cacheFile = activity.object as CacheFileObject const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: cacheFile.object }) @@ -120,32 +79,7 @@ async function processCacheFile (byActor: ActorModel, activity: ActivityCreate) } } -async function processCreateVideoAbuse (byActor: ActorModel, videoAbuseToCreateData: VideoAbuseObject) { - logger.debug('Reporting remote abuse for video %s.', videoAbuseToCreateData.object) - - const account = byActor.Account - if (!account) throw new Error('Cannot create dislike with the non account actor ' + byActor.url) - - const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: videoAbuseToCreateData.object }) - - return sequelizeTypescript.transaction(async t => { - const videoAbuseData = { - reporterAccountId: account.id, - reason: videoAbuseToCreateData.content, - videoId: video.id, - state: VideoAbuseState.PENDING - } - - const videoAbuseInstance = await VideoAbuseModel.create(videoAbuseData, { transaction: t }) - videoAbuseInstance.Video = video - - Notifier.Instance.notifyOnNewVideoAbuse(videoAbuseInstance) - - logger.info('Remote abuse for video uuid %s created', videoAbuseToCreateData.object) - }) -} - -async function processCreateVideoComment (byActor: ActorModel, activity: ActivityCreate) { +async function processCreateVideoComment (activity: ActivityCreate, byActor: ActorModel) { const commentObject = activity.object as VideoCommentObject const byAccount = byActor.Account diff --git a/server/lib/activitypub/process/process-dislike.ts b/server/lib/activitypub/process/process-dislike.ts new file mode 100644 index 000000000..bfd69e07a --- /dev/null +++ b/server/lib/activitypub/process/process-dislike.ts @@ -0,0 +1,52 @@ +import { ActivityCreate, ActivityDislike } from '../../../../shared' +import { DislikeObject } from '../../../../shared/models/activitypub/objects' +import { retryTransactionWrapper } from '../../../helpers/database-utils' +import { sequelizeTypescript } from '../../../initializers' +import { AccountVideoRateModel } from '../../../models/account/account-video-rate' +import { ActorModel } from '../../../models/activitypub/actor' +import { getOrCreateVideoAndAccountAndChannel } from '../videos' +import { forwardVideoRelatedActivity } from '../send/utils' +import { getVideoDislikeActivityPubUrl } from '../url' + +async function processDislikeActivity (activity: ActivityCreate | ActivityDislike, byActor: ActorModel) { + return retryTransactionWrapper(processDislike, activity, byActor) +} + +// --------------------------------------------------------------------------- + +export { + processDislikeActivity +} + +// --------------------------------------------------------------------------- + +async function processDislike (activity: ActivityCreate | ActivityDislike, byActor: ActorModel) { + const dislikeObject = activity.type === 'Dislike' ? activity.object : (activity.object as DislikeObject).object + const byAccount = byActor.Account + + if (!byAccount) throw new Error('Cannot create dislike with the non account actor ' + byActor.url) + + const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: dislikeObject }) + + return sequelizeTypescript.transaction(async t => { + const rate = { + type: 'dislike' as 'dislike', + videoId: video.id, + accountId: byAccount.id + } + + const [ , created ] = await AccountVideoRateModel.findOrCreate({ + where: rate, + defaults: Object.assign({}, rate, { url: getVideoDislikeActivityPubUrl(byActor, video) }), + transaction: t + }) + if (created === true) await video.increment('dislikes', { transaction: t }) + + if (video.isOwned() && created === true) { + // Don't resend the activity to the sender + const exceptions = [ byActor ] + + await forwardVideoRelatedActivity(activity, t, exceptions, video) + } + }) +} diff --git a/server/lib/activitypub/process/process-flag.ts b/server/lib/activitypub/process/process-flag.ts new file mode 100644 index 000000000..79ce6fb41 --- /dev/null +++ b/server/lib/activitypub/process/process-flag.ts @@ -0,0 +1,49 @@ +import { ActivityCreate, ActivityFlag, VideoAbuseState } from '../../../../shared' +import { VideoAbuseObject } from '../../../../shared/models/activitypub/objects' +import { retryTransactionWrapper } from '../../../helpers/database-utils' +import { logger } from '../../../helpers/logger' +import { sequelizeTypescript } from '../../../initializers' +import { ActorModel } from '../../../models/activitypub/actor' +import { VideoAbuseModel } from '../../../models/video/video-abuse' +import { getOrCreateVideoAndAccountAndChannel } from '../videos' +import { Notifier } from '../../notifier' +import { getAPId } from '../../../helpers/activitypub' + +async function processFlagActivity (activity: ActivityCreate | ActivityFlag, byActor: ActorModel) { + return retryTransactionWrapper(processCreateVideoAbuse, activity, byActor) +} + +// --------------------------------------------------------------------------- + +export { + processFlagActivity +} + +// --------------------------------------------------------------------------- + +async function processCreateVideoAbuse (activity: ActivityCreate | ActivityFlag, byActor: ActorModel) { + const flag = activity.type === 'Flag' ? activity : (activity.object as VideoAbuseObject) + + logger.debug('Reporting remote abuse for video %s.', getAPId(flag.object)) + + const account = byActor.Account + if (!account) throw new Error('Cannot create dislike with the non account actor ' + byActor.url) + + const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: flag.object }) + + return sequelizeTypescript.transaction(async t => { + const videoAbuseData = { + reporterAccountId: account.id, + reason: flag.content, + videoId: video.id, + state: VideoAbuseState.PENDING + } + + const videoAbuseInstance = await VideoAbuseModel.create(videoAbuseData, { transaction: t }) + videoAbuseInstance.Video = video + + Notifier.Instance.notifyOnNewVideoAbuse(videoAbuseInstance) + + logger.info('Remote abuse for video uuid %s created', flag.object) + }) +} diff --git a/server/lib/activitypub/process/process-follow.ts b/server/lib/activitypub/process/process-follow.ts index a67892440..0cd537187 100644 --- a/server/lib/activitypub/process/process-follow.ts +++ b/server/lib/activitypub/process/process-follow.ts @@ -6,9 +6,10 @@ import { ActorModel } from '../../../models/activitypub/actor' import { ActorFollowModel } from '../../../models/activitypub/actor-follow' import { sendAccept } from '../send' import { Notifier } from '../../notifier' +import { getAPId } from '../../../helpers/activitypub' async function processFollowActivity (activity: ActivityFollow, byActor: ActorModel) { - const activityObject = activity.object + const activityObject = getAPId(activity.object) return retryTransactionWrapper(processFollow, byActor, activityObject) } diff --git a/server/lib/activitypub/process/process-like.ts b/server/lib/activitypub/process/process-like.ts index e8e97eece..2a04167d7 100644 --- a/server/lib/activitypub/process/process-like.ts +++ b/server/lib/activitypub/process/process-like.ts @@ -6,6 +6,7 @@ import { ActorModel } from '../../../models/activitypub/actor' import { forwardVideoRelatedActivity } from '../send/utils' import { getOrCreateVideoAndAccountAndChannel } from '../videos' import { getVideoLikeActivityPubUrl } from '../url' +import { getAPId } from '../../../helpers/activitypub' async function processLikeActivity (activity: ActivityLike, byActor: ActorModel) { return retryTransactionWrapper(processLikeVideo, byActor, activity) @@ -20,7 +21,7 @@ export { // --------------------------------------------------------------------------- async function processLikeVideo (byActor: ActorModel, activity: ActivityLike) { - const videoUrl = activity.object + const videoUrl = getAPId(activity.object) const byAccount = byActor.Account if (!byAccount) throw new Error('Cannot create like with the non account actor ' + byActor.url) diff --git a/server/lib/activitypub/process/process-undo.ts b/server/lib/activitypub/process/process-undo.ts index 438a013b6..ed0177a67 100644 --- a/server/lib/activitypub/process/process-undo.ts +++ b/server/lib/activitypub/process/process-undo.ts @@ -26,6 +26,10 @@ async function processUndoActivity (activity: ActivityUndo, byActor: ActorModel) } } + if (activityToUndo.type === 'Dislike') { + return retryTransactionWrapper(processUndoDislike, byActor, activity) + } + if (activityToUndo.type === 'Follow') { return retryTransactionWrapper(processUndoFollow, byActor, activityToUndo) } @@ -72,7 +76,9 @@ async function processUndoLike (byActor: ActorModel, activity: ActivityUndo) { } async function processUndoDislike (byActor: ActorModel, activity: ActivityUndo) { - const dislike = activity.object.object as DislikeObject + const dislike = activity.object.type === 'Dislike' + ? activity.object + : activity.object.object as DislikeObject const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: dislike.object }) diff --git a/server/lib/activitypub/process/process-view.ts b/server/lib/activitypub/process/process-view.ts new file mode 100644 index 000000000..8f66d3630 --- /dev/null +++ b/server/lib/activitypub/process/process-view.ts @@ -0,0 +1,35 @@ +import { ActorModel } from '../../../models/activitypub/actor' +import { getOrCreateVideoAndAccountAndChannel } from '../videos' +import { forwardVideoRelatedActivity } from '../send/utils' +import { Redis } from '../../redis' +import { ActivityCreate, ActivityView, ViewObject } from '../../../../shared/models/activitypub' + +async function processViewActivity (activity: ActivityView | ActivityCreate, byActor: ActorModel) { + return processCreateView(activity, byActor) +} + +// --------------------------------------------------------------------------- + +export { + processViewActivity +} + +// --------------------------------------------------------------------------- + +async function processCreateView (activity: ActivityView | ActivityCreate, byActor: ActorModel) { + const videoObject = activity.type === 'View' ? activity.object : (activity.object as ViewObject).object + + const options = { + videoObject: videoObject, + fetchType: 'only-video' as 'only-video' + } + const { video } = await getOrCreateVideoAndAccountAndChannel(options) + + await Redis.Instance.addVideoView(video.id) + + if (video.isOwned()) { + // Don't resend the activity to the sender + const exceptions = [ byActor ] + await forwardVideoRelatedActivity(activity, undefined, exceptions, video) + } +} diff --git a/server/lib/activitypub/process/process.ts b/server/lib/activitypub/process/process.ts index 2479d5da2..9dd241402 100644 --- a/server/lib/activitypub/process/process.ts +++ b/server/lib/activitypub/process/process.ts @@ -1,5 +1,5 @@ import { Activity, ActivityType } from '../../../../shared/models/activitypub' -import { checkUrlsSameHost, getAPUrl } from '../../../helpers/activitypub' +import { checkUrlsSameHost, getAPId } from '../../../helpers/activitypub' import { logger } from '../../../helpers/logger' import { ActorModel } from '../../../models/activitypub/actor' import { processAcceptActivity } from './process-accept' @@ -12,6 +12,9 @@ import { processRejectActivity } from './process-reject' import { processUndoActivity } from './process-undo' import { processUpdateActivity } from './process-update' import { getOrCreateActorAndServerAndModel } from '../actor' +import { processDislikeActivity } from './process-dislike' +import { processFlagActivity } from './process-flag' +import { processViewActivity } from './process-view' const processActivity: { [ P in ActivityType ]: (activity: Activity, byActor: ActorModel, inboxActor?: ActorModel) => Promise } = { Create: processCreateActivity, @@ -22,7 +25,10 @@ const processActivity: { [ P in ActivityType ]: (activity: Activity, byActor: Ac Reject: processRejectActivity, Announce: processAnnounceActivity, Undo: processUndoActivity, - Like: processLikeActivity + Like: processLikeActivity, + Dislike: processDislikeActivity, + Flag: processFlagActivity, + View: processViewActivity } async function processActivities ( @@ -40,7 +46,7 @@ async function processActivities ( continue } - const actorUrl = getAPUrl(activity.actor) + const actorUrl = getAPId(activity.actor) // When we fetch remote data, we don't have signature if (options.signatureActor && actorUrl !== options.signatureActor.url) { diff --git a/server/lib/activitypub/share.ts b/server/lib/activitypub/share.ts index 170e49238..1767df0ae 100644 --- a/server/lib/activitypub/share.ts +++ b/server/lib/activitypub/share.ts @@ -11,7 +11,7 @@ import { doRequest } from '../../helpers/requests' import { getOrCreateActorAndServerAndModel } from './actor' import { logger } from '../../helpers/logger' import { CRAWL_REQUEST_CONCURRENCY } from '../../initializers' -import { checkUrlsSameHost, getAPUrl } from '../../helpers/activitypub' +import { checkUrlsSameHost, getAPId } from '../../helpers/activitypub' async function shareVideoByServerAndChannel (video: VideoModel, t: Transaction) { if (video.privacy === VideoPrivacy.PRIVATE) return undefined @@ -41,7 +41,7 @@ async function addVideoShares (shareUrls: string[], instance: VideoModel) { }) if (!body || !body.actor) throw new Error('Body or body actor is invalid') - const actorUrl = getAPUrl(body.actor) + const actorUrl = getAPId(body.actor) if (checkUrlsSameHost(shareUrl, actorUrl) !== true) { throw new Error(`Actor url ${actorUrl} has not the same host than the share url ${shareUrl}`) } diff --git a/server/lib/activitypub/video-rates.ts b/server/lib/activitypub/video-rates.ts index 2cce67f0c..45a2b22ea 100644 --- a/server/lib/activitypub/video-rates.ts +++ b/server/lib/activitypub/video-rates.ts @@ -9,7 +9,7 @@ import { AccountVideoRateModel } from '../../models/account/account-video-rate' import { logger } from '../../helpers/logger' import { CRAWL_REQUEST_CONCURRENCY } from '../../initializers' import { doRequest } from '../../helpers/requests' -import { checkUrlsSameHost, getAPUrl } from '../../helpers/activitypub' +import { checkUrlsSameHost, getAPId } from '../../helpers/activitypub' import { ActorModel } from '../../models/activitypub/actor' import { getVideoDislikeActivityPubUrl, getVideoLikeActivityPubUrl } from './url' @@ -26,7 +26,7 @@ async function createRates (ratesUrl: string[], video: VideoModel, rate: VideoRa }) if (!body || !body.actor) throw new Error('Body or body actor is invalid') - const actorUrl = getAPUrl(body.actor) + const actorUrl = getAPId(body.actor) if (checkUrlsSameHost(actorUrl, rateUrl) !== true) { throw new Error(`Rate url ${rateUrl} has not the same host than actor url ${actorUrl}`) } diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts index cbdd981c5..e1e523499 100644 --- a/server/lib/activitypub/videos.ts +++ b/server/lib/activitypub/videos.ts @@ -28,7 +28,7 @@ import { createRates } from './video-rates' import { addVideoShares, shareVideoByServerAndChannel } from './share' import { AccountModel } from '../../models/account/account' import { fetchVideoByUrl, VideoFetchByUrlType } from '../../helpers/video' -import { checkUrlsSameHost, getAPUrl } from '../../helpers/activitypub' +import { checkUrlsSameHost, getAPId } from '../../helpers/activitypub' import { Notifier } from '../notifier' async function federateVideoIfNeeded (video: VideoModel, isNewVideo: boolean, transaction?: sequelize.Transaction) { @@ -155,7 +155,7 @@ async function syncVideoExternalAttributes (video: VideoModel, fetchedVideo: Vid } async function getOrCreateVideoAndAccountAndChannel (options: { - videoObject: VideoTorrentObject | string, + videoObject: { id: string } | string, syncParam?: SyncParam, fetchType?: VideoFetchByUrlType, allowRefresh?: boolean // true by default @@ -166,7 +166,7 @@ async function getOrCreateVideoAndAccountAndChannel (options: { const allowRefresh = options.allowRefresh !== false // Get video url - const videoUrl = getAPUrl(options.videoObject) + const videoUrl = getAPId(options.videoObject) let videoFromDatabase = await fetchVideoByUrl(videoUrl, fetchType) if (videoFromDatabase) { diff --git a/server/tests/api/check-params/contact-form.ts b/server/tests/api/check-params/contact-form.ts index 2407ac0b5..c7e014b1f 100644 --- a/server/tests/api/check-params/contact-form.ts +++ b/server/tests/api/check-params/contact-form.ts @@ -46,6 +46,8 @@ describe('Test contact form API validators', function () { }) it('Should not accept a contact form if it is disabled in the configuration', async function () { + this.timeout(10000) + killallServers([ server ]) // Contact form is disabled @@ -54,6 +56,8 @@ describe('Test contact form API validators', function () { }) it('Should not accept a contact form if from email is invalid', async function () { + this.timeout(10000) + killallServers([ server ]) // Email & contact form enabled diff --git a/server/tests/api/server/redundancy.ts b/server/tests/api/server/redundancy.ts deleted file mode 100644 index 8053d0491..000000000 --- a/server/tests/api/server/redundancy.ts +++ /dev/null @@ -1,479 +0,0 @@ -/* tslint:disable:no-unused-expression */ - -import * as chai from 'chai' -import 'mocha' -import { VideoDetails } from '../../../../shared/models/videos' -import { - doubleFollow, - flushAndRunMultipleServers, - getFollowingListPaginationAndSort, - getVideo, - immutableAssign, - killallServers, makeGetRequest, - root, - ServerInfo, - setAccessTokensToServers, unfollow, - uploadVideo, - viewVideo, - wait, - waitUntilLog, - checkVideoFilesWereRemoved, removeVideo -} from '../../../../shared/utils' -import { waitJobs } from '../../../../shared/utils/server/jobs' -import * as magnetUtil from 'magnet-uri' -import { updateRedundancy } from '../../../../shared/utils/server/redundancy' -import { ActorFollow } from '../../../../shared/models/actors' -import { readdir } from 'fs-extra' -import { join } from 'path' -import { VideoRedundancyStrategy } from '../../../../shared/models/redundancy' -import { getStats } from '../../../../shared/utils/server/stats' -import { ServerStats } from '../../../../shared/models/server/server-stats.model' - -const expect = chai.expect - -let servers: ServerInfo[] = [] -let video1Server2UUID: string - -function checkMagnetWebseeds (file: { magnetUri: string, resolution: { id: number } }, baseWebseeds: string[], server: ServerInfo) { - const parsed = magnetUtil.decode(file.magnetUri) - - for (const ws of baseWebseeds) { - const found = parsed.urlList.find(url => url === `${ws}-${file.resolution.id}.mp4`) - expect(found, `Webseed ${ws} not found in ${file.magnetUri} on server ${server.url}`).to.not.be.undefined - } - - expect(parsed.urlList).to.have.lengthOf(baseWebseeds.length) -} - -async function runServers (strategy: VideoRedundancyStrategy, additionalParams: any = {}) { - const config = { - redundancy: { - videos: { - check_interval: '5 seconds', - strategies: [ - immutableAssign({ - min_lifetime: '1 hour', - strategy: strategy, - size: '100KB' - }, additionalParams) - ] - } - } - } - servers = await flushAndRunMultipleServers(3, config) - - // Get the access tokens - await setAccessTokensToServers(servers) - - { - const res = await uploadVideo(servers[ 1 ].url, servers[ 1 ].accessToken, { name: 'video 1 server 2' }) - video1Server2UUID = res.body.video.uuid - - await viewVideo(servers[ 1 ].url, video1Server2UUID) - } - - await waitJobs(servers) - - // Server 1 and server 2 follow each other - await doubleFollow(servers[ 0 ], servers[ 1 ]) - // Server 1 and server 3 follow each other - await doubleFollow(servers[ 0 ], servers[ 2 ]) - // Server 2 and server 3 follow each other - await doubleFollow(servers[ 1 ], servers[ 2 ]) - - await waitJobs(servers) -} - -async function check1WebSeed (strategy: VideoRedundancyStrategy, videoUUID?: string) { - if (!videoUUID) videoUUID = video1Server2UUID - - const webseeds = [ - 'http://localhost:9002/static/webseed/' + videoUUID - ] - - for (const server of servers) { - { - const res = await getVideo(server.url, videoUUID) - - const video: VideoDetails = res.body - for (const f of video.files) { - checkMagnetWebseeds(f, webseeds, server) - } - } - } -} - -async function checkStatsWith2Webseed (strategy: VideoRedundancyStrategy) { - const res = await getStats(servers[0].url) - const data: ServerStats = res.body - - expect(data.videosRedundancy).to.have.lengthOf(1) - const stat = data.videosRedundancy[0] - - expect(stat.strategy).to.equal(strategy) - expect(stat.totalSize).to.equal(102400) - expect(stat.totalUsed).to.be.at.least(1).and.below(102401) - expect(stat.totalVideoFiles).to.equal(4) - expect(stat.totalVideos).to.equal(1) -} - -async function checkStatsWith1Webseed (strategy: VideoRedundancyStrategy) { - const res = await getStats(servers[0].url) - const data: ServerStats = res.body - - expect(data.videosRedundancy).to.have.lengthOf(1) - - const stat = data.videosRedundancy[0] - expect(stat.strategy).to.equal(strategy) - expect(stat.totalSize).to.equal(102400) - expect(stat.totalUsed).to.equal(0) - expect(stat.totalVideoFiles).to.equal(0) - expect(stat.totalVideos).to.equal(0) -} - -async function check2Webseeds (strategy: VideoRedundancyStrategy, videoUUID?: string) { - if (!videoUUID) videoUUID = video1Server2UUID - - const webseeds = [ - 'http://localhost:9001/static/webseed/' + videoUUID, - 'http://localhost:9002/static/webseed/' + videoUUID - ] - - for (const server of servers) { - const res = await getVideo(server.url, videoUUID) - - const video: VideoDetails = res.body - - for (const file of video.files) { - checkMagnetWebseeds(file, webseeds, server) - - // Only servers 1 and 2 have the video - if (server.serverNumber !== 3) { - await makeGetRequest({ - url: server.url, - statusCodeExpected: 200, - path: '/static/webseed/' + `${videoUUID}-${file.resolution.id}.mp4`, - contentType: null - }) - } - } - } - - for (const directory of [ 'test1', 'test2' ]) { - const files = await readdir(join(root(), directory, 'videos')) - expect(files).to.have.length.at.least(4) - - for (const resolution of [ 240, 360, 480, 720 ]) { - expect(files.find(f => f === `${videoUUID}-${resolution}.mp4`)).to.not.be.undefined - } - } -} - -async function enableRedundancyOnServer1 () { - await updateRedundancy(servers[ 0 ].url, servers[ 0 ].accessToken, servers[ 1 ].host, true) - - const res = await getFollowingListPaginationAndSort(servers[ 0 ].url, 0, 5, '-createdAt') - const follows: ActorFollow[] = res.body.data - const server2 = follows.find(f => f.following.host === 'localhost:9002') - const server3 = follows.find(f => f.following.host === 'localhost:9003') - - expect(server3).to.not.be.undefined - expect(server3.following.hostRedundancyAllowed).to.be.false - - expect(server2).to.not.be.undefined - expect(server2.following.hostRedundancyAllowed).to.be.true -} - -async function disableRedundancyOnServer1 () { - await updateRedundancy(servers[ 0 ].url, servers[ 0 ].accessToken, servers[ 1 ].host, false) - - const res = await getFollowingListPaginationAndSort(servers[ 0 ].url, 0, 5, '-createdAt') - const follows: ActorFollow[] = res.body.data - const server2 = follows.find(f => f.following.host === 'localhost:9002') - const server3 = follows.find(f => f.following.host === 'localhost:9003') - - expect(server3).to.not.be.undefined - expect(server3.following.hostRedundancyAllowed).to.be.false - - expect(server2).to.not.be.undefined - expect(server2.following.hostRedundancyAllowed).to.be.false -} - -async function cleanServers () { - killallServers(servers) -} - -describe('Test videos redundancy', function () { - - describe('With most-views strategy', function () { - const strategy = 'most-views' - - before(function () { - this.timeout(120000) - - return runServers(strategy) - }) - - it('Should have 1 webseed on the first video', async function () { - await check1WebSeed(strategy) - await checkStatsWith1Webseed(strategy) - }) - - it('Should enable redundancy on server 1', function () { - return enableRedundancyOnServer1() - }) - - it('Should have 2 webseed on the first video', async function () { - this.timeout(40000) - - await waitJobs(servers) - await waitUntilLog(servers[0], 'Duplicated ', 4) - await waitJobs(servers) - - await check2Webseeds(strategy) - await checkStatsWith2Webseed(strategy) - }) - - it('Should undo redundancy on server 1 and remove duplicated videos', async function () { - this.timeout(40000) - - await disableRedundancyOnServer1() - - await waitJobs(servers) - await wait(5000) - - await check1WebSeed(strategy) - - await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].serverNumber, [ 'videos' ]) - }) - - after(function () { - return cleanServers() - }) - }) - - describe('With trending strategy', function () { - const strategy = 'trending' - - before(function () { - this.timeout(120000) - - return runServers(strategy) - }) - - it('Should have 1 webseed on the first video', async function () { - await check1WebSeed(strategy) - await checkStatsWith1Webseed(strategy) - }) - - it('Should enable redundancy on server 1', function () { - return enableRedundancyOnServer1() - }) - - it('Should have 2 webseed on the first video', async function () { - this.timeout(40000) - - await waitJobs(servers) - await waitUntilLog(servers[0], 'Duplicated ', 4) - await waitJobs(servers) - - await check2Webseeds(strategy) - await checkStatsWith2Webseed(strategy) - }) - - it('Should unfollow on server 1 and remove duplicated videos', async function () { - this.timeout(40000) - - await unfollow(servers[0].url, servers[0].accessToken, servers[1]) - - await waitJobs(servers) - await wait(5000) - - await check1WebSeed(strategy) - - await checkVideoFilesWereRemoved(video1Server2UUID, servers[0].serverNumber, [ 'videos' ]) - }) - - after(function () { - return cleanServers() - }) - }) - - describe('With recently added strategy', function () { - const strategy = 'recently-added' - - before(function () { - this.timeout(120000) - - return runServers(strategy, { min_views: 3 }) - }) - - it('Should have 1 webseed on the first video', async function () { - await check1WebSeed(strategy) - await checkStatsWith1Webseed(strategy) - }) - - it('Should enable redundancy on server 1', function () { - return enableRedundancyOnServer1() - }) - - it('Should still have 1 webseed on the first video', async function () { - this.timeout(40000) - - await waitJobs(servers) - await wait(15000) - await waitJobs(servers) - - await check1WebSeed(strategy) - await checkStatsWith1Webseed(strategy) - }) - - it('Should view 2 times the first video to have > min_views config', async function () { - this.timeout(40000) - - await viewVideo(servers[ 0 ].url, video1Server2UUID) - await viewVideo(servers[ 2 ].url, video1Server2UUID) - - await wait(10000) - await waitJobs(servers) - }) - - it('Should have 2 webseed on the first video', async function () { - this.timeout(40000) - - await waitJobs(servers) - await waitUntilLog(servers[0], 'Duplicated ', 4) - await waitJobs(servers) - - await check2Webseeds(strategy) - await checkStatsWith2Webseed(strategy) - }) - - it('Should remove the video and the redundancy files', async function () { - this.timeout(20000) - - await removeVideo(servers[1].url, servers[1].accessToken, video1Server2UUID) - - await waitJobs(servers) - - for (const server of servers) { - await checkVideoFilesWereRemoved(video1Server2UUID, server.serverNumber) - } - }) - - after(function () { - return cleanServers() - }) - }) - - describe('Test expiration', function () { - const strategy = 'recently-added' - - async function checkContains (servers: ServerInfo[], str: string) { - for (const server of servers) { - const res = await getVideo(server.url, video1Server2UUID) - const video: VideoDetails = res.body - - for (const f of video.files) { - expect(f.magnetUri).to.contain(str) - } - } - } - - async function checkNotContains (servers: ServerInfo[], str: string) { - for (const server of servers) { - const res = await getVideo(server.url, video1Server2UUID) - const video: VideoDetails = res.body - - for (const f of video.files) { - expect(f.magnetUri).to.not.contain(str) - } - } - } - - before(async function () { - this.timeout(120000) - - await runServers(strategy, { min_lifetime: '7 seconds', min_views: 0 }) - - await enableRedundancyOnServer1() - }) - - it('Should still have 2 webseeds after 10 seconds', async function () { - this.timeout(40000) - - await wait(10000) - - try { - await checkContains(servers, 'http%3A%2F%2Flocalhost%3A9001') - } catch { - // Maybe a server deleted a redundancy in the scheduler - await wait(2000) - - await checkContains(servers, 'http%3A%2F%2Flocalhost%3A9001') - } - }) - - it('Should stop server 1 and expire video redundancy', async function () { - this.timeout(40000) - - killallServers([ servers[0] ]) - - await wait(15000) - - await checkNotContains([ servers[1], servers[2] ], 'http%3A%2F%2Flocalhost%3A9001') - }) - - after(function () { - return killallServers([ servers[1], servers[2] ]) - }) - }) - - describe('Test file replacement', function () { - let video2Server2UUID: string - const strategy = 'recently-added' - - before(async function () { - this.timeout(120000) - - await runServers(strategy, { min_lifetime: '7 seconds', min_views: 0 }) - - await enableRedundancyOnServer1() - - await waitJobs(servers) - await waitUntilLog(servers[0], 'Duplicated ', 4) - await waitJobs(servers) - - await check2Webseeds(strategy) - await checkStatsWith2Webseed(strategy) - - const res = await uploadVideo(servers[ 1 ].url, servers[ 1 ].accessToken, { name: 'video 2 server 2' }) - video2Server2UUID = res.body.video.uuid - }) - - it('Should cache video 2 webseed on the first video', async function () { - this.timeout(120000) - - await waitJobs(servers) - - let checked = false - - while (checked === false) { - await wait(1000) - - try { - await check1WebSeed(strategy, video1Server2UUID) - await check2Webseeds(strategy, video2Server2UUID) - - checked = true - } catch { - checked = false - } - } - }) - - after(function () { - return cleanServers() - }) - }) -}) diff --git a/server/tests/api/server/stats.ts b/server/tests/api/server/stats.ts index 9858e2b15..aaa6c62f7 100644 --- a/server/tests/api/server/stats.ts +++ b/server/tests/api/server/stats.ts @@ -75,6 +75,7 @@ describe('Test stats (excluding redundancy)', function () { expect(data.totalLocalVideoComments).to.equal(0) expect(data.totalLocalVideos).to.equal(0) expect(data.totalLocalVideoViews).to.equal(0) + expect(data.totalLocalVideoFilesSize).to.equal(0) expect(data.totalUsers).to.equal(1) expect(data.totalVideoComments).to.equal(1) expect(data.totalVideos).to.equal(1) diff --git a/shared/models/activitypub/activity.ts b/shared/models/activitypub/activity.ts index 44cb99efb..89994f665 100644 --- a/shared/models/activitypub/activity.ts +++ b/shared/models/activitypub/activity.ts @@ -5,12 +5,14 @@ import { DislikeObject } from './objects/dislike-object' import { VideoAbuseObject } from './objects/video-abuse-object' import { VideoCommentObject } from './objects/video-comment-object' import { ViewObject } from './objects/view-object' +import { APObject } from './objects/object.model' export type Activity = ActivityCreate | ActivityUpdate | ActivityDelete | ActivityFollow | ActivityAccept | ActivityAnnounce | - ActivityUndo | ActivityLike | ActivityReject + ActivityUndo | ActivityLike | ActivityReject | ActivityView | ActivityDislike | ActivityFlag -export type ActivityType = 'Create' | 'Update' | 'Delete' | 'Follow' | 'Accept' | 'Announce' | 'Undo' | 'Like' | 'Reject' +export type ActivityType = 'Create' | 'Update' | 'Delete' | 'Follow' | 'Accept' | 'Announce' | 'Undo' | 'Like' | 'Reject' | + 'View' | 'Dislike' | 'Flag' export interface ActivityAudience { to: string[] @@ -59,15 +61,34 @@ export interface ActivityReject extends BaseActivity { export interface ActivityAnnounce extends BaseActivity { type: 'Announce' - object: string | { id: string } + object: APObject } export interface ActivityUndo extends BaseActivity { type: 'Undo', - object: ActivityFollow | ActivityLike | ActivityCreate | ActivityAnnounce + object: ActivityFollow | ActivityLike | ActivityDislike | ActivityCreate | ActivityAnnounce } export interface ActivityLike extends BaseActivity { type: 'Like', - object: string + object: APObject +} + +export interface ActivityView extends BaseActivity { + type: 'View', + actor: string + object: APObject +} + +export interface ActivityDislike extends BaseActivity { + id: string + type: 'Dislike' + actor: string + object: APObject +} + +export interface ActivityFlag extends BaseActivity { + type: 'Flag', + content: string, + object: APObject } diff --git a/shared/models/activitypub/objects/object.model.ts b/shared/models/activitypub/objects/object.model.ts new file mode 100644 index 000000000..3fd33800a --- /dev/null +++ b/shared/models/activitypub/objects/object.model.ts @@ -0,0 +1 @@ +export type APObject = string | { id: string } From 457bb213b273a9b206cc5654eb085cede4e916ad Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 16 Jan 2019 16:05:40 +0100 Subject: [PATCH 114/137] Refactor how we use icons Inject them in an angular component so we can easily change their color --- client/package.json | 1 - .../contact-admin-modal.component.html | 2 +- .../moderation-comment-modal.component.html | 5 +- .../moderation-comment-modal.component.ts | 4 +- .../users/user-list/user-list.component.html | 2 +- .../users/user-list/user-list.component.scss | 4 +- .../my-account-history.component.scss | 4 +- .../my-account-notifications.component.html | 10 +- .../my-account-notifications.component.scss | 4 +- ...my-account-accept-ownership.component.html | 3 +- .../my-account-video-channels.component.html | 2 +- .../my-account-video-channels.component.scss | 2 +- .../my-account-videos.component.html | 6 +- .../my-account-videos.component.scss | 11 +- .../video-change-ownership.component.html | 3 +- client/src/app/app.component.html | 2 + client/src/app/core/confirm/index.ts | 1 - client/src/app/core/core.module.ts | 4 +- client/src/app/header/header.component.html | 2 +- client/src/app/header/header.component.scss | 10 +- client/src/app/login/login.component.html | 3 +- .../menu/avatar-notification.component.scss | 2 +- .../app/menu/language-chooser.component.html | 2 +- client/src/app/search/search.component.scss | 4 +- client/src/app/shared/actor/actor.model.ts | 2 +- .../buttons/action-dropdown.component.html | 2 +- .../buttons/action-dropdown.component.scss | 9 +- .../app/shared/buttons/button.component.html | 2 +- .../app/shared/buttons/button.component.scss | 34 +--- .../app/shared/buttons/button.component.ts | 3 +- .../buttons/delete-button.component.html | 2 +- .../shared/buttons/edit-button.component.html | 2 +- .../confirm/confirm.component.html | 3 +- .../confirm/confirm.component.scss | 0 .../confirm/confirm.component.ts | 2 +- .../shared/icons/global-icon.component.html | 0 .../shared/icons/global-icon.component.scss | 4 + .../app/shared/icons/global-icon.component.ts | 47 +++++ .../src/app/shared/misc/help.component.html | 4 +- .../src/app/shared/misc/help.component.scss | 19 +- .../moderation/user-ban-modal.component.html | 7 +- .../moderation/user-ban-modal.component.ts | 4 +- client/src/app/shared/shared.module.ts | 8 +- .../shared/users/user-notification.model.ts | 37 ++-- .../shared/users/user-notification.service.ts | 2 - .../users/user-notifications.component.html | 84 ++++++--- .../users/user-notifications.component.scss | 48 +++-- .../users/user-notifications.component.ts | 14 +- .../src/app/shared/video/feed.component.html | 9 +- .../src/app/shared/video/feed.component.scss | 17 +- .../video/video-miniature.component.scss | 4 +- client/src/app/shared/video/video.model.ts | 4 +- .../video-caption-add-modal.component.html | 2 +- .../shared/video-edit.component.html | 2 +- .../shared/video-edit.component.scss | 17 +- .../video-import-torrent.component.html | 6 +- .../video-import-torrent.component.scss | 53 +----- .../video-import-torrent.component.ts | 3 +- .../video-import-url.component.html | 6 +- .../video-import-url.component.ts | 2 +- ...ort-url.component.scss => video-send.scss} | 31 ++-- .../video-upload.component.html | 6 +- .../video-upload.component.scss | 44 +---- .../video-upload.component.ts | 3 +- .../+video-edit/video-update.component.html | 2 +- .../comment/video-comment.component.scss | 6 +- .../modal/video-blacklist.component.html | 2 +- .../modal/video-download.component.html | 2 +- .../modal/video-report.component.html | 2 +- .../modal/video-share.component.html | 2 +- .../modal/video-support.component.html | 2 +- .../+video-watch/video-watch.component.html | 24 +-- .../+video-watch/video-watch.component.scss | 80 ++------ .../images/global/{add.svg => add.html} | 6 +- .../{video/alert.svg => global/alert.html} | 9 +- .../src/assets/images/global/circle-tick.html | 12 ++ .../assets/images/global/cloud-download.html | 11 ++ .../src/assets/images/global/cloud-error.html | 11 ++ client/src/assets/images/global/cog.html | 9 + .../images/global/{cross.svg => cross.html} | 6 +- .../src/assets/images/global/delete-black.svg | 14 -- .../src/assets/images/global/delete-grey.svg | 14 -- .../global/{delete-white.svg => delete.html} | 14 +- .../download.html} | 9 +- .../src/assets/images/global/edit-black.svg | 15 -- .../global/{edit-grey.svg => edit.html} | 9 +- .../images/global/{help.svg => help.html} | 8 +- .../{im-with-her.svg => im-with-her.html} | 13 +- client/src/assets/images/global/no.html | 10 + client/src/assets/images/global/sparkle.html | 11 ++ .../{syndication.svg => syndication.html} | 4 +- .../images/global/{tick.svg => tick.html} | 6 +- client/src/assets/images/global/undo.html | 9 + client/src/assets/images/global/undo.svg | 11 -- client/src/assets/images/global/user-add.html | 11 ++ .../global/{validate.svg => validate.html} | 6 +- client/src/assets/images/video/blacklist.svg | 15 -- .../src/assets/images/video/dislike-white.svg | 14 -- .../video/{dislike-grey.svg => dislike.html} | 6 +- .../src/assets/images/video/download-grey.svg | 16 -- .../assets/images/video/download-white.svg | 16 -- .../images/video/{heart.svg => heart.html} | 8 +- client/src/assets/images/video/like-white.svg | 15 -- .../images/video/{like-grey.svg => like.html} | 9 +- .../images/video/{more.svg => more.html} | 6 +- .../images/video/{share.svg => share.html} | 9 +- .../upload-white.svg => video/upload.html} | 9 +- client/src/assets/images/video/upload.svg | 16 -- client/src/sass/application.scss | 9 +- client/src/sass/include/_mixins.scss | 49 +++-- client/src/sass/include/_variables.scss | 9 +- client/yarn.lock | 173 ------------------ server/models/account/user-notification.ts | 158 ++++++++++++---- shared/models/actors/actor.model.ts | 2 +- .../models/users/user-notification.model.ts | 30 ++- shared/models/videos/video.model.ts | 4 +- 116 files changed, 670 insertions(+), 894 deletions(-) rename client/src/app/{core => shared}/confirm/confirm.component.html (87%) rename client/src/app/{core => shared}/confirm/confirm.component.scss (100%) rename client/src/app/{core => shared}/confirm/confirm.component.ts (96%) create mode 100644 client/src/app/shared/icons/global-icon.component.html create mode 100644 client/src/app/shared/icons/global-icon.component.scss create mode 100644 client/src/app/shared/icons/global-icon.component.ts rename client/src/app/videos/+video-edit/video-add-components/{video-import-url.component.scss => video-send.scss} (57%) rename client/src/assets/images/global/{add.svg => add.html} (72%) rename client/src/assets/images/{video/alert.svg => global/alert.html} (71%) create mode 100644 client/src/assets/images/global/circle-tick.html create mode 100644 client/src/assets/images/global/cloud-download.html create mode 100644 client/src/assets/images/global/cloud-error.html create mode 100644 client/src/assets/images/global/cog.html rename client/src/assets/images/global/{cross.svg => cross.html} (63%) delete mode 100644 client/src/assets/images/global/delete-black.svg delete mode 100644 client/src/assets/images/global/delete-grey.svg rename client/src/assets/images/global/{delete-white.svg => delete.html} (71%) rename client/src/assets/images/{video/download-black.svg => global/download.html} (64%) delete mode 100644 client/src/assets/images/global/edit-black.svg rename client/src/assets/images/global/{edit-grey.svg => edit.html} (62%) rename client/src/assets/images/global/{help.svg => help.html} (84%) rename client/src/assets/images/global/{im-with-her.svg => im-with-her.html} (70%) create mode 100644 client/src/assets/images/global/no.html create mode 100644 client/src/assets/images/global/sparkle.html rename client/src/assets/images/global/{syndication.svg => syndication.html} (88%) rename client/src/assets/images/global/{tick.svg => tick.html} (63%) create mode 100644 client/src/assets/images/global/undo.html delete mode 100644 client/src/assets/images/global/undo.svg create mode 100644 client/src/assets/images/global/user-add.html rename client/src/assets/images/global/{validate.svg => validate.html} (69%) delete mode 100644 client/src/assets/images/video/blacklist.svg delete mode 100644 client/src/assets/images/video/dislike-white.svg rename client/src/assets/images/video/{dislike-grey.svg => dislike.html} (77%) delete mode 100644 client/src/assets/images/video/download-grey.svg delete mode 100644 client/src/assets/images/video/download-white.svg rename client/src/assets/images/video/{heart.svg => heart.html} (66%) delete mode 100644 client/src/assets/images/video/like-white.svg rename client/src/assets/images/video/{like-grey.svg => like.html} (61%) rename client/src/assets/images/video/{more.svg => more.html} (76%) rename client/src/assets/images/video/{share.svg => share.html} (62%) rename client/src/assets/images/{header/upload-white.svg => video/upload.html} (69%) delete mode 100644 client/src/assets/images/video/upload.svg diff --git a/client/package.json b/client/package.json index 5fe1f3d5f..248c390fc 100644 --- a/client/package.json +++ b/client/package.json @@ -154,7 +154,6 @@ "videojs-contextmenu-ui": "^5.0.0", "videojs-dock": "^2.0.2", "videojs-hotkeys": "^0.2.21", - "webpack": "^4.17.1", "webpack-bundle-analyzer": "^3.0.2", "webpack-cli": "^3.0.8", "webtorrent": "https://github.com/webtorrent/webtorrent#e9b209c7970816fc29e0cc871157a4918d66001d", diff --git a/client/src/app/+about/about-instance/contact-admin-modal.component.html b/client/src/app/+about/about-instance/contact-admin-modal.component.html index 2b3fb32f3..b2cbd0873 100644 --- a/client/src/app/+about/about-instance/contact-admin-modal.component.html +++ b/client/src/app/+about/about-instance/contact-admin-modal.component.html @@ -1,7 +1,7 @@

Contact {{ instanceName }} administrator

- +
diff --git a/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html index 952235c55..303a788d2 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html +++ b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html @@ -1,7 +1,8 @@

Moderation comment

- + +
@@ -19,7 +20,7 @@
- Cancel + Cancel this.notifier.error(err.message) diff --git a/client/src/app/+admin/users/user-list/user-list.component.html b/client/src/app/+admin/users/user-list/user-list.component.html index 8c03a924b..69a4616a3 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.html +++ b/client/src/app/+admin/users/user-list/user-list.component.html @@ -2,7 +2,7 @@
Users list
- + Create user
diff --git a/client/src/app/+admin/users/user-list/user-list.component.scss b/client/src/app/+admin/users/user-list/user-list.component.scss index f235769f0..5274be01c 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.scss +++ b/client/src/app/+admin/users/user-list/user-list.component.scss @@ -2,7 +2,7 @@ @import '_mixins'; .add-button { - @include create-button('../../../../assets/images/global/add.svg'); + @include create-button; } tr.banned { @@ -23,4 +23,4 @@ tr.banned { input { @include peertube-input-text(250px); } -} \ No newline at end of file +} diff --git a/client/src/app/+my-account/my-account-history/my-account-history.component.scss b/client/src/app/+my-account/my-account-history/my-account-history.component.scss index 82150cbe3..e7c6863f1 100644 --- a/client/src/app/+my-account/my-account-history/my-account-history.component.scss +++ b/client/src/app/+my-account/my-account-history/my-account-history.component.scss @@ -65,10 +65,10 @@ text-overflow: ellipsis; white-space: nowrap; font-size: 14px; - color: #585858; + color: $grey-foreground-color; &:hover { - color: #303030; + color: $grey-foreground-hover-color; } } } diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html index b98a1087e..d518b22ec 100644 --- a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html +++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html @@ -1,7 +1,13 @@
- Notification preferences + + + Notification preferences + - +
diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss index 86ac094c5..43d1f82ab 100644 --- a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss +++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss @@ -5,16 +5,18 @@ display: flex; justify-content: space-between; font-size: 15px; - margin-bottom: 10px; + margin-bottom: 20px; a { @include peertube-button-link; @include grey-button; + @include button-with-icon(18px, 3px, -1px); } button { @include peertube-button; @include grey-button; + @include button-with-icon(20px, 3px, -1px); } } diff --git a/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html b/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html index fd7d7d23b..674a4e8a2 100644 --- a/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html +++ b/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html @@ -1,7 +1,8 @@

Accept ownership

- + +
diff --git a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.html b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.html index df74b19b6..51db2e75d 100644 --- a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.html +++ b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.html @@ -1,6 +1,6 @@
- + Create another video channel
diff --git a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.scss b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.scss index 472cbb723..77fce138b 100644 --- a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.scss +++ b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.scss @@ -2,7 +2,7 @@ @import '_mixins'; .create-button { - @include create-button('../../../assets/images/global/add.svg'); + @include create-button; } /deep/ .action-button { diff --git a/client/src/app/+my-account/my-account-videos/my-account-videos.component.html b/client/src/app/+my-account/my-account-videos/my-account-videos.component.html index a6911e4bf..69748ef37 100644 --- a/client/src/app/+my-account/my-account-videos/my-account-videos.component.html +++ b/client/src/app/+my-account/my-account-videos/my-account-videos.component.html @@ -32,7 +32,7 @@ - + Delete
@@ -45,7 +45,7 @@
@@ -53,4 +53,4 @@
- \ No newline at end of file + diff --git a/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss b/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss index a735562f8..39d0cf2f7 100644 --- a/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss +++ b/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss @@ -23,14 +23,11 @@ .action-button-delete-selection { @include peertube-button; @include orange-button; - } + @include button-with-icon(21px); - .icon.icon-delete-white { - @include icon(21px); - - position: relative; - top: -2px; - background-image: url('../../../assets/images/global/delete-white.svg'); + my-global-icon { + @include apply-svg-color(#fff); + } } } } diff --git a/client/src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html b/client/src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html index 7c0df850d..22f127904 100644 --- a/client/src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html +++ b/client/src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html @@ -1,7 +1,8 @@

Change ownership

- + +
diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html index 3a60139e1..dfda556f5 100644 --- a/client/src/app/app.component.html +++ b/client/src/app/app.component.html @@ -37,7 +37,9 @@
+ +
diff --git a/client/src/app/core/confirm/index.ts b/client/src/app/core/confirm/index.ts index 44aabfc13..aca591e1a 100644 --- a/client/src/app/core/confirm/index.ts +++ b/client/src/app/core/confirm/index.ts @@ -1,2 +1 @@ -export * from './confirm.component' export * from './confirm.service' diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts index 3bc0e2885..4ef3b1e73 100644 --- a/client/src/app/core/core.module.ts +++ b/client/src/app/core/core.module.ts @@ -8,7 +8,7 @@ import { LoadingBarHttpClientModule } from '@ngx-loading-bar/http-client' import { LoadingBarRouterModule } from '@ngx-loading-bar/router' import { AuthService } from './auth' -import { ConfirmComponent, ConfirmService } from './confirm' +import { ConfirmService } from './confirm' import { throwIfAlreadyLoaded } from './module-import-guard' import { LoginGuard, RedirectService, UserRightGuard } from './routing' import { ServerService } from './server' @@ -38,7 +38,6 @@ import { UserNotificationSocket } from '@app/core/notification/user-notification ], declarations: [ - ConfirmComponent, CheatSheetComponent ], @@ -48,7 +47,6 @@ import { UserNotificationSocket } from '@app/core/notification/user-notification ToastModule, - ConfirmComponent, CheatSheetComponent ], diff --git a/client/src/app/header/header.component.html b/client/src/app/header/header.component.html index c23e0c55d..46a87c79c 100644 --- a/client/src/app/header/header.component.html +++ b/client/src/app/header/header.component.html @@ -5,6 +5,6 @@ - + Upload diff --git a/client/src/app/header/header.component.scss b/client/src/app/header/header.component.scss index 2f9820665..cdc457b96 100644 --- a/client/src/app/header/header.component.scss +++ b/client/src/app/header/header.component.scss @@ -40,6 +40,7 @@ .upload-button { @include peertube-button-link; @include orange-button; + @include button-with-icon(22px, 3px, -1px); margin-right: 25px; @@ -47,15 +48,6 @@ margin-right: 0; } - .icon.icon-upload { - @include icon(22px); - - background-image: url('../../assets/images/header/upload-white.svg'); - height: 24px; - vertical-align: middle; - margin-right: 6px; - } - @media screen and (max-width: 600px) { margin-right: 10px; padding: 0 10px; diff --git a/client/src/app/login/login.component.html b/client/src/app/login/login.component.html index 9b8146624..4efe3fb22 100644 --- a/client/src/app/login/login.component.html +++ b/client/src/app/login/login.component.html @@ -55,7 +55,8 @@

Forgot your password

- + +
diff --git a/client/src/app/menu/avatar-notification.component.scss b/client/src/app/menu/avatar-notification.component.scss index 807385022..f6242eeae 100644 --- a/client/src/app/menu/avatar-notification.component.scss +++ b/client/src/app/menu/avatar-notification.component.scss @@ -42,7 +42,7 @@ justify-content: center; font-weight: $font-semibold; color: var(--mainForegroundColor); - height: 30px; + padding: 7px 0; } } } diff --git a/client/src/app/menu/language-chooser.component.html b/client/src/app/menu/language-chooser.component.html index c79609898..a62b33dda 100644 --- a/client/src/app/menu/language-chooser.component.html +++ b/client/src/app/menu/language-chooser.component.html @@ -1,7 +1,7 @@

Change the language

- +
diff --git a/client/src/app/search/search.component.scss b/client/src/app/search/search.component.scss index 3e074621b..6de13d276 100644 --- a/client/src/app/search/search.component.scss +++ b/client/src/app/search/search.component.scss @@ -87,10 +87,10 @@ text-overflow: ellipsis; white-space: nowrap; font-size: 14px; - color: #585858; + color: $grey-foreground-color; &:hover { - color: #303030; + color: $grey-foreground-hover-color; } } } diff --git a/client/src/app/shared/actor/actor.model.ts b/client/src/app/shared/actor/actor.model.ts index 811afb449..adecec1fc 100644 --- a/client/src/app/shared/actor/actor.model.ts +++ b/client/src/app/shared/actor/actor.model.ts @@ -16,7 +16,7 @@ export abstract class Actor implements ActorServer { avatarUrl: string - static GET_ACTOR_AVATAR_URL (actor: { avatar: Avatar }) { + static GET_ACTOR_AVATAR_URL (actor: { avatar?: { path: string } }) { const absoluteAPIUrl = getAbsoluteAPIUrl() if (actor && actor.avatar) return absoluteAPIUrl + actor.avatar.path diff --git a/client/src/app/shared/buttons/action-dropdown.component.html b/client/src/app/shared/buttons/action-dropdown.component.html index 90651f217..114b1d71f 100644 --- a/client/src/app/shared/buttons/action-dropdown.component.html +++ b/client/src/app/shared/buttons/action-dropdown.component.html @@ -3,7 +3,7 @@ class="action-button" [ngClass]="{ small: buttonSize === 'small', grey: theme === 'grey', orange: theme === 'orange' }" ngbDropdownToggle role="button" > - + {{ label }}
diff --git a/client/src/app/shared/buttons/action-dropdown.component.scss b/client/src/app/shared/buttons/action-dropdown.component.scss index a4fcceeee..985b2ca88 100644 --- a/client/src/app/shared/buttons/action-dropdown.component.scss +++ b/client/src/app/shared/buttons/action-dropdown.component.scss @@ -24,14 +24,11 @@ } &:hover, &:active, &:focus { - background-color: $grey-color; + background-color: $grey-background-color; } - .icon-action { - @include icon(21px); - - background-image: url('../../../assets/images/video/more.svg'); - top: -1px; + .more-icon { + width: 21px; } &.small { diff --git a/client/src/app/shared/buttons/button.component.html b/client/src/app/shared/buttons/button.component.html index 87a8daccf..b6df67102 100644 --- a/client/src/app/shared/buttons/button.component.html +++ b/client/src/app/shared/buttons/button.component.html @@ -1,4 +1,4 @@ - + {{ label }} diff --git a/client/src/app/shared/buttons/button.component.scss b/client/src/app/shared/buttons/button.component.scss index 168102f09..be41669cd 100644 --- a/client/src/app/shared/buttons/button.component.scss +++ b/client/src/app/shared/buttons/button.component.scss @@ -3,41 +3,19 @@ .action-button { @include peertube-button-link; + @include button-with-icon(21px, 0, -2px); font-size: 15px; font-weight: $font-semibold; - color: #585858; - background-color: #E5E5E5; + color: $grey-foreground-color; + background-color: $grey-background-color; &:hover { - background-color: #EFEFEF; + background-color: $grey-background-hover-color; } - .icon { - @include icon(21px); - - position: relative; - top: -2px; - - &.icon-edit { - background-image: url('../../../assets/images/global/edit-grey.svg'); - } - - &.icon-delete-grey { - background-image: url('../../../assets/images/global/delete-grey.svg'); - } - - &.icon-im-with-her { - background-image: url('../../../assets/images/global/im-with-her.svg'); - } - - &.icon-tick { - background-image: url('../../../assets/images/global/tick.svg'); - } - - &.icon-cross { - background-image: url('../../../assets/images/global/cross.svg'); - } + my-global-icon { + @include apply-svg-color($grey-foreground-color); } } diff --git a/client/src/app/shared/buttons/button.component.ts b/client/src/app/shared/buttons/button.component.ts index 1a1162f09..a91e9c7eb 100644 --- a/client/src/app/shared/buttons/button.component.ts +++ b/client/src/app/shared/buttons/button.component.ts @@ -1,4 +1,5 @@ import { Component, Input } from '@angular/core' +import { GlobalIconName } from '@app/shared/icons/global-icon.component' @Component({ selector: 'my-button', @@ -9,7 +10,7 @@ import { Component, Input } from '@angular/core' export class ButtonComponent { @Input() label = '' @Input() className: string = undefined - @Input() icon: string = undefined + @Input() icon: GlobalIconName = undefined @Input() title: string = undefined getTitle () { diff --git a/client/src/app/shared/buttons/delete-button.component.html b/client/src/app/shared/buttons/delete-button.component.html index 6c55d8104..4d12a84c0 100644 --- a/client/src/app/shared/buttons/delete-button.component.html +++ b/client/src/app/shared/buttons/delete-button.component.html @@ -1,5 +1,5 @@ - + {{ label }} Delete diff --git a/client/src/app/shared/buttons/edit-button.component.html b/client/src/app/shared/buttons/edit-button.component.html index cecb780f3..da3addbae 100644 --- a/client/src/app/shared/buttons/edit-button.component.html +++ b/client/src/app/shared/buttons/edit-button.component.html @@ -1,5 +1,5 @@ - + {{ label }} Edit diff --git a/client/src/app/core/confirm/confirm.component.html b/client/src/app/shared/confirm/confirm.component.html similarity index 87% rename from client/src/app/core/confirm/confirm.component.html rename to client/src/app/shared/confirm/confirm.component.html index 43f0c6190..65df1cd4d 100644 --- a/client/src/app/core/confirm/confirm.component.html +++ b/client/src/app/shared/confirm/confirm.component.html @@ -2,7 +2,8 @@

{{ title }}

- + +
diff --git a/client/src/app/core/confirm/confirm.component.scss b/client/src/app/shared/confirm/confirm.component.scss similarity index 100% rename from client/src/app/core/confirm/confirm.component.scss rename to client/src/app/shared/confirm/confirm.component.scss diff --git a/client/src/app/core/confirm/confirm.component.ts b/client/src/app/shared/confirm/confirm.component.ts similarity index 96% rename from client/src/app/core/confirm/confirm.component.ts rename to client/src/app/shared/confirm/confirm.component.ts index 5138b7848..63c163da6 100644 --- a/client/src/app/core/confirm/confirm.component.ts +++ b/client/src/app/shared/confirm/confirm.component.ts @@ -1,5 +1,5 @@ import { Component, ElementRef, HostListener, OnInit, ViewChild } from '@angular/core' -import { ConfirmService } from './confirm.service' +import { ConfirmService } from '@app/core/confirm/confirm.service' import { I18n } from '@ngx-translate/i18n-polyfill' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref' diff --git a/client/src/app/shared/icons/global-icon.component.html b/client/src/app/shared/icons/global-icon.component.html new file mode 100644 index 000000000..e69de29bb diff --git a/client/src/app/shared/icons/global-icon.component.scss b/client/src/app/shared/icons/global-icon.component.scss new file mode 100644 index 000000000..6805fb6f7 --- /dev/null +++ b/client/src/app/shared/icons/global-icon.component.scss @@ -0,0 +1,4 @@ +/deep/ svg { + width: inherit; + height: inherit; +} diff --git a/client/src/app/shared/icons/global-icon.component.ts b/client/src/app/shared/icons/global-icon.component.ts new file mode 100644 index 000000000..5b9377e3e --- /dev/null +++ b/client/src/app/shared/icons/global-icon.component.ts @@ -0,0 +1,47 @@ +import { Component, ElementRef, Input, OnInit } from '@angular/core' + +const icons = { + 'add': require('../../../assets/images/global/add.html'), + 'syndication': require('../../../assets/images/global/syndication.html'), + 'help': require('../../../assets/images/global/help.html'), + 'sparkle': require('../../../assets/images/global/sparkle.html'), + 'alert': require('../../../assets/images/global/alert.html'), + 'cloud-error': require('../../../assets/images/global/cloud-error.html'), + 'user-add': require('../../../assets/images/global/user-add.html'), + 'no': require('../../../assets/images/global/no.html'), + 'cloud-download': require('../../../assets/images/global/cloud-download.html'), + 'undo': require('../../../assets/images/global/undo.html'), + 'circle-tick': require('../../../assets/images/global/circle-tick.html'), + 'cog': require('../../../assets/images/global/cog.html'), + 'download': require('../../../assets/images/global/download.html'), + 'edit': require('../../../assets/images/global/edit.html'), + 'im-with-her': require('../../../assets/images/global/im-with-her.html'), + 'delete': require('../../../assets/images/global/delete.html'), + 'cross': require('../../../assets/images/global/cross.html'), + 'validate': require('../../../assets/images/global/validate.html'), + 'dislike': require('../../../assets/images/video/dislike.html'), + 'heart': require('../../../assets/images/video/heart.html'), + 'like': require('../../../assets/images/video/like.html'), + 'more': require('../../../assets/images/video/more.html'), + 'share': require('../../../assets/images/video/share.html'), + 'upload': require('../../../assets/images/video/upload.html') +} + +export type GlobalIconName = keyof typeof icons + +@Component({ + selector: 'my-global-icon', + template: '', + styleUrls: [ './global-icon.component.scss' ] +}) +export class GlobalIconComponent implements OnInit { + @Input() iconName: GlobalIconName + + constructor (private el: ElementRef) {} + + ngOnInit () { + const nativeElement = this.el.nativeElement + + nativeElement.innerHTML = icons[this.iconName] + } +} diff --git a/client/src/app/shared/misc/help.component.html b/client/src/app/shared/misc/help.component.html index 08a2fc367..444425c9f 100644 --- a/client/src/app/shared/misc/help.component.html +++ b/client/src/app/shared/misc/help.component.html @@ -25,4 +25,6 @@ [autoClose]="true" (onHidden)="onPopoverHidden()" (onShown)="onPopoverShown()" -> +> + + diff --git a/client/src/app/shared/misc/help.component.scss b/client/src/app/shared/misc/help.component.scss index 047e53fab..4565d457a 100644 --- a/client/src/app/shared/misc/help.component.scss +++ b/client/src/app/shared/misc/help.component.scss @@ -2,13 +2,15 @@ @import '_mixins'; .help-tooltip-button { - @include icon(17px); - - position: relative; - top: -2px; - background-image: url('../../../assets/images/global/help.svg'); + cursor: pointer; border: none; - margin: 5px; + + my-global-icon { + width: 17px; + position: relative; + top: -2px; + margin: 5px; + } } /deep/ { @@ -24,8 +26,13 @@ color: #000; box-shadow: 0 0 6px rgba(0, 0, 0, 0.5); + p:last-child { + margin-bottom: 0; + } + ul { padding-left: 20px; + margin-bottom: 0; } } } diff --git a/client/src/app/shared/moderation/user-ban-modal.component.html b/client/src/app/shared/moderation/user-ban-modal.component.html index fa5cb7404..f38ea543d 100644 --- a/client/src/app/shared/moderation/user-ban-modal.component.html +++ b/client/src/app/shared/moderation/user-ban-modal.component.html @@ -1,7 +1,8 @@

Ban

- + +
@@ -19,7 +20,7 @@
- Cancel + Cancel
- \ No newline at end of file + diff --git a/client/src/app/shared/moderation/user-ban-modal.component.ts b/client/src/app/shared/moderation/user-ban-modal.component.ts index f755ba0e8..942765301 100644 --- a/client/src/app/shared/moderation/user-ban-modal.component.ts +++ b/client/src/app/shared/moderation/user-ban-modal.component.ts @@ -42,7 +42,7 @@ export class UserBanModalComponent extends FormReactive implements OnInit { this.openedModal = this.modalService.open(this.modal) } - hideBanUserModal () { + hide () { this.usersToBan = undefined this.openedModal.close() } @@ -60,7 +60,7 @@ export class UserBanModalComponent extends FormReactive implements OnInit { this.notifier.success(message) this.userBanned.emit(this.usersToBan) - this.hideBanUserModal() + this.hide() }, err => this.notifier.error(err.message) diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts index 384f5d722..6f8625c7e 100644 --- a/client/src/app/shared/shared.module.ts +++ b/client/src/app/shared/shared.module.ts @@ -67,6 +67,8 @@ import { UserNotificationService } from '@app/shared/users/user-notification.ser import { UserNotificationsComponent } from '@app/shared/users/user-notifications.component' import { InstanceService } from '@app/shared/instance/instance.service' import { HtmlRendererService, LinkifierService, MarkdownService } from '@app/shared/renderer' +import { ConfirmComponent } from '@app/shared/confirm/confirm.component' +import { GlobalIconComponent } from '@app/shared/icons/global-icon.component' @NgModule({ imports: [ @@ -110,7 +112,9 @@ import { HtmlRendererService, LinkifierService, MarkdownService } from '@app/sha UserBanModalComponent, UserModerationDropdownComponent, TopMenuDropdownComponent, - UserNotificationsComponent + UserNotificationsComponent, + ConfirmComponent, + GlobalIconComponent ], exports: [ @@ -151,6 +155,8 @@ import { HtmlRendererService, LinkifierService, MarkdownService } from '@app/sha UserModerationDropdownComponent, TopMenuDropdownComponent, UserNotificationsComponent, + ConfirmComponent, + GlobalIconComponent, NumberFormatterPipe, ObjectLengthPipe, diff --git a/client/src/app/shared/users/user-notification.model.ts b/client/src/app/shared/users/user-notification.model.ts index 5ff816fb8..c5996a8a1 100644 --- a/client/src/app/shared/users/user-notification.model.ts +++ b/client/src/app/shared/users/user-notification.model.ts @@ -1,4 +1,5 @@ -import { UserNotification as UserNotificationServer, UserNotificationType, VideoInfo } from '../../../../../shared' +import { UserNotification as UserNotificationServer, UserNotificationType, VideoInfo, ActorInfo } from '../../../../../shared' +import { Actor } from '@app/shared/actor/actor.model' export class UserNotification implements UserNotificationServer { id: number @@ -6,10 +7,7 @@ export class UserNotification implements UserNotificationServer { read: boolean video?: VideoInfo & { - channel: { - id: number - displayName: string - } + channel: ActorInfo & { avatarUrl?: string } } videoImport?: { @@ -23,10 +21,7 @@ export class UserNotification implements UserNotificationServer { comment?: { id: number threadId: number - account: { - id: number - displayName: string - } + account: ActorInfo & { avatarUrl?: string } video: VideoInfo } @@ -40,18 +35,11 @@ export class UserNotification implements UserNotificationServer { video: VideoInfo } - account?: { - id: number - displayName: string - name: string - } + account?: ActorInfo & { avatarUrl?: string } actorFollow?: { id: number - follower: { - name: string - displayName: string - } + follower: ActorInfo & { avatarUrl?: string } following: { type: 'account' | 'channel' name: string @@ -76,12 +64,22 @@ export class UserNotification implements UserNotificationServer { this.read = hash.read this.video = hash.video + if (this.video) this.setAvatarUrl(this.video.channel) + this.videoImport = hash.videoImport + this.comment = hash.comment + if (this.comment) this.setAvatarUrl(this.comment.account) + this.videoAbuse = hash.videoAbuse + this.videoBlacklist = hash.videoBlacklist + this.account = hash.account + if (this.account) this.setAvatarUrl(this.account) + this.actorFollow = hash.actorFollow + if (this.actorFollow) this.setAvatarUrl(this.actorFollow.follower) this.createdAt = hash.createdAt this.updatedAt = hash.updatedAt @@ -150,4 +148,7 @@ export class UserNotification implements UserNotificationServer { return videoImport.targetUrl || videoImport.magnetUri || videoImport.torrentName } + private setAvatarUrl (actor: { avatarUrl?: string, avatar?: { path: string } }) { + actor.avatarUrl = Actor.GET_ACTOR_AVATAR_URL(actor) + } } diff --git a/client/src/app/shared/users/user-notification.service.ts b/client/src/app/shared/users/user-notification.service.ts index 67ed8f74e..f8a30955d 100644 --- a/client/src/app/shared/users/user-notification.service.ts +++ b/client/src/app/shared/users/user-notification.service.ts @@ -15,8 +15,6 @@ export class UserNotificationService { static BASE_NOTIFICATIONS_URL = environment.apiUrl + '/api/v1/users/me/notifications' static BASE_NOTIFICATION_SETTINGS = environment.apiUrl + '/api/v1/users/me/notification-settings' - private socket: SocketIOClient.Socket - constructor ( private auth: AuthService, private authHttp: HttpClient, diff --git a/client/src/app/shared/users/user-notifications.component.html b/client/src/app/shared/users/user-notifications.component.html index 86379d941..caa518e7f 100644 --- a/client/src/app/shared/users/user-notifications.component.html +++ b/client/src/app/shared/users/user-notifications.component.html @@ -1,61 +1,101 @@
You don't have notifications.
-
+
-
+ - {{ notification.video.channel.displayName }} published a new video + + +
+ {{ notification.video.channel.displayName }} published a new video +
- Your video {{ notification.video.name }} has been unblacklisted + + +
+ Your video {{ notification.video.name }} has been unblacklisted +
- Your video {{ notification.videoBlacklist.video.name }} has been blacklisted + + +
+ Your video {{ notification.videoBlacklist.video.name }} has been blacklisted +
- A new video abuse has been created on video {{ notification.videoAbuse.video.name }} + + +
+ A new video abuse has been created on video {{ notification.videoAbuse.video.name }} +
- {{ notification.comment.account.displayName }} commented your video {{ notification.comment.video.name }} + + +
+ {{ notification.comment.account.displayName }} commented your video {{ notification.comment.video.name }} +
- Your video {{ notification.video.name }} has been published + + +
+ Your video {{ notification.video.name }} has been published +
- Your video import {{ notification.videoImportIdentifier }} succeeded + + +
+ Your video import {{ notification.videoImportIdentifier }} succeeded +
- Your video import {{ notification.videoImportIdentifier }} failed + + +
+ Your video import {{ notification.videoImportIdentifier }} failed +
- User {{ notification.account.name }} registered on your instance + + +
+ User {{ notification.account.name }} registered on your instance +
- {{ notification.actorFollow.follower.displayName }} is following + - - your channel {{ notification.actorFollow.following.displayName }} - - your account +
+ {{ notification.actorFollow.follower.displayName }} is following + + your channel {{ notification.actorFollow.following.displayName }} + your account +
- {{ notification.comment.account.displayName }} mentioned you on video {{ notification.comment.video.name }} - -
+ -
-
-
+
+ {{ notification.comment.account.displayName }} mentioned you on video {{ notification.comment.video.name }} +
+ + + +
{{ notification.createdAt | myFromNow }}
diff --git a/client/src/app/shared/users/user-notifications.component.scss b/client/src/app/shared/users/user-notifications.component.scss index 0ae26ea39..315d504c9 100644 --- a/client/src/app/shared/users/user-notifications.component.scss +++ b/client/src/app/shared/users/user-notifications.component.scss @@ -1,3 +1,6 @@ +@import '_variables'; +@import '_mixins'; + .no-notification { display: flex; justify-content: center; @@ -7,31 +10,42 @@ .notification { display: flex; - justify-content: space-between; align-items: center; font-size: inherit; - padding: 15px 10px; + padding: 15px 5px 15px 10px; border-bottom: 1px solid rgba(0, 0, 0, 0.10); - .mark-as-read { - min-width: 35px; - - .glyphicon { - display: none; - cursor: pointer; - color: rgba(20, 20, 20, 0.5) - } - } - &.unread { background-color: rgba(0, 0, 0, 0.05); + } - &:hover .mark-as-read .glyphicon { - display: block; + my-global-icon { + width: 24px; + margin-right: 11px; + margin-left: 3px; - &:hover { - color: rgba(20, 20, 20, 0.8); - } + @include apply-svg-color(#333); + } + + .avatar { + @include avatar(30px); + + margin-right: 10px; + } + + .message { + flex-grow: 1; + + a { + font-weight: $font-semibold; } } + + .from-date { + font-size: 0.85em; + color: $grey-foreground-color; + padding-left: 5px; + min-width: 70px; + text-align: right; + } } diff --git a/client/src/app/shared/users/user-notifications.component.ts b/client/src/app/shared/users/user-notifications.component.ts index e3913ba56..b5f9fd399 100644 --- a/client/src/app/shared/users/user-notifications.component.ts +++ b/client/src/app/shared/users/user-notifications.component.ts @@ -20,11 +20,7 @@ export class UserNotificationsComponent implements OnInit { // So we can access it in the template UserNotificationType = UserNotificationType - componentPagination: ComponentPagination = { - currentPage: 1, - itemsPerPage: this.itemsPerPage, - totalItems: null - } + componentPagination: ComponentPagination constructor ( private userNotificationService: UserNotificationService, @@ -32,6 +28,12 @@ export class UserNotificationsComponent implements OnInit { ) { } ngOnInit () { + this.componentPagination = { + currentPage: 1, + itemsPerPage: this.itemsPerPage, // Reset items per page, because of the @Input() variable + totalItems: null + } + this.loadMoreNotifications() } @@ -58,6 +60,8 @@ export class UserNotificationsComponent implements OnInit { } markAsRead (notification: UserNotification) { + if (notification.read) return + this.userNotificationService.markAsRead(notification) .subscribe( () => { diff --git a/client/src/app/shared/video/feed.component.html b/client/src/app/shared/video/feed.component.html index 16116ba88..f7624ec01 100644 --- a/client/src/app/shared/video/feed.component.html +++ b/client/src/app/shared/video/feed.component.html @@ -1,10 +1,11 @@
- + class="icon-syndication" role="button" iconName="syndication" + > + {{ item.label }} -
\ No newline at end of file +
diff --git a/client/src/app/shared/video/feed.component.scss b/client/src/app/shared/video/feed.component.scss index 385764be0..ed1dc17d3 100644 --- a/client/src/app/shared/video/feed.component.scss +++ b/client/src/app/shared/video/feed.component.scss @@ -1,3 +1,4 @@ +@import '_variables'; @import '_mixins'; .video-feed { @@ -6,14 +7,12 @@ display: block; } - .icon { - @include icon(12px); + my-global-icon { + cursor: pointer; + width: 12px; + position: relative; + top: -2px; - &.icon-syndication { - position: relative; - top: -2px; - background-color: var(--mainForegroundColor); - mask-image: url('../../../assets/images/global/syndication.svg'); - } + @include apply-svg-color(var(--mainForegroundColor)) } -} \ No newline at end of file +} diff --git a/client/src/app/shared/video/video-miniature.component.scss b/client/src/app/shared/video/video-miniature.component.scss index 895879adc..f44bdf9a9 100644 --- a/client/src/app/shared/video/video-miniature.component.scss +++ b/client/src/app/shared/video/video-miniature.component.scss @@ -50,10 +50,10 @@ text-overflow: ellipsis; white-space: nowrap; font-size: 13px; - color: #585858; + color: $grey-foreground-color; &:hover { - color: #303030; + color: $grey-foreground-hover-color; } } } diff --git a/client/src/app/shared/video/video.model.ts b/client/src/app/shared/video/video.model.ts index b92c96450..6ea83d13b 100644 --- a/client/src/app/shared/video/video.model.ts +++ b/client/src/app/shared/video/video.model.ts @@ -53,7 +53,7 @@ export class Video implements VideoServerModel { displayName: string url: string host: string - avatar: Avatar + avatar?: Avatar } channel: { @@ -63,7 +63,7 @@ export class Video implements VideoServerModel { displayName: string url: string host: string - avatar: Avatar + avatar?: Avatar } userHistory?: { diff --git a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html b/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html index 30aefdbfc..19043eee6 100644 --- a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html +++ b/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html @@ -3,7 +3,7 @@

Add caption

- +
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.html b/client/src/app/videos/+video-edit/shared/video-edit.component.html index bd52d686a..092c0e862 100644 --- a/client/src/app/videos/+video-edit/shared/video-edit.component.html +++ b/client/src/app/videos/+video-edit/shared/video-edit.component.html @@ -143,7 +143,7 @@
- + Add another caption
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.scss b/client/src/app/videos/+video-edit/shared/video-edit.component.scss index 25db8e8ed..cc32fb254 100644 --- a/client/src/app/videos/+video-edit/shared/video-edit.component.scss +++ b/client/src/app/videos/+video-edit/shared/video-edit.component.scss @@ -42,7 +42,7 @@ my-peertube-checkbox { text-align: right; .create-caption { - @include create-button('../../../../assets/images/global/add.svg'); + @include create-button; } } @@ -100,13 +100,14 @@ my-peertube-checkbox { display: inline-block; margin-right: 25px; - color: #585858; + color: $grey-foreground-color; font-size: 15px; } .submit-button { @include peertube-button; @include orange-button; + @include button-with-icon(20px, 1px); display: inline-block; @@ -119,16 +120,6 @@ my-peertube-checkbox { color: inherit; font-weight: $font-semibold; } - - .icon.icon-validate { - @include icon(20px); - - cursor: inherit; - position: relative; - top: -1px; - margin-right: 4px; - background-image: url('../../../../assets/images/global/validate.svg'); - } } } @@ -202,7 +193,7 @@ p-calendar { top: -1px; height: auto !important; vertical-align: middle !important; - fill: #585858 !important; + fill: $grey-foreground-color !important; } &:hover { diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html index 11a81ad66..28eb143c9 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html @@ -1,6 +1,6 @@
-
-
+
+
Select the torrent to import @@ -66,7 +66,7 @@ (click)="updateSecondStep()" [ngClass]="{ disabled: !form.valid || isUpdatingVideo === true }" > - +
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.scss b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.scss index 00626cd7b..6d59ed834 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.scss +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.scss @@ -1,45 +1,7 @@ @import 'variables'; @import 'mixins'; -$width-size: 190px; - -.peertube-select-container { - @include peertube-select-container($width-size); -} - -.alert.alert-danger { - text-align: center; - - & > div { - font-weight: $font-semibold; - } -} - -.import-video-torrent { - display: flex; - flex-direction: column; - align-items: center; - - .icon.icon-upload { - @include icon(90px); - margin-bottom: 25px; - cursor: default; - - background-image: url('../../../../assets/images/video/upload.svg'); - } - - .button-file { - @include peertube-button-file(auto); - - min-width: 190px; - } - - .button-file-extension { - display: block; - font-size: 12px; - margin-top: 5px; - } - +.first-step-block { .torrent-or-magnet { margin: 10px 0; } @@ -47,19 +9,6 @@ $width-size: 190px; .form-group-magnet-uri { margin-bottom: 40px; } - - input[type=text] { - @include peertube-input-text($width-size); - display: block; - } - - input[type=button] { - @include peertube-button; - @include orange-button; - - width: $width-size; - margin-top: 30px; - } } diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts index 63db06919..307806bb9 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts @@ -18,7 +18,8 @@ import { scrollToTop } from '@app/shared/misc/utils' templateUrl: './video-import-torrent.component.html', styleUrls: [ '../shared/video-edit.component.scss', - './video-import-torrent.component.scss' + './video-import-torrent.component.scss', + './video-send.scss' ] }) export class VideoImportTorrentComponent extends VideoSend implements OnInit, CanComponentDeactivate { diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html index 533446672..3550c3585 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html @@ -1,6 +1,6 @@
-
-
+
+
@@ -59,7 +59,7 @@ (click)="updateSecondStep()" [ngClass]="{ disabled: !form.valid || isUpdatingVideo === true }" > - +
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts index a1810b7a0..257c6e5db 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts @@ -18,7 +18,7 @@ import { scrollToTop } from '@app/shared/misc/utils' templateUrl: './video-import-url.component.html', styleUrls: [ '../shared/video-edit.component.scss', - './video-import-url.component.scss' + './video-send.scss' ] }) export class VideoImportUrlComponent extends VideoSend implements OnInit, CanComponentDeactivate { diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.scss b/client/src/app/videos/+video-edit/video-add-components/video-send.scss similarity index 57% rename from client/src/app/videos/+video-edit/video-add-components/video-import-url.component.scss rename to client/src/app/videos/+video-edit/video-add-components/video-send.scss index e907edc70..8769dd302 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.scss +++ b/client/src/app/videos/+video-edit/video-add-components/video-send.scss @@ -3,10 +3,6 @@ $width-size: 190px; -.peertube-select-container { - @include peertube-select-container($width-size); -} - .alert.alert-danger { text-align: center; @@ -15,17 +11,20 @@ $width-size: 190px; } } -.import-video-url { +.first-step-block { display: flex; flex-direction: column; align-items: center; - .icon.icon-upload { - @include icon(90px); + .upload-icon { + width: 90px; margin-bottom: 25px; - cursor: default; - background-image: url('../../../../assets/images/video/upload.svg'); + @include apply-svg-color(#C6C6C6); + } + + .peertube-select-container { + @include peertube-select-container($width-size); } input[type=text] { @@ -40,6 +39,16 @@ $width-size: 190px; width: $width-size; margin-top: 30px; } + + .button-file { + @include peertube-button-file(auto); + + min-width: 190px; + } + + .button-file-extension { + display: block; + font-size: 12px; + margin-top: 5px; + } } - - diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html index 826e54d25..b252cd60a 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html +++ b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html @@ -1,6 +1,6 @@
-
-
+
+
Select the file to upload @@ -61,7 +61,7 @@ (click)="updateSecondStep()" [ngClass]="{ disabled: isPublishingButtonDisabled() }" > - +
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss index 4b2c86ae9..8adf8f169 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss +++ b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss @@ -1,47 +1,9 @@ @import 'variables'; @import 'mixins'; -.peertube-select-container { - @include peertube-select-container(190px); -} - -.alert.alert-danger { - text-align: center; - - & > div { - font-weight: $font-semibold; - } -} - -.upload-video { - display: flex; - flex-direction: column; - align-items: center; - - .form-group-channel { - margin-bottom: 20px; - margin-top: 35px; - } - - .icon.icon-upload { - @include icon(90px); - margin-bottom: 25px; - cursor: default; - - background-image: url('../../../../assets/images/video/upload.svg'); - } - - .button-file { - @include peertube-button-file(auto); - - min-width: 190px; - } - - .button-file-extension { - display: block; - font-size: 12px; - margin-top: 5px; - } +.first-step-block .form-group-channel { + margin-bottom: 20px; + margin-top: 35px; } .upload-progress-cancel { diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts index aa40f8781..e4d54b654 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts +++ b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts @@ -20,7 +20,8 @@ import { scrollToTop } from '@app/shared/misc/utils' templateUrl: './video-upload.component.html', styleUrls: [ '../shared/video-edit.component.scss', - './video-upload.component.scss' + './video-upload.component.scss', + './video-send.scss' ] }) export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy, CanComponentDeactivate { diff --git a/client/src/app/videos/+video-edit/video-update.component.html b/client/src/app/videos/+video-edit/video-update.component.html index 0457778c0..4992bb369 100644 --- a/client/src/app/videos/+video-edit/video-update.component.html +++ b/client/src/app/videos/+video-edit/video-update.component.html @@ -13,7 +13,7 @@
- +
diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.scss b/client/src/app/videos/+video-watch/comment/video-comment.component.scss index 84da5727e..731ecbf8f 100644 --- a/client/src/app/videos/+video-watch/comment/video-comment.component.scss +++ b/client/src/app/videos/+video-watch/comment/video-comment.component.scss @@ -41,7 +41,7 @@ } .comment-date { - color: #585858; + color: $grey-foreground-color; margin-left: 10px; } } @@ -69,7 +69,7 @@ .comment-action-reply, .comment-action-delete { - color: #585858; + color: $grey-foreground-color; cursor: pointer; margin-right: 10px; @@ -108,4 +108,4 @@ .root-comment { font-size: 14px; } -} \ No newline at end of file +} diff --git a/client/src/app/videos/+video-watch/modal/video-blacklist.component.html b/client/src/app/videos/+video-watch/modal/video-blacklist.component.html index 83600fa81..1a87bdcd4 100644 --- a/client/src/app/videos/+video-watch/modal/video-blacklist.component.html +++ b/client/src/app/videos/+video-watch/modal/video-blacklist.component.html @@ -1,7 +1,7 @@

Blacklist video

- +
diff --git a/client/src/app/videos/+video-watch/modal/video-download.component.html b/client/src/app/videos/+video-watch/modal/video-download.component.html index f46f92a17..2bb5d6d37 100644 --- a/client/src/app/videos/+video-watch/modal/video-download.component.html +++ b/client/src/app/videos/+video-watch/modal/video-download.component.html @@ -1,7 +1,7 @@

Download video

- +
diff --git a/client/src/app/videos/+video-watch/modal/video-report.component.html b/client/src/app/videos/+video-watch/modal/video-report.component.html index 733c01be0..b9434da26 100644 --- a/client/src/app/videos/+video-watch/modal/video-report.component.html +++ b/client/src/app/videos/+video-watch/modal/video-report.component.html @@ -1,7 +1,7 @@

Report video

- +
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.html b/client/src/app/videos/+video-watch/modal/video-share.component.html index 301f67f2d..9f3c37fe8 100644 --- a/client/src/app/videos/+video-watch/modal/video-share.component.html +++ b/client/src/app/videos/+video-watch/modal/video-share.component.html @@ -1,7 +1,7 @@

Share

- +
diff --git a/client/src/app/videos/+video-watch/modal/video-support.component.html b/client/src/app/videos/+video-watch/modal/video-support.component.html index 00c304709..2a05224a8 100644 --- a/client/src/app/videos/+video-watch/modal/video-support.component.html +++ b/client/src/app/videos/+video-watch/modal/video-support.component.html @@ -1,7 +1,7 @@

Support

- +
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html index 770785d02..709eb91a8 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.html +++ b/client/src/app/videos/+video-watch/video-watch.component.html @@ -53,55 +53,57 @@
- +
- +
- + Support
- + Share
- +
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss index 2586a2204..b03ed197d 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.scss +++ b/client/src/app/videos/+video-watch/video-watch.component.scss @@ -183,6 +183,8 @@ $other-videos-width: 260px; .action-button { @include peertube-button; @include grey-button; + @include button-with-icon(21px, 0, -1px); + @include apply-svg-color($grey-foreground-color); font-size: 15px; font-weight: $font-semibold; @@ -194,53 +196,25 @@ $other-videos-width: 260px; display: none; } - .icon { - @include icon(21px); - - position: relative; - top: -2px; - - &.icon-like { - background-image: url('../../../assets/images/video/like-grey.svg'); - } - - &.icon-dislike { - background-image: url('../../../assets/images/video/dislike-grey.svg'); - } - - &.icon-support { - background-image: url('../../../assets/images/video/heart.svg'); - } - - &.icon-share { - background-image: url('../../../assets/images/video/share.svg'); - } - - &.icon-more { - background-image: url('../../../assets/images/video/more.svg'); - top: -1px; - } - } - - .icon-text { - margin-left: 3px; - } - &.action-button-like.activated { background-color: $green; - .icon-like { - background-image: url('../../../assets/images/video/like-white.svg'); + my-global-icon { + @include apply-svg-color(#fff); } } &.action-button-dislike.activated { background-color: $red; - .icon-dislike { - background-image: url('../../../assets/images/video/dislike-white.svg'); + my-global-icon { + @include apply-svg-color(#fff); } } + + .icon-text { + margin-left: 3px; + } } .action-more { @@ -249,36 +223,12 @@ $other-videos-width: 260px; .dropdown-menu .dropdown-item { padding: 6px 24px; - .icon { - @include icon(24px); + my-global-icon { + width: 24px; margin-right: 10px; position: relative; - top: -1px; - - &.icon-download { - background-image: url('../../../assets/images/video/download-black.svg'); - } - - &.icon-edit { - background-image: url('../../../assets/images/global/edit-black.svg'); - } - - &.icon-alert { - background-image: url('../../../assets/images/video/alert.svg'); - } - - &.icon-blacklist { - background-image: url('../../../assets/images/video/blacklist.svg'); - } - - &.icon-unblacklist { - background-image: url('../../../assets/images/global/undo.svg'); - } - - &.icon-delete { - background-image: url('../../../assets/images/global/delete-black.svg'); - } + top: -2px; } } } @@ -320,7 +270,7 @@ $other-videos-width: 260px; .video-info-description-more { cursor: pointer; font-weight: $font-semibold; - color: #585858; + color: $grey-foreground-color; font-size: 14px; .glyphicon { @@ -339,7 +289,7 @@ $other-videos-width: 260px; min-width: 91px; padding-right: 5px; display: inline-block; - color: #585858; + color: $grey-foreground-color; font-weight: $font-bold; } diff --git a/client/src/assets/images/global/add.svg b/client/src/assets/images/global/add.html similarity index 72% rename from client/src/assets/images/global/add.svg rename to client/src/assets/images/global/add.html index 42b269c43..bfb0a52bc 100644 --- a/client/src/assets/images/global/add.svg +++ b/client/src/assets/images/global/add.html @@ -1,8 +1,6 @@ - - - - + + diff --git a/client/src/assets/images/video/alert.svg b/client/src/assets/images/global/alert.html similarity index 71% rename from client/src/assets/images/video/alert.svg rename to client/src/assets/images/global/alert.html index 5b43534ad..7c8c02074 100644 --- a/client/src/assets/images/video/alert.svg +++ b/client/src/assets/images/global/alert.html @@ -1,11 +1,6 @@ - - - alert - Created with Sketch. - - - + + diff --git a/client/src/assets/images/global/circle-tick.html b/client/src/assets/images/global/circle-tick.html new file mode 100644 index 000000000..2327de6be --- /dev/null +++ b/client/src/assets/images/global/circle-tick.html @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/client/src/assets/images/global/cloud-download.html b/client/src/assets/images/global/cloud-download.html new file mode 100644 index 000000000..b2634fd1f --- /dev/null +++ b/client/src/assets/images/global/cloud-download.html @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/client/src/assets/images/global/cloud-error.html b/client/src/assets/images/global/cloud-error.html new file mode 100644 index 000000000..1a3483805 --- /dev/null +++ b/client/src/assets/images/global/cloud-error.html @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/client/src/assets/images/global/cog.html b/client/src/assets/images/global/cog.html new file mode 100644 index 000000000..b74a180e7 --- /dev/null +++ b/client/src/assets/images/global/cog.html @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/client/src/assets/images/global/cross.svg b/client/src/assets/images/global/cross.html similarity index 63% rename from client/src/assets/images/global/cross.svg rename to client/src/assets/images/global/cross.html index d47a75996..962578487 100644 --- a/client/src/assets/images/global/cross.svg +++ b/client/src/assets/images/global/cross.html @@ -1,8 +1,6 @@ - - - - + + diff --git a/client/src/assets/images/global/delete-black.svg b/client/src/assets/images/global/delete-black.svg deleted file mode 100644 index 04ddc23aa..000000000 --- a/client/src/assets/images/global/delete-black.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/client/src/assets/images/global/delete-grey.svg b/client/src/assets/images/global/delete-grey.svg deleted file mode 100644 index 67e9e2ce7..000000000 --- a/client/src/assets/images/global/delete-grey.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/client/src/assets/images/global/delete-white.svg b/client/src/assets/images/global/delete.html similarity index 71% rename from client/src/assets/images/global/delete-white.svg rename to client/src/assets/images/global/delete.html index 9c52de557..a0d9a0cac 100644 --- a/client/src/assets/images/global/delete-white.svg +++ b/client/src/assets/images/global/delete.html @@ -1,13 +1,11 @@ - - - - + + - - - - + + + + diff --git a/client/src/assets/images/video/download-black.svg b/client/src/assets/images/global/download.html similarity index 64% rename from client/src/assets/images/video/download-black.svg rename to client/src/assets/images/global/download.html index 501836746..259506f31 100644 --- a/client/src/assets/images/video/download-black.svg +++ b/client/src/assets/images/global/download.html @@ -1,11 +1,6 @@ - - - download - Created with Sketch. - - - + + diff --git a/client/src/assets/images/global/edit-black.svg b/client/src/assets/images/global/edit-black.svg deleted file mode 100644 index 0176b0f37..000000000 --- a/client/src/assets/images/global/edit-black.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - edit - Created with Sketch. - - - - - - - - - - diff --git a/client/src/assets/images/global/edit-grey.svg b/client/src/assets/images/global/edit.html similarity index 62% rename from client/src/assets/images/global/edit-grey.svg rename to client/src/assets/images/global/edit.html index 23ece68f1..f04183c2d 100644 --- a/client/src/assets/images/global/edit-grey.svg +++ b/client/src/assets/images/global/edit.html @@ -1,11 +1,6 @@ - - - edit - Created with Sketch. - - - + + diff --git a/client/src/assets/images/global/help.svg b/client/src/assets/images/global/help.html similarity index 84% rename from client/src/assets/images/global/help.svg rename to client/src/assets/images/global/help.html index 48252febe..27e9bee6f 100644 --- a/client/src/assets/images/global/help.svg +++ b/client/src/assets/images/global/help.html @@ -1,12 +1,10 @@ - - - - + + - \ No newline at end of file + diff --git a/client/src/assets/images/global/im-with-her.svg b/client/src/assets/images/global/im-with-her.html similarity index 70% rename from client/src/assets/images/global/im-with-her.svg rename to client/src/assets/images/global/im-with-her.html index 31d4754fd..de2c62e96 100644 --- a/client/src/assets/images/global/im-with-her.svg +++ b/client/src/assets/images/global/im-with-her.html @@ -1,15 +1,10 @@ - - - im-with-her - Created with Sketch. - - - + + - + - \ No newline at end of file + diff --git a/client/src/assets/images/global/no.html b/client/src/assets/images/global/no.html new file mode 100644 index 000000000..bb7b28514 --- /dev/null +++ b/client/src/assets/images/global/no.html @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/client/src/assets/images/global/sparkle.html b/client/src/assets/images/global/sparkle.html new file mode 100644 index 000000000..3b29fefb9 --- /dev/null +++ b/client/src/assets/images/global/sparkle.html @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/client/src/assets/images/global/syndication.svg b/client/src/assets/images/global/syndication.html similarity index 88% rename from client/src/assets/images/global/syndication.svg rename to client/src/assets/images/global/syndication.html index cb74cf81b..e6c88a4db 100644 --- a/client/src/assets/images/global/syndication.svg +++ b/client/src/assets/images/global/syndication.html @@ -1,10 +1,8 @@ - - - - - - + + diff --git a/client/src/assets/images/global/undo.html b/client/src/assets/images/global/undo.html new file mode 100644 index 000000000..228245c86 --- /dev/null +++ b/client/src/assets/images/global/undo.html @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/client/src/assets/images/global/undo.svg b/client/src/assets/images/global/undo.svg deleted file mode 100644 index f1cca03f7..000000000 --- a/client/src/assets/images/global/undo.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/client/src/assets/images/global/user-add.html b/client/src/assets/images/global/user-add.html new file mode 100644 index 000000000..57df23c74 --- /dev/null +++ b/client/src/assets/images/global/user-add.html @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/client/src/assets/images/global/validate.svg b/client/src/assets/images/global/validate.html similarity index 69% rename from client/src/assets/images/global/validate.svg rename to client/src/assets/images/global/validate.html index 5c7ee9d14..520624ff6 100644 --- a/client/src/assets/images/global/validate.svg +++ b/client/src/assets/images/global/validate.html @@ -1,8 +1,6 @@ - - - - + + diff --git a/client/src/assets/images/video/blacklist.svg b/client/src/assets/images/video/blacklist.svg deleted file mode 100644 index 431c73816..000000000 --- a/client/src/assets/images/video/blacklist.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - no - Created with Sketch. - - - - - - - - - - diff --git a/client/src/assets/images/video/dislike-white.svg b/client/src/assets/images/video/dislike-white.svg deleted file mode 100644 index cfc6eaa1f..000000000 --- a/client/src/assets/images/video/dislike-white.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/client/src/assets/images/video/dislike-grey.svg b/client/src/assets/images/video/dislike.html similarity index 77% rename from client/src/assets/images/video/dislike-grey.svg rename to client/src/assets/images/video/dislike.html index 56a7908fb..acde951e2 100644 --- a/client/src/assets/images/video/dislike-grey.svg +++ b/client/src/assets/images/video/dislike.html @@ -1,8 +1,6 @@ - - - - + + diff --git a/client/src/assets/images/video/download-grey.svg b/client/src/assets/images/video/download-grey.svg deleted file mode 100644 index 5b0cca5ef..000000000 --- a/client/src/assets/images/video/download-grey.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - download - Created with Sketch. - - - - - - - - - - - diff --git a/client/src/assets/images/video/download-white.svg b/client/src/assets/images/video/download-white.svg deleted file mode 100644 index 0e66e06e8..000000000 --- a/client/src/assets/images/video/download-white.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - download - Created with Sketch. - - - - - - - - - - - diff --git a/client/src/assets/images/video/heart.svg b/client/src/assets/images/video/heart.html similarity index 66% rename from client/src/assets/images/video/heart.svg rename to client/src/assets/images/video/heart.html index 5d64aee0f..618f64f10 100644 --- a/client/src/assets/images/video/heart.svg +++ b/client/src/assets/images/video/heart.html @@ -1,9 +1,7 @@ - - - - - + + + diff --git a/client/src/assets/images/video/like-white.svg b/client/src/assets/images/video/like-white.svg deleted file mode 100644 index 88e5f6a9a..000000000 --- a/client/src/assets/images/video/like-white.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - thumbs-up - Created with Sketch. - - - - - - - - - - diff --git a/client/src/assets/images/video/like-grey.svg b/client/src/assets/images/video/like.html similarity index 61% rename from client/src/assets/images/video/like-grey.svg rename to client/src/assets/images/video/like.html index 5ef6c7b31..d0e71763b 100644 --- a/client/src/assets/images/video/like-grey.svg +++ b/client/src/assets/images/video/like.html @@ -1,11 +1,6 @@ - - - thumbs-up - Created with Sketch. - - - + + diff --git a/client/src/assets/images/video/more.svg b/client/src/assets/images/video/more.html similarity index 76% rename from client/src/assets/images/video/more.svg rename to client/src/assets/images/video/more.html index dea392136..39dcad10e 100644 --- a/client/src/assets/images/video/more.svg +++ b/client/src/assets/images/video/more.html @@ -1,8 +1,6 @@ - - - - + + diff --git a/client/src/assets/images/video/share.svg b/client/src/assets/images/video/share.html similarity index 62% rename from client/src/assets/images/video/share.svg rename to client/src/assets/images/video/share.html index da0f43e81..7759b37af 100644 --- a/client/src/assets/images/video/share.svg +++ b/client/src/assets/images/video/share.html @@ -1,11 +1,6 @@ - - - share - Created with Sketch. - - - + + diff --git a/client/src/assets/images/header/upload-white.svg b/client/src/assets/images/video/upload.html similarity index 69% rename from client/src/assets/images/header/upload-white.svg rename to client/src/assets/images/video/upload.html index 2b07caf76..3bc0d3a8a 100644 --- a/client/src/assets/images/header/upload-white.svg +++ b/client/src/assets/images/video/upload.html @@ -1,11 +1,6 @@ - - - cloud-upload - Created with Sketch. - - - + + diff --git a/client/src/assets/images/video/upload.svg b/client/src/assets/images/video/upload.svg deleted file mode 100644 index c5b7cb443..000000000 --- a/client/src/assets/images/video/upload.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - cloud-upload - Created with Sketch. - - - - - - - - - - - diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 2356f9837..37837bfc0 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -23,7 +23,7 @@ body { // now beware node-sass requires interpolation // for css custom properties #{$var} --mainColor: #{$orange-color}; - --mainHoverColor: #{$orange-hoover-color}; + --mainHoverColor: #{$orange-hover-color}; --mainBackgroundColor: #{$bg-color}; --mainForegroundColor: #{$fg-color}; --menuBackgroundColor: #{$menu-background}; @@ -229,13 +229,12 @@ label { font-weight: $font-semibold; } - .close { + my-global-icon { @include icon(24px); position: relative; top: 3px; float: right; - background-image: url('../assets/images/global/cross.svg'); margin: 0; padding: 0; @@ -324,7 +323,7 @@ ngb-tabset.bootstrap { table { .action-button-edit, .action-button-delete { &:hover, &:active, &:focus, &[disabled], &.disabled { - background-color: $grey-color !important; + background-color: $grey-background-color !important; } } } @@ -389,4 +388,4 @@ table { } } } -} \ No newline at end of file +} diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index d6f391a45..1da240db8 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -55,6 +55,18 @@ hyphens: auto; } +@mixin apply-svg-color ($color) { + /deep/ svg { + path[fill="#000000"], g[fill="#000000"], rect[fill="#000000"] { + fill: $color; + } + + path[stroke="#000000"], g[stroke="#000000"], rect[stroke="#000000"] { + stroke: $color; + } + } +} + @mixin peertube-input-text($width) { display: inline-block; height: $button-height; @@ -110,22 +122,30 @@ color: #fff; background-color: #C6C6C6; } + + my-global-icon { + @include apply-svg-color(#fff) + } } @mixin grey-button { &, &:active, &:focus { - background-color: $grey-color; - color: #585858; + background-color: $grey-background-color; + color: $grey-foreground-color; } &:hover, &:active, &:focus, &[disabled], &.disabled { - color: #585858; - background-color: $grey-hoover-color; + color: $grey-foreground-color; + background-color: $grey-background-hover-color; } &[disabled], &.disabled { cursor: default; } + + my-global-icon { + @include apply-svg-color($grey-foreground-color) + } } @mixin peertube-button { @@ -148,6 +168,15 @@ @include peertube-button; } +@mixin button-with-icon($width: 20px, $margin-right: 3px, $top: -1px) { + my-global-icon { + position: relative; + width: $width; + margin-right: $margin-right; + top: $top; + } +} + @mixin peertube-button-file ($width) { position: relative; overflow: hidden; @@ -455,18 +484,10 @@ } } -@mixin create-button ($imageUrl) { +@mixin create-button { @include peertube-button-link; @include orange-button; - - .icon.icon-add { - @include icon(20px); - - position: relative; - top: -1px; - margin-right: 5px; - background-image: url($imageUrl); - } + @include button-with-icon(20px, 5px, -1px); } @mixin row-blocks { diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index fdf33b12a..3780b7501 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss @@ -6,10 +6,13 @@ $font-regular: 400; $font-semibold: 600; $font-bold: 700; -$grey-color: #E5E5E5; -$grey-hoover-color: #EFEFEF;; +$grey-background-color: #E5E5E5; +$grey-background-hover-color: #EFEFEF; +$grey-foreground-color: #585858; +$grey-foreground-hover-color: #303030; + $orange-color: #F1680D; -$orange-hoover-color: #F97D46; +$orange-hover-color: #F97D46; $bg-color: #fff; $fg-color: #000; diff --git a/client/yarn.lock b/client/yarn.lock index 5ed43117a..dee67c414 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -552,45 +552,21 @@ "@webassemblyjs/helper-wasm-bytecode" "1.7.10" "@webassemblyjs/wast-parser" "1.7.10" -"@webassemblyjs/ast@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace" - integrity sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA== - dependencies: - "@webassemblyjs/helper-module-context" "1.7.11" - "@webassemblyjs/helper-wasm-bytecode" "1.7.11" - "@webassemblyjs/wast-parser" "1.7.11" - "@webassemblyjs/floating-point-hex-parser@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.10.tgz#ee63d729c6311a85863e369a473f9983f984e4d9" integrity sha512-gMsGbI6I3p/P1xL2UxqhNh1ga2HCsx5VBB2i5VvJFAaqAjd2PBTRULc3BpTydabUQEGlaZCzEUQhLoLG7TvEYQ== -"@webassemblyjs/floating-point-hex-parser@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313" - integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg== - "@webassemblyjs/helper-api-error@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.10.tgz#bfcb3bbe59775357475790a2ad7b289f09b2f198" integrity sha512-DoYRlPWtuw3yd5BOr9XhtrmB6X1enYF0/54yNvQWGXZEPDF5PJVNI7zQ7gkcKfTESzp8bIBWailaFXEK/jjCsw== -"@webassemblyjs/helper-api-error@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a" - integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg== - "@webassemblyjs/helper-buffer@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.10.tgz#0a8c624c67ad0b214d2e003859921a1988cb151b" integrity sha512-+RMU3dt/dPh4EpVX4u5jxsOlw22tp3zjqE0m3ftU2tsYxnPULb4cyHlgaNd2KoWuwasCQqn8Mhr+TTdbtj3LlA== -"@webassemblyjs/helper-buffer@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b" - integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w== - "@webassemblyjs/helper-code-frame@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.10.tgz#0ab7e22fad0241a173178c73976fc0edf50832ce" @@ -598,43 +574,21 @@ dependencies: "@webassemblyjs/wast-printer" "1.7.10" -"@webassemblyjs/helper-code-frame@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b" - integrity sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw== - dependencies: - "@webassemblyjs/wast-printer" "1.7.11" - "@webassemblyjs/helper-fsm@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.10.tgz#0915e7713fbbb735620a9d3e4fa3d7951f97ac64" integrity sha512-w2vDtUK9xeSRtt5+RnnlRCI7wHEvLjF0XdnxJpgx+LJOvklTZPqWkuy/NhwHSLP19sm9H8dWxKeReMR7sCkGZA== -"@webassemblyjs/helper-fsm@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181" - integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A== - "@webassemblyjs/helper-module-context@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.10.tgz#9beb83f72740f5ac8075313b5cac5e796510f755" integrity sha512-yE5x/LzZ3XdPdREmJijxzfrf+BDRewvO0zl8kvORgSWmxpRrkqY39KZSq6TSgIWBxkK4SrzlS3BsMCv2s1FpsQ== -"@webassemblyjs/helper-module-context@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209" - integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg== - "@webassemblyjs/helper-wasm-bytecode@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.10.tgz#797b1e734bbcfdea8399669cdc58308ef1c7ffc0" integrity sha512-u5qy4SJ/OrxKxZqJ9N3qH4ZQgHaAzsopsYwLvoWJY6Q33r8PhT3VPyNMaJ7ZFoqzBnZlCcS/0f4Sp8WBxylXfg== -"@webassemblyjs/helper-wasm-bytecode@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06" - integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ== - "@webassemblyjs/helper-wasm-section@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.10.tgz#c0ea3703c615d7bc3e3507c3b7991c8767b2f20e" @@ -645,16 +599,6 @@ "@webassemblyjs/helper-wasm-bytecode" "1.7.10" "@webassemblyjs/wasm-gen" "1.7.10" -"@webassemblyjs/helper-wasm-section@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a" - integrity sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/helper-buffer" "1.7.11" - "@webassemblyjs/helper-wasm-bytecode" "1.7.11" - "@webassemblyjs/wasm-gen" "1.7.11" - "@webassemblyjs/ieee754@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.10.tgz#62c1728b7ef0f66ef8221e2966a0afd75db430df" @@ -662,13 +606,6 @@ dependencies: "@xtuc/ieee754" "^1.2.0" -"@webassemblyjs/ieee754@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b" - integrity sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ== - dependencies: - "@xtuc/ieee754" "^1.2.0" - "@webassemblyjs/leb128@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.10.tgz#167e0bb4b06d7701585772a73fba9f4df85439f6" @@ -676,23 +613,11 @@ dependencies: "@xtuc/long" "4.2.1" -"@webassemblyjs/leb128@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63" - integrity sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw== - dependencies: - "@xtuc/long" "4.2.1" - "@webassemblyjs/utf8@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.10.tgz#b6728f5b6f50364abc155be029f9670e6685605a" integrity sha512-Ng6Pxv6siyZp635xCSnH3mKmIFgqWPCcGdoo0GBYgyGdxu7cUj4agV7Uu1a8REP66UYUFXJLudeGgd4RvuJAnQ== -"@webassemblyjs/utf8@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82" - integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA== - "@webassemblyjs/wasm-edit@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.10.tgz#83fe3140f5a58f5a30b914702be9f0e59a399092" @@ -707,20 +632,6 @@ "@webassemblyjs/wasm-parser" "1.7.10" "@webassemblyjs/wast-printer" "1.7.10" -"@webassemblyjs/wasm-edit@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005" - integrity sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/helper-buffer" "1.7.11" - "@webassemblyjs/helper-wasm-bytecode" "1.7.11" - "@webassemblyjs/helper-wasm-section" "1.7.11" - "@webassemblyjs/wasm-gen" "1.7.11" - "@webassemblyjs/wasm-opt" "1.7.11" - "@webassemblyjs/wasm-parser" "1.7.11" - "@webassemblyjs/wast-printer" "1.7.11" - "@webassemblyjs/wasm-gen@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.10.tgz#4de003806ae29c97ab3707782469b53299570174" @@ -732,17 +643,6 @@ "@webassemblyjs/leb128" "1.7.10" "@webassemblyjs/utf8" "1.7.10" -"@webassemblyjs/wasm-gen@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8" - integrity sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/helper-wasm-bytecode" "1.7.11" - "@webassemblyjs/ieee754" "1.7.11" - "@webassemblyjs/leb128" "1.7.11" - "@webassemblyjs/utf8" "1.7.11" - "@webassemblyjs/wasm-opt@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.10.tgz#d151e31611934a556c82789fdeec41a814993c2a" @@ -753,16 +653,6 @@ "@webassemblyjs/wasm-gen" "1.7.10" "@webassemblyjs/wasm-parser" "1.7.10" -"@webassemblyjs/wasm-opt@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7" - integrity sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/helper-buffer" "1.7.11" - "@webassemblyjs/wasm-gen" "1.7.11" - "@webassemblyjs/wasm-parser" "1.7.11" - "@webassemblyjs/wasm-parser@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.10.tgz#0367be7bf8f09e3e6abc95f8e483b9206487ec65" @@ -775,18 +665,6 @@ "@webassemblyjs/leb128" "1.7.10" "@webassemblyjs/utf8" "1.7.10" -"@webassemblyjs/wasm-parser@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a" - integrity sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/helper-api-error" "1.7.11" - "@webassemblyjs/helper-wasm-bytecode" "1.7.11" - "@webassemblyjs/ieee754" "1.7.11" - "@webassemblyjs/leb128" "1.7.11" - "@webassemblyjs/utf8" "1.7.11" - "@webassemblyjs/wast-parser@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.10.tgz#058f598b52f730b23fc874d4775b6286b6247264" @@ -799,18 +677,6 @@ "@webassemblyjs/helper-fsm" "1.7.10" "@xtuc/long" "4.2.1" -"@webassemblyjs/wast-parser@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c" - integrity sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/floating-point-hex-parser" "1.7.11" - "@webassemblyjs/helper-api-error" "1.7.11" - "@webassemblyjs/helper-code-frame" "1.7.11" - "@webassemblyjs/helper-fsm" "1.7.11" - "@xtuc/long" "4.2.1" - "@webassemblyjs/wast-printer@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.10.tgz#d817909d2450ae96c66b7607624d98a33b84223b" @@ -820,15 +686,6 @@ "@webassemblyjs/wast-parser" "1.7.10" "@xtuc/long" "4.2.1" -"@webassemblyjs/wast-printer@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813" - integrity sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/wast-parser" "1.7.11" - "@xtuc/long" "4.2.1" - "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -10524,36 +10381,6 @@ webpack@4.23.1: watchpack "^1.5.0" webpack-sources "^1.3.0" -webpack@^4.17.1: - version "4.26.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.26.1.tgz#ff3a9283d363c07b3494dfa702d08f4f2ef6cb39" - integrity sha512-i2oOvEvuvLLSuSCkdVrknaxAhtUZ9g+nLSoHCWV0gDzqGX2DXaCrMmMUpbRsTSSLrUqAI56PoEiyMUZIZ1msug== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/helper-module-context" "1.7.11" - "@webassemblyjs/wasm-edit" "1.7.11" - "@webassemblyjs/wasm-parser" "1.7.11" - acorn "^5.6.2" - acorn-dynamic-import "^3.0.0" - ajv "^6.1.0" - ajv-keywords "^3.1.0" - chrome-trace-event "^1.0.0" - enhanced-resolve "^4.1.0" - eslint-scope "^4.0.0" - json-parse-better-errors "^1.0.2" - loader-runner "^2.3.0" - loader-utils "^1.1.0" - memory-fs "~0.4.1" - micromatch "^3.1.8" - mkdirp "~0.5.0" - neo-async "^2.5.0" - node-libs-browser "^2.0.0" - schema-utils "^0.4.4" - tapable "^1.1.0" - terser-webpack-plugin "^1.1.0" - watchpack "^1.5.0" - webpack-sources "^1.3.0" - websocket-driver@>=0.5.1: version "0.7.0" resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb" diff --git a/server/models/account/user-notification.ts b/server/models/account/user-notification.ts index 9e4f982a3..1094eec78 100644 --- a/server/models/account/user-notification.ts +++ b/server/models/account/user-notification.ts @@ -27,11 +27,27 @@ import { VideoBlacklistModel } from '../video/video-blacklist' import { VideoImportModel } from '../video/video-import' import { ActorModel } from '../activitypub/actor' import { ActorFollowModel } from '../activitypub/actor-follow' +import { AvatarModel } from '../avatar/avatar' enum ScopeNames { WITH_ALL = 'WITH_ALL' } +function buildActorWithAvatarInclude () { + return { + attributes: [ 'preferredUsername' ], + model: () => ActorModel.unscoped(), + required: true, + include: [ + { + attributes: [ 'filename' ], + model: () => AvatarModel.unscoped(), + required: false + } + ] + } +} + function buildVideoInclude (required: boolean) { return { attributes: [ 'id', 'uuid', 'name' ], @@ -40,19 +56,21 @@ function buildVideoInclude (required: boolean) { } } -function buildChannelInclude (required: boolean) { +function buildChannelInclude (required: boolean, withActor = false) { return { required, attributes: [ 'id', 'name' ], - model: () => VideoChannelModel.unscoped() + model: () => VideoChannelModel.unscoped(), + include: withActor === true ? [ buildActorWithAvatarInclude() ] : [] } } -function buildAccountInclude (required: boolean) { +function buildAccountInclude (required: boolean, withActor = false) { return { required, attributes: [ 'id', 'name' ], - model: () => AccountModel.unscoped() + model: () => AccountModel.unscoped(), + include: withActor === true ? [ buildActorWithAvatarInclude() ] : [] } } @@ -60,47 +78,40 @@ function buildAccountInclude (required: boolean) { [ScopeNames.WITH_ALL]: { include: [ Object.assign(buildVideoInclude(false), { - include: [ buildChannelInclude(true) ] + include: [ buildChannelInclude(true, true) ] }), + { attributes: [ 'id', 'originCommentId' ], model: () => VideoCommentModel.unscoped(), required: false, include: [ - buildAccountInclude(true), + buildAccountInclude(true, true), buildVideoInclude(true) ] }, + { attributes: [ 'id' ], model: () => VideoAbuseModel.unscoped(), required: false, include: [ buildVideoInclude(true) ] }, + { attributes: [ 'id' ], model: () => VideoBlacklistModel.unscoped(), required: false, include: [ buildVideoInclude(true) ] }, + { attributes: [ 'id', 'magnetUri', 'targetUrl', 'torrentName' ], model: () => VideoImportModel.unscoped(), required: false, include: [ buildVideoInclude(false) ] }, - { - attributes: [ 'id', 'name' ], - model: () => AccountModel.unscoped(), - required: false, - include: [ - { - attributes: [ 'id', 'preferredUsername' ], - model: () => ActorModel.unscoped(), - required: true - } - ] - }, + { attributes: [ 'id' ], model: () => ActorFollowModel.unscoped(), @@ -111,7 +122,18 @@ function buildAccountInclude (required: boolean) { model: () => ActorModel.unscoped(), required: true, as: 'ActorFollower', - include: [ buildAccountInclude(true) ] + include: [ + { + attributes: [ 'id', 'name' ], + model: () => AccountModel.unscoped(), + required: true + }, + { + attributes: [ 'filename' ], + model: () => AvatarModel.unscoped(), + required: false + } + ] }, { attributes: [ 'preferredUsername' ], @@ -124,7 +146,9 @@ function buildAccountInclude (required: boolean) { ] } ] - } + }, + + buildAccountInclude(false, true) ] } }) @@ -132,10 +156,63 @@ function buildAccountInclude (required: boolean) { tableName: 'userNotification', indexes: [ { - fields: [ 'videoId' ] + fields: [ 'userId' ] }, { - fields: [ 'commentId' ] + fields: [ 'videoId' ], + where: { + videoId: { + [Op.ne]: null + } + } + }, + { + fields: [ 'commentId' ], + where: { + commentId: { + [Op.ne]: null + } + } + }, + { + fields: [ 'videoAbuseId' ], + where: { + videoAbuseId: { + [Op.ne]: null + } + } + }, + { + fields: [ 'videoBlacklistId' ], + where: { + videoBlacklistId: { + [Op.ne]: null + } + } + }, + { + fields: [ 'videoImportId' ], + where: { + videoImportId: { + [Op.ne]: null + } + } + }, + { + fields: [ 'accountId' ], + where: { + accountId: { + [Op.ne]: null + } + } + }, + { + fields: [ 'actorFollowId' ], + where: { + actorFollowId: { + [Op.ne]: null + } + } } ] }) @@ -297,12 +374,9 @@ export class UserNotificationModel extends Model { } toFormattedJSON (): UserNotification { - const video = this.Video ? Object.assign(this.formatVideo(this.Video), { - channel: { - id: this.Video.VideoChannel.id, - displayName: this.Video.VideoChannel.getDisplayName() - } - }) : undefined + const video = this.Video + ? Object.assign(this.formatVideo(this.Video),{ channel: this.formatActor(this.Video.VideoChannel) }) + : undefined const videoImport = this.VideoImport ? { id: this.VideoImport.id, @@ -315,10 +389,7 @@ export class UserNotificationModel extends Model { const comment = this.Comment ? { id: this.Comment.id, threadId: this.Comment.getThreadId(), - account: { - id: this.Comment.Account.id, - displayName: this.Comment.Account.getDisplayName() - }, + account: this.formatActor(this.Comment.Account), video: this.formatVideo(this.Comment.Video) } : undefined @@ -332,17 +403,15 @@ export class UserNotificationModel extends Model { video: this.formatVideo(this.VideoBlacklist.Video) } : undefined - const account = this.Account ? { - id: this.Account.id, - displayName: this.Account.getDisplayName(), - name: this.Account.Actor.preferredUsername - } : undefined + const account = this.Account ? this.formatActor(this.Account) : undefined const actorFollow = this.ActorFollow ? { id: this.ActorFollow.id, follower: { + id: this.ActorFollow.ActorFollower.Account.id, displayName: this.ActorFollow.ActorFollower.Account.getDisplayName(), - name: this.ActorFollow.ActorFollower.preferredUsername + name: this.ActorFollow.ActorFollower.preferredUsername, + avatar: this.ActorFollow.ActorFollower.Avatar ? { path: this.ActorFollow.ActorFollower.Avatar.getWebserverPath() } : undefined }, following: { type: this.ActorFollow.ActorFollowing.VideoChannel ? 'channel' as 'channel' : 'account' as 'account', @@ -374,4 +443,17 @@ export class UserNotificationModel extends Model { name: video.name } } + + private formatActor (accountOrChannel: AccountModel | VideoChannelModel) { + const avatar = accountOrChannel.Actor.Avatar + ? { path: accountOrChannel.Actor.Avatar.getWebserverPath() } + : undefined + + return { + id: accountOrChannel.id, + displayName: accountOrChannel.getDisplayName(), + name: accountOrChannel.Actor.preferredUsername, + avatar + } + } } diff --git a/shared/models/actors/actor.model.ts b/shared/models/actors/actor.model.ts index 6b3b1b47c..a3953874d 100644 --- a/shared/models/actors/actor.model.ts +++ b/shared/models/actors/actor.model.ts @@ -10,5 +10,5 @@ export interface Actor { followersCount: number createdAt: Date | string updatedAt: Date | string - avatar: Avatar + avatar?: Avatar } diff --git a/shared/models/users/user-notification.model.ts b/shared/models/users/user-notification.model.ts index f41b6f534..eaeb422df 100644 --- a/shared/models/users/user-notification.model.ts +++ b/shared/models/users/user-notification.model.ts @@ -22,16 +22,22 @@ export interface VideoInfo { name: string } +export interface ActorInfo { + id: number + displayName: string + name: string + avatar?: { + path: string + } +} + export interface UserNotification { id: number type: UserNotificationType read: boolean video?: VideoInfo & { - channel: { - id: number - displayName: string - } + channel: ActorInfo } videoImport?: { @@ -45,10 +51,7 @@ export interface UserNotification { comment?: { id: number threadId: number - account: { - id: number - displayName: string - } + account: ActorInfo video: VideoInfo } @@ -62,18 +65,11 @@ export interface UserNotification { video: VideoInfo } - account?: { - id: number - displayName: string - name: string - } + account?: ActorInfo actorFollow?: { id: number - follower: { - name: string - displayName: string - } + follower: ActorInfo following: { type: 'account' | 'channel' name: string diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts index 4a9fa58b1..022876a0b 100644 --- a/shared/models/videos/video.model.ts +++ b/shared/models/videos/video.model.ts @@ -24,7 +24,7 @@ export interface VideoChannelAttribute { displayName: string url: string host: string - avatar: Avatar + avatar?: Avatar } export interface AccountAttribute { @@ -34,7 +34,7 @@ export interface AccountAttribute { displayName: string url: string host: string - avatar: Avatar + avatar?: Avatar } export interface Video { From 17bb716bc49b30cc8f22e32f73b9b53ab9ae560d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 17 Jan 2019 11:16:08 +0100 Subject: [PATCH 115/137] Fix some styles Video edit tags, dropdown actions font ... --- client/src/app/header/header.component.scss | 1 + .../app/shared/buttons/button.component.scss | 1 - .../shared/video-edit.component.scss | 13 ++--- client/src/sass/include/_mixins.scss | 1 + client/src/sass/primeng-custom.scss | 55 +++++++++++-------- 5 files changed, 41 insertions(+), 30 deletions(-) diff --git a/client/src/app/header/header.component.scss b/client/src/app/header/header.component.scss index cdc457b96..cea415d9b 100644 --- a/client/src/app/header/header.component.scss +++ b/client/src/app/header/header.component.scss @@ -6,6 +6,7 @@ padding-left: 10px; margin-right: 15px; padding-right: 40px; // For the search icon + font-size: 14px; &::placeholder { color: var(--inputPlaceholderColor); diff --git a/client/src/app/shared/buttons/button.component.scss b/client/src/app/shared/buttons/button.component.scss index be41669cd..04199a2a9 100644 --- a/client/src/app/shared/buttons/button.component.scss +++ b/client/src/app/shared/buttons/button.component.scss @@ -5,7 +5,6 @@ @include peertube-button-link; @include button-with-icon(21px, 0, -2px); - font-size: 15px; font-weight: $font-semibold; color: $grey-foreground-color; background-color: $grey-background-color; diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.scss b/client/src/app/videos/+video-edit/shared/video-edit.component.scss index cc32fb254..bb775cb0a 100644 --- a/client/src/app/videos/+video-edit/shared/video-edit.component.scss +++ b/client/src/app/videos/+video-edit/shared/video-edit.component.scss @@ -23,10 +23,6 @@ my-peertube-checkbox { display: block; } - input, select { - font-size: 15px - } - .label-tags + span { font-size: 15px; } @@ -167,10 +163,10 @@ p-calendar { } tag { - background-color: var(--inputColor) !important; + background-color: $grey-background-color !important; + color: #000 !important; border-radius: 3px !important; font-size: 15px !important; - color: var(--mainForegroundColor) !important; height: 30px !important; line-height: 30px !important; margin: 0 5px 0 0 !important; @@ -193,7 +189,10 @@ p-calendar { top: -1px; height: auto !important; vertical-align: middle !important; - fill: $grey-foreground-color !important; + + path { + fill: $grey-foreground-color !important; + } } &:hover { diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 1da240db8..8749649d3 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -76,6 +76,7 @@ border-radius: 3px; padding-left: 15px; padding-right: 15px; + font-size: 15px; &::placeholder { color: var(--inputPlaceholderColor); diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 6057b1db0..7ba011180 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -263,33 +263,40 @@ p-calendar .ui-datepicker { } } +.ui-chkbox { -.ui-chkbox-box { - &.ui-state-active { - border-color: var(--mainColor) !important; - background-color: var(--mainColor) !important; + &, .ui-chkbox-box { + width: 18px !important; + height: 18px !important; } - .ui-chkbox-icon { - position: relative; - overflow: visible !important; - - &:after { - content: ''; - position: absolute; - top: 1px; - left: 7px; - width: 5px; - height: 13px; - opacity: 0; - transform: rotate(45deg) scale(0); - border-right: 2px solid var(--mainBackgroundColor); - border-bottom: 2px solid var(--mainBackgroundColor); + .ui-chkbox-box { + &.ui-state-active { + border-color: var(--mainColor) !important; + background-color: var(--mainColor) !important; } - &.pi-check:after { - opacity: 1; - transform: rotate(45deg) scale(1); + .ui-chkbox-icon { + position: relative; + overflow: visible !important; + + &:after { + content: ''; + position: absolute; + top: 1px; + left: 6px; + width: 5px; + height: 12px; + opacity: 0; + transform: rotate(45deg) scale(0); + border-right: 2px solid var(--mainBackgroundColor); + border-bottom: 2px solid var(--mainBackgroundColor); + } + + &.pi-check:after { + opacity: 1; + transform: rotate(45deg) scale(1); + } } } } @@ -354,3 +361,7 @@ p-toast { } } } + +.ui-widget { + font-family: $main-fonts !important; +} From dc094603cd9eccce3243a6b6ccec3416491f59d2 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 17 Jan 2019 11:23:40 +0100 Subject: [PATCH 116/137] Fix tests --- shared/utils/server/servers.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/shared/utils/server/servers.ts b/shared/utils/server/servers.ts index 1e9c83c72..cb57e0a69 100644 --- a/shared/utils/server/servers.ts +++ b/shared/utils/server/servers.ts @@ -146,7 +146,11 @@ function runServer (serverNumber: number, configOverride?: Object, args = []) { server.app.stdout.removeListener('data', onStdout) - process.on('exit', () => process.kill(server.app.pid)) + process.on('exit', () => { + try { + process.kill(server.app.pid) + } catch { /* empty */ } + }) res(server) }) From f2fab901df31a0e7081f4bb225f28e98798950b0 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 17 Jan 2019 11:30:47 +0100 Subject: [PATCH 117/137] Fix invisible things in dark mode --- client/src/app/shared/misc/help.component.scss | 10 ++++++---- client/src/assets/images/global/help.html | 4 ++-- client/src/sass/application.scss | 4 ++++ client/src/sass/include/_mixins.scss | 4 ++-- client/src/sass/primeng-custom.scss | 8 ++++++-- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/client/src/app/shared/misc/help.component.scss b/client/src/app/shared/misc/help.component.scss index 4565d457a..3898f3cda 100644 --- a/client/src/app/shared/misc/help.component.scss +++ b/client/src/app/shared/misc/help.component.scss @@ -10,6 +10,8 @@ position: relative; top: -2px; margin: 5px; + + @include apply-svg-color(var(--mainForegroundColor)) } } @@ -18,15 +20,15 @@ max-width: 300px; .popover-body { + font-family: $main-fonts; text-align: left; padding: 10px; font-size: 13px; - font-family: $main-fonts; - background-color: #fff; - color: #000; + background-color: var(--mainBackgroundColor); + color: var(--mainForegroundColor); box-shadow: 0 0 6px rgba(0, 0, 0, 0.5); - p:last-child { + p { margin-bottom: 0; } diff --git a/client/src/assets/images/global/help.html b/client/src/assets/images/global/help.html index 27e9bee6f..80cd40321 100644 --- a/client/src/assets/images/global/help.html +++ b/client/src/assets/images/global/help.html @@ -2,8 +2,8 @@ - - + + diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 37837bfc0..783464f86 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -290,6 +290,10 @@ ngb-tabset.bootstrap { @include disable-default-a-behaviour; color: var(--mainForegroundColor) !important; + + &.active { + color: #000 !important; + } } } } diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 8749649d3..5b3346508 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -57,11 +57,11 @@ @mixin apply-svg-color ($color) { /deep/ svg { - path[fill="#000000"], g[fill="#000000"], rect[fill="#000000"] { + path[fill="#000000"], g[fill="#000000"], rect[fill="#000000"], circle[fill="#000000"] { fill: $color; } - path[stroke="#000000"], g[stroke="#000000"], rect[stroke="#000000"] { + path[stroke="#000000"], g[stroke="#000000"], rect[stroke="#000000"], circle[stroke="#000000"] { stroke: $color; } } diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 7ba011180..b3aac9d16 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -14,7 +14,7 @@ p-table { .ui-table-caption { border: none !important; - background-color: #fff !important; + background-color: var(--mainBackgroundColor) !important; .caption { height: 40px; @@ -24,7 +24,7 @@ p-table { } th { - background-color: #fff !important; + background-color: var(--mainBackgroundColor) !important; outline: 0; } @@ -122,10 +122,14 @@ p-table { &.pi-sort-up { @extend .glyphicon-triangle-top; + + color: var(--mainForegroundColor) !important; } &.pi-sort-down { @extend .glyphicon-triangle-bottom; + + color: var(--mainForegroundColor) !important; } } } From aa87909287c4f4d38696244e32828265b040c7d5 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 17 Jan 2019 11:51:08 +0100 Subject: [PATCH 118/137] Fix calendar in dark mode --- client/src/app/menu/avatar-notification.component.scss | 2 +- client/src/sass/application.scss | 8 ++++---- client/src/sass/include/_mixins.scss | 4 ++++ client/src/sass/primeng-custom.scss | 8 +++++++- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/client/src/app/menu/avatar-notification.component.scss b/client/src/app/menu/avatar-notification.component.scss index f6242eeae..a21e7beac 100644 --- a/client/src/app/menu/avatar-notification.component.scss +++ b/client/src/app/menu/avatar-notification.component.scss @@ -73,7 +73,7 @@ justify-content: center; background-color: var(--mainColor); - color: var(--mainBackgroundColor); + color: var(#fff); font-size: 10px; font-weight: $font-semibold; diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 783464f86..478737a43 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -290,12 +290,12 @@ ngb-tabset.bootstrap { @include disable-default-a-behaviour; color: var(--mainForegroundColor) !important; - - &.active { - color: #000 !important; - } } } + + .nav-pills .nav-link.active { + color: #000 !important; + } } .nav-tabs .nav-link.active { diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 5b3346508..e18e9ae9d 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -261,6 +261,10 @@ color: transparent; text-shadow: 0 0 0 #000; } + + option { + color: #000; + } } } diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index b3aac9d16..6e502b028 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -197,7 +197,7 @@ p-table { height: auto !important; a { - color: #000 !important; + color: var(--mainForegroundColor) !important; font-weight: $font-semibold !important; margin: 0 5px !important; outline: 0 !important; @@ -234,6 +234,7 @@ p-calendar .ui-datepicker { @extend .glyphicon-chevron-right; @include glyphicon-light; + color: #000 !important; text-align: right; .pi.pi-chevron-right { @@ -245,6 +246,7 @@ p-calendar .ui-datepicker { @extend .glyphicon-chevron-left; @include glyphicon-light; + color: #000 !important; text-align: left; .pi.pi-chevron-left { @@ -258,11 +260,15 @@ p-calendar .ui-datepicker { .pi.pi-chevron-up { @extend .glyphicon-chevron-up; @include glyphicon-light; + + color: #000 !important; } .pi.pi-chevron-down { @extend .glyphicon-chevron-down; @include glyphicon-light; + + color: #000 !important; } } } From ef04ae20fe4155f516ab41959e312de093f98d0e Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 17 Jan 2019 14:03:32 +0100 Subject: [PATCH 119/137] Prefer avg_frame_rate to fetch video FPS --- server/helpers/ffmpeg-utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/helpers/ffmpeg-utils.ts b/server/helpers/ffmpeg-utils.ts index c7296054d..132f4690e 100644 --- a/server/helpers/ffmpeg-utils.ts +++ b/server/helpers/ffmpeg-utils.ts @@ -41,7 +41,7 @@ async function getVideoFileResolution (path: string) { async function getVideoFileFPS (path: string) { const videoStream = await getVideoFileStream(path) - for (const key of [ 'r_frame_rate' , 'avg_frame_rate' ]) { + for (const key of [ 'avg_frame_rate', 'r_frame_rate' ]) { const valuesText: string = videoStream[key] if (!valuesText) continue From b3079978d2a72215644bfcd34448286c02216a0e Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 17 Jan 2019 15:02:30 +0100 Subject: [PATCH 120/137] Prepare changelog --- CHANGELOG.md | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b733e4b6..e1de6280c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,94 @@ # Changelog +## v1.2.0-rc.1 + +### BREAKING CHANGES + + * **Docker:** `PEERTUBE_TRUST_PROXY` env variable is now an array ([LecygneNoir](https://github.com/LecygneNoir)) + * **nginx:** Add redundancy endpoint in static file. **You should add it your nginx configuration: https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/production.md#nginx** + * Moderators can manage users now (add/delete/update/block) + * Add `tmp` and `redundancy` directories in configuration file. **You should configure them in your production.yaml** + +### Maintenance + + * Check free storage before upgrading in upgrade script ([@Nutomic](https://github.com/nutomic)) + * Explain that PeerTube must be stopped before running prune storage script + * Add some security directives in the systemd unit configuration file ([@rigelk](https://github.com/rigelk) & [@mkoppmann](https://github.com/mkoppmann)) + * Update FreeBSD startup script ([@gegeweb](https://github.com/gegeweb)) + +### Docker + + * Patch docker entrypoint to speed up the chown at startup ([LecygneNoir](https://github.com/LecygneNoir)) + +### Features + + * Add user notifications: + * Notification types: + * Comment on my video + * New video from my subscriptions + * New video abuses (for moderators) + * Blacklist/Unblacklist on my video + * Video import finished (error or success) + * Pending video published (after transcoding or a scheduled update) + * My account or one of my channel has a new follower + * Someone (except muted accounts) mentioned me in comments + * A user registered on the instance (for moderators) + * Notification actions: + * Add a web notification + * Send an english email + * Add contact form in about page (**enabled by default**) + * Add ability to unfederate a local video in blacklist modal (**checkbox checked by default**) + * Add Russian, Polish and Italian languages + * Support additional video extensions if transcoding is enabled (**enabled by default**) + * Redirect to the last url on login + * Add ability to automatically set the video caption in URL. Example: https://peertube2.cpy.re/videos/watch/9c9de5e8-0a1e-484a-b099-e80766180a6d?subtitle=ru + * Add ability to disable, clear and list user videos history + * Automatically enabled the last selected caption when watching a video + * Add a button to help to translate peertube + * Add text in the report modal to explain whom the report will be sent + * Open my account menu entries on hover + * Explain what features are enabled on the instance in the about page + * Add an error message in the forgot password modal if the instance email system is not configured + * Add sitemap + * Add well known url to change password ([@rigelk](https://github.com/rigelk)) + * Remove 8GB video upload limit on client side. There may still be such limit depending on the reverse proxy configuration ([@scanlime](https://github.com/scanlime)) + * Add CSP ([@rigelk](https://github.com/rigelk) & [@Nutomic](https://github.com/nutomic)) + * Update title and description HTML tags when rendering video HTML page + * Add webfinger support for remote follows ([@acid-chicken](https://github.com/acid-chicken)) + * Add tooltip to explain how the trending algorithm works ([@auberanger](https://github.com/auberanger)) + * Warn users when they want to delete a channel because they will not be able to create another channel with the same actor name + * Warn users when they leave the video upload/update (on page refresh/tab close) + * Set max username, user display name, channel name and channel display name lengths to 50 characters ([@McFlat](https://github.com/mcflat)) + * Increase video abuse length to 3000 characters + * Add totalLocalVideoFilesSize in the stats endpoint + +## Bug fixes + + * Fix the addition of captions to a video + * Fix federation of some videos + * Fix NSFW blur on search + * Add error message when trying to upload .ass subtitles + * Fix default homepage in the progressive web application + * Don't crash on queue error + * Fix EXDEV if you have multiple mount points + * Fix broken audio with transcoding with some videos + * Fix crash on getVideoFileStream issue + * Fix followers search + * Remove trailing `/` in CLI import script ([@HesioZ](https://github.com/HesioZ/)) + * Use origin video url in canonical tag + * Fix captions in HTTP fallback + * Automatically refresh remote actors to fix deleted remote actors that are still displayed on some instances + * Add missing translations in embed template + * Fix some styling issues in dark mode + * Fix transcoding issues with some videos + + ## v1.1.0 ***Since v1.0.1*** ### BREAKING CHANGES + * **Docker:** `PEERTUBE_TRUST_PROXY` env variable is now an array ([LecygneNoir](https://github.com/LecygneNoir)) ### Maintenance From 4d7d240c73e3746b184b67cfcbb1c813a2977fb3 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 17 Jan 2019 15:10:18 +0100 Subject: [PATCH 121/137] Typos --- CHANGELOG.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1de6280c..440d1fbcf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,14 +5,14 @@ ### BREAKING CHANGES * **Docker:** `PEERTUBE_TRUST_PROXY` env variable is now an array ([LecygneNoir](https://github.com/LecygneNoir)) - * **nginx:** Add redundancy endpoint in static file. **You should add it your nginx configuration: https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/production.md#nginx** + * **nginx:** Add redundancy endpoint in static file. **You should add it in your nginx configuration: https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/production.md#nginx** * Moderators can manage users now (add/delete/update/block) * Add `tmp` and `redundancy` directories in configuration file. **You should configure them in your production.yaml** ### Maintenance * Check free storage before upgrading in upgrade script ([@Nutomic](https://github.com/nutomic)) - * Explain that PeerTube must be stopped before running prune storage script + * Explain that PeerTube must be stopped in prune storage script * Add some security directives in the systemd unit configuration file ([@rigelk](https://github.com/rigelk) & [@mkoppmann](https://github.com/mkoppmann)) * Update FreeBSD startup script ([@gegeweb](https://github.com/gegeweb)) @@ -22,6 +22,7 @@ ### Features + * Add Russian, Polish and Italian languages * Add user notifications: * Notification types: * Comment on my video @@ -38,14 +39,13 @@ * Send an english email * Add contact form in about page (**enabled by default**) * Add ability to unfederate a local video in blacklist modal (**checkbox checked by default**) - * Add Russian, Polish and Italian languages * Support additional video extensions if transcoding is enabled (**enabled by default**) * Redirect to the last url on login * Add ability to automatically set the video caption in URL. Example: https://peertube2.cpy.re/videos/watch/9c9de5e8-0a1e-484a-b099-e80766180a6d?subtitle=ru + * Automatically enable the last selected caption when watching a video * Add ability to disable, clear and list user videos history - * Automatically enabled the last selected caption when watching a video * Add a button to help to translate peertube - * Add text in the report modal to explain whom the report will be sent + * Add text in the report modal to explain to whom the report will be sent * Open my account menu entries on hover * Explain what features are enabled on the instance in the about page * Add an error message in the forgot password modal if the instance email system is not configured @@ -56,9 +56,9 @@ * Update title and description HTML tags when rendering video HTML page * Add webfinger support for remote follows ([@acid-chicken](https://github.com/acid-chicken)) * Add tooltip to explain how the trending algorithm works ([@auberanger](https://github.com/auberanger)) - * Warn users when they want to delete a channel because they will not be able to create another channel with the same actor name + * Warn users when they want to delete a channel because they will not be able to create another channel with the same name * Warn users when they leave the video upload/update (on page refresh/tab close) - * Set max username, user display name, channel name and channel display name lengths to 50 characters ([@McFlat](https://github.com/mcflat)) + * Set max user name, user display name, channel name and channel display name lengths to 50 characters ([@McFlat](https://github.com/mcflat)) * Increase video abuse length to 3000 characters * Add totalLocalVideoFilesSize in the stats endpoint @@ -70,15 +70,15 @@ * Add error message when trying to upload .ass subtitles * Fix default homepage in the progressive web application * Don't crash on queue error - * Fix EXDEV if you have multiple mount points - * Fix broken audio with transcoding with some videos + * Fix EXDEV errors if you have multiple mount points + * Fix broken audio in transcoding with some videos * Fix crash on getVideoFileStream issue * Fix followers search * Remove trailing `/` in CLI import script ([@HesioZ](https://github.com/HesioZ/)) * Use origin video url in canonical tag * Fix captions in HTTP fallback * Automatically refresh remote actors to fix deleted remote actors that are still displayed on some instances - * Add missing translations in embed template + * Add missing translations in video embed page * Fix some styling issues in dark mode * Fix transcoding issues with some videos From cfeae291c00812bb99e88bdec785792ae5d5934e Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 17 Jan 2019 16:15:20 +0100 Subject: [PATCH 122/137] Bumped to version v1.2.0-rc.1 --- client/package.json | 2 +- package.json | 2 +- support/doc/api/openapi.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/package.json b/client/package.json index 248c390fc..42deddd5f 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "peertube-client", - "version": "1.1.0", + "version": "1.2.0-rc.1", "private": true, "licence": "GPLv3", "author": { diff --git a/package.json b/package.json index ea3f88e24..f91bf8593 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "peertube", "description": "Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.", - "version": "1.1.0", + "version": "1.2.0-rc.1", "private": true, "licence": "AGPLv3", "engines": { diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml index 535dfdd4c..cca555806 100644 --- a/support/doc/api/openapi.yaml +++ b/support/doc/api/openapi.yaml @@ -1,7 +1,7 @@ openapi: 3.0.0 info: title: PeerTube - version: 1.1.0 + version: 1.2.0-rc.1 contact: name: PeerTube Community url: 'https://joinpeertube.org' From 38967f7b73cec6f6198c72d62f8d64bb88e6951c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 21 Jan 2019 13:52:46 +0100 Subject: [PATCH 123/137] Add server host in notification account field --- client/src/app/app.component.html | 2 +- .../app/shared/users/user-notification.model.ts | 4 ++-- server/models/account/user-notification.ts | 15 ++++++++++++++- shared/models/users/user-notification.model.ts | 1 + shared/utils/users/user-notifications.ts | 1 + 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html index dfda556f5..d398d4f35 100644 --- a/client/src/app/app.component.html +++ b/client/src/app/app.component.html @@ -30,7 +30,7 @@
diff --git a/client/src/app/shared/users/user-notification.model.ts b/client/src/app/shared/users/user-notification.model.ts index c5996a8a1..3bb53ff45 100644 --- a/client/src/app/shared/users/user-notification.model.ts +++ b/client/src/app/shared/users/user-notification.model.ts @@ -136,8 +136,8 @@ export class UserNotification implements UserNotificationServer { return '/videos/watch/' + video.uuid } - private buildAccountUrl (account: { name: string }) { - return '/accounts/' + account.name + private buildAccountUrl (account: { name: string, host: string }) { + return '/accounts/' + Actor.CREATE_BY_STRING(account.name, account.host) } private buildVideoImportUrl () { diff --git a/server/models/account/user-notification.ts b/server/models/account/user-notification.ts index 1094eec78..6cdbb827b 100644 --- a/server/models/account/user-notification.ts +++ b/server/models/account/user-notification.ts @@ -28,6 +28,7 @@ import { VideoImportModel } from '../video/video-import' import { ActorModel } from '../activitypub/actor' import { ActorFollowModel } from '../activitypub/actor-follow' import { AvatarModel } from '../avatar/avatar' +import { ServerModel } from '../server/server' enum ScopeNames { WITH_ALL = 'WITH_ALL' @@ -43,6 +44,11 @@ function buildActorWithAvatarInclude () { attributes: [ 'filename' ], model: () => AvatarModel.unscoped(), required: false + }, + { + attributes: [ 'host' ], + model: () => ServerModel.unscoped(), + required: false } ] } @@ -132,6 +138,11 @@ function buildAccountInclude (required: boolean, withActor = false) { attributes: [ 'filename' ], model: () => AvatarModel.unscoped(), required: false + }, + { + attributes: [ 'host' ], + model: () => ServerModel.unscoped(), + required: false } ] }, @@ -411,7 +422,8 @@ export class UserNotificationModel extends Model { id: this.ActorFollow.ActorFollower.Account.id, displayName: this.ActorFollow.ActorFollower.Account.getDisplayName(), name: this.ActorFollow.ActorFollower.preferredUsername, - avatar: this.ActorFollow.ActorFollower.Avatar ? { path: this.ActorFollow.ActorFollower.Avatar.getWebserverPath() } : undefined + avatar: this.ActorFollow.ActorFollower.Avatar ? { path: this.ActorFollow.ActorFollower.Avatar.getWebserverPath() } : undefined, + host: this.ActorFollow.ActorFollower.getHost() }, following: { type: this.ActorFollow.ActorFollowing.VideoChannel ? 'channel' as 'channel' : 'account' as 'account', @@ -453,6 +465,7 @@ export class UserNotificationModel extends Model { id: accountOrChannel.id, displayName: accountOrChannel.getDisplayName(), name: accountOrChannel.Actor.preferredUsername, + host: accountOrChannel.Actor.getHost(), avatar } } diff --git a/shared/models/users/user-notification.model.ts b/shared/models/users/user-notification.model.ts index eaeb422df..186b62612 100644 --- a/shared/models/users/user-notification.model.ts +++ b/shared/models/users/user-notification.model.ts @@ -26,6 +26,7 @@ export interface ActorInfo { id: number displayName: string name: string + host: string avatar?: { path: string } diff --git a/shared/utils/users/user-notifications.ts b/shared/utils/users/user-notifications.ts index bcbe29fc7..b85d5d2f1 100644 --- a/shared/utils/users/user-notifications.ts +++ b/shared/utils/users/user-notifications.ts @@ -146,6 +146,7 @@ function checkVideo (video: any, videoName?: string, videoUUID?: string) { function checkActor (actor: any) { expect(actor.displayName).to.be.a('string') expect(actor.displayName).to.not.be.empty + expect(actor.host).to.not.be.undefined } function checkComment (comment: any, commentId: number, threadId: number) { From fdebd9a3bdcc3ea3881f2234a0f214c2588de3e4 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 21 Jan 2019 14:03:04 +0100 Subject: [PATCH 124/137] Fix notification popover width --- .../src/app/menu/avatar-notification.component.scss | 13 ++++++++++--- client/src/app/menu/menu.component.scss | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/client/src/app/menu/avatar-notification.component.scss b/client/src/app/menu/avatar-notification.component.scss index a21e7beac..e785db788 100644 --- a/client/src/app/menu/avatar-notification.component.scss +++ b/client/src/app/menu/avatar-notification.component.scss @@ -3,7 +3,7 @@ /deep/ { .popover-notifications.popover { - max-width: 400px; + max-width: none; .popover-body { padding: 0; @@ -11,9 +11,8 @@ font-family: $main-fonts; overflow-y: auto; max-height: 500px; - min-width: 200px; + width: 400px; box-shadow: 0 6px 14px rgba(0, 0, 0, 0.30); - overflow-y: auto; .notifications-header { display: flex; @@ -82,3 +81,11 @@ height: 15px; } } + +@media screen and (max-width: $mobile-view) { + /deep/ { + .popover-notifications.popover .popover-body { + width: 400px; + } + } +} diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index a4aaadc7f..24b1a4db3 100644 --- a/client/src/app/menu/menu.component.scss +++ b/client/src/app/menu/menu.component.scss @@ -243,7 +243,7 @@ menu { } } -@media screen and (max-width: 400px) { +@media screen and (max-width: $mobile-view) { .menu-wrapper { width: 100% !important; } From 0f80cb03c66f4eb429a296f7c722e91d78e29ade Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 21 Jan 2019 14:08:25 +0100 Subject: [PATCH 125/137] Add link to the profile who commented in notif --- client/src/app/shared/users/user-notification.model.ts | 1 + client/src/app/shared/users/user-notifications.component.html | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/client/src/app/shared/users/user-notification.model.ts b/client/src/app/shared/users/user-notification.model.ts index 3bb53ff45..125d2120c 100644 --- a/client/src/app/shared/users/user-notification.model.ts +++ b/client/src/app/shared/users/user-notification.model.ts @@ -95,6 +95,7 @@ export class UserNotification implements UserNotificationServer { case UserNotificationType.NEW_COMMENT_ON_MY_VIDEO: case UserNotificationType.COMMENT_MENTION: + this.accountUrl = this.buildAccountUrl(this.comment.account) this.commentUrl = [ this.buildVideoUrl(this.comment.video), { threadId: this.comment.threadId } ] break diff --git a/client/src/app/shared/users/user-notifications.component.html b/client/src/app/shared/users/user-notifications.component.html index caa518e7f..0d69e0feb 100644 --- a/client/src/app/shared/users/user-notifications.component.html +++ b/client/src/app/shared/users/user-notifications.component.html @@ -40,7 +40,7 @@
- {{ notification.comment.account.displayName }} commented your video {{ notification.comment.video.name }} + {{ notification.comment.account.displayName }} commented your video {{ notification.comment.video.name }}
@@ -91,7 +91,7 @@
- {{ notification.comment.account.displayName }} mentioned you on video {{ notification.comment.video.name }} + {{ notification.comment.account.displayName }} mentioned you on video {{ notification.comment.video.name }}
From ebff55d8d6747d0627f135ab668f43e0d6125a37 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 21 Jan 2019 15:58:07 +0100 Subject: [PATCH 126/137] Fix tests --- server/initializers/constants.ts | 2 +- shared/utils/users/user-notifications.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 93fdd3f03..dab986353 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -149,7 +149,7 @@ let SCHEDULER_INTERVALS_MS = { actorFollowScores: 60000 * 60, // 1 hour removeOldJobs: 60000 * 60, // 1 hour updateVideos: 60000, // 1 minute - youtubeDLUpdate: 60000 * 60 * 24 // 1 day + youtubeDLUpdate: 60000 // 1 day } // --------------------------------------------------------------------------- diff --git a/shared/utils/users/user-notifications.ts b/shared/utils/users/user-notifications.ts index b85d5d2f1..c8ed7df30 100644 --- a/shared/utils/users/user-notifications.ts +++ b/shared/utils/users/user-notifications.ts @@ -274,8 +274,8 @@ async function checkNewActorFollow ( checkActor(notification.actorFollow.follower) expect(notification.actorFollow.follower.displayName).to.equal(followerDisplayName) expect(notification.actorFollow.follower.name).to.equal(followerName) + expect(notification.actorFollow.follower.host).to.not.be.undefined - checkActor(notification.actorFollow.following) expect(notification.actorFollow.following.displayName).to.equal(followingDisplayName) expect(notification.actorFollow.following.type).to.equal(followType) } else { From 0c5892764e74f4a614f0087028e0687694b176d3 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 21 Jan 2019 16:22:15 +0100 Subject: [PATCH 127/137] Youtube DL update every 24 hours --- server/initializers/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index dab986353..93fdd3f03 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -149,7 +149,7 @@ let SCHEDULER_INTERVALS_MS = { actorFollowScores: 60000 * 60, // 1 hour removeOldJobs: 60000 * 60, // 1 hour updateVideos: 60000, // 1 minute - youtubeDLUpdate: 60000 // 1 day + youtubeDLUpdate: 60000 * 60 * 24 // 1 day } // --------------------------------------------------------------------------- From 572b8e02e258bfa921032dee593d3c2f129852b6 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 21 Jan 2019 17:11:21 +0100 Subject: [PATCH 128/137] Fix trending days display on first load --- .../video-list/video-trending.component.ts | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/client/src/app/videos/video-list/video-trending.component.ts b/client/src/app/videos/video-list/video-trending.component.ts index 881ab2174..6fd74e67a 100644 --- a/client/src/app/videos/video-list/video-trending.component.ts +++ b/client/src/app/videos/video-list/video-trending.component.ts @@ -39,18 +39,21 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit, this.generateSyndicationList() - const trendingDays = this.serverService.getConfig().trending.videos.intervalDays + this.serverService.configLoaded.subscribe( + () => { + const trendingDays = this.serverService.getConfig().trending.videos.intervalDays - if (trendingDays === 1) { - this.titlePage = this.i18n('Trending for the last 24 hours') - this.titleTooltip = this.i18n('Trending videos are those totalizing the greatest number of views during the last 24 hours.') - } else { - this.titlePage = this.i18n('Trending for the last {{days}} days', { days: trendingDays }) - this.titleTooltip = this.i18n( - 'Trending videos are those totalizing the greatest number of views during the last {{days}} days.', - { days: trendingDays } - ) - } + if (trendingDays === 1) { + this.titlePage = this.i18n('Trending for the last 24 hours') + this.titleTooltip = this.i18n('Trending videos are those totalizing the greatest number of views during the last 24 hours.') + } else { + this.titlePage = this.i18n('Trending for the last {{days}} days', { days: trendingDays }) + this.titleTooltip = this.i18n( + 'Trending videos are those totalizing the greatest number of views during the last {{days}} days.', + { days: trendingDays } + ) + } + }) } ngOnDestroy () { From 307902e2b3248073aeb677e420aafd8b5e041117 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 24 Jan 2019 15:23:06 +0100 Subject: [PATCH 129/137] Try to fix Mac video upload --- client/src/app/+accounts/accounts.component.ts | 3 +-- server/helpers/custom-validators/videos.ts | 4 ++-- server/initializers/constants.ts | 4 +++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts index 036264602..e8339b78b 100644 --- a/client/src/app/+accounts/accounts.component.ts +++ b/client/src/app/+accounts/accounts.component.ts @@ -26,8 +26,7 @@ export class AccountsComponent implements OnInit, OnDestroy { private notifier: Notifier, private restExtractor: RestExtractor, private redirectService: RedirectService, - private authService: AuthService, - private i18n: I18n + private authService: AuthService ) {} ngOnInit () { diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts index e6f22e6c5..95e256b8f 100644 --- a/server/helpers/custom-validators/videos.ts +++ b/server/helpers/custom-validators/videos.ts @@ -88,8 +88,8 @@ function isVideoFileExtnameValid (value: string) { function isVideoFile (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[]) { const videoFileTypesRegex = Object.keys(MIMETYPES.VIDEO.MIMETYPE_EXT) - .map(m => `(${m})`) - .join('|') + .map(m => `(${m})`) + .join('|') return isFileValid(files, videoFileTypesRegex, 'videofile', null) } diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 93fdd3f03..6f3ebb9aa 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -795,7 +795,9 @@ function buildVideoMimetypeExt () { 'video/quicktime': '.mov', 'video/x-msvideo': '.avi', 'video/x-flv': '.flv', - 'video/x-matroska': '.mkv' + 'video/x-matroska': '.mkv', + 'application/octet-stream': '.mkv', + 'video/avi': '.avi' }) } From 8dae69dbafa1110f9e95e19bcce3d049e37d5904 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 24 Jan 2019 19:56:42 +0100 Subject: [PATCH 130/137] Add the discord bridge Signed-off-by: Thomas Citharel --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b2460f1e..a9b4eb54a 100644 --- a/README.md +++ b/README.md @@ -133,7 +133,7 @@ You can also join the cheerful bunch that makes our community: * Chat: * IRC : **[#peertube on chat.freenode.net:6697](https://kiwiirc.com/client/irc.freenode.net/#peertube)** - * Matrix (bridged on the IRC channel) : **[#peertube:matrix.org](https://matrix.to/#/#peertube:matrix.org)** + * Matrix (bridged on IRC and [Discord](https://discord.gg/wj8DDUT)) : **[#peertube:matrix.org](https://matrix.to/#/#peertube:matrix.org)** * Forum: * Framacolibri: [https://framacolibri.org/c/peertube](https://framacolibri.org/c/peertube) From 185a4abd23ba07ee252655574506755c0425c540 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 28 Jan 2019 09:55:09 +0100 Subject: [PATCH 131/137] Fix menu overflow on mobile screens --- client/src/app/menu/menu.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index 24b1a4db3..f30b89413 100644 --- a/client/src/app/menu/menu.component.scss +++ b/client/src/app/menu/menu.component.scss @@ -16,7 +16,7 @@ menu { height: 100%; white-space: nowrap; text-overflow: ellipsis; - overflow: hidden; + overflow: auto; color: var(--menuForegroundColor); display: flex; flex-direction: column; From 4afcdcfad88fbc75acd7f689cca3378421c681d1 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 28 Jan 2019 09:55:09 +0100 Subject: [PATCH 132/137] Fix menu overflow on mobile screens --- client/src/app/menu/menu.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index 24b1a4db3..f30b89413 100644 --- a/client/src/app/menu/menu.component.scss +++ b/client/src/app/menu/menu.component.scss @@ -16,7 +16,7 @@ menu { height: 100%; white-space: nowrap; text-overflow: ellipsis; - overflow: hidden; + overflow: auto; color: var(--menuForegroundColor); display: flex; flex-direction: column; From 926cd3df339772dd1cbb9e10996518e8cb2e001d Mon Sep 17 00:00:00 2001 From: Josh Morel Date: Mon, 28 Jan 2019 05:45:40 -0500 Subject: [PATCH 133/137] fix typo in test accounts api validators --- server/tests/api/check-params/accounts.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/tests/api/check-params/accounts.ts b/server/tests/api/check-params/accounts.ts index 567fd072c..68f9519c6 100644 --- a/server/tests/api/check-params/accounts.ts +++ b/server/tests/api/check-params/accounts.ts @@ -10,7 +10,7 @@ import { } from '../../../../shared/utils/requests/check-api-params' import { getAccount } from '../../../../shared/utils/users/accounts' -describe('Test users API validators', function () { +describe('Test accounts API validators', function () { const path = '/api/v1/accounts/' let server: ServerInfo From 2c0070c8f31e6a28b1d52ee6e9965e21471abd5b Mon Sep 17 00:00:00 2001 From: Josh Morel Date: Mon, 28 Jan 2019 07:01:01 -0500 Subject: [PATCH 134/137] fix undefined change ownership icons --- .../my-account-ownership/my-account-ownership.component.html | 4 ++-- client/src/app/shared/icons/global-icon.component.ts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html b/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html index 379fd8bb1..5709e9f54 100644 --- a/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html +++ b/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html @@ -40,10 +40,10 @@ Refuse diff --git a/client/src/app/shared/icons/global-icon.component.ts b/client/src/app/shared/icons/global-icon.component.ts index 5b9377e3e..e8ada0324 100644 --- a/client/src/app/shared/icons/global-icon.component.ts +++ b/client/src/app/shared/icons/global-icon.component.ts @@ -19,6 +19,7 @@ const icons = { 'delete': require('../../../assets/images/global/delete.html'), 'cross': require('../../../assets/images/global/cross.html'), 'validate': require('../../../assets/images/global/validate.html'), + 'tick': require('../../../assets/images/global/tick.html'), 'dislike': require('../../../assets/images/video/dislike.html'), 'heart': require('../../../assets/images/video/heart.html'), 'like': require('../../../assets/images/video/like.html'), From 4a57b65cc5a3cea50c30c0e93eee7490845a170d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 29 Jan 2019 09:10:24 +0100 Subject: [PATCH 135/137] Support socket.io in nginx template --- support/nginx/peertube | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/support/nginx/peertube b/support/nginx/peertube index 914ca3741..54ffdcc32 100644 --- a/support/nginx/peertube +++ b/support/nginx/peertube @@ -158,4 +158,16 @@ server { proxy_set_header Host $host; proxy_pass http://localhost:9000; } + + location /socket.io { + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $host; + + proxy_pass http://localhost:9000; + + # enable WebSockets + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + } } From a35268287e8bb6d613148cf392bb2b7583bbfaae Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 6 Feb 2019 11:57:17 +0100 Subject: [PATCH 136/137] Update changelog --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 440d1fbcf..13bec7535 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,13 @@ # Changelog -## v1.2.0-rc.1 +## v1.2.0 ### BREAKING CHANGES * **Docker:** `PEERTUBE_TRUST_PROXY` env variable is now an array ([LecygneNoir](https://github.com/LecygneNoir)) + * **Docker:** Check you have all the storage fields in your `/config/production.yaml` file: https://github.com/Chocobozzz/PeerTube/blob/develop/support/docker/production/config/production.yaml#L34 * **nginx:** Add redundancy endpoint in static file. **You should add it in your nginx configuration: https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/production.md#nginx** + * **nginx:** Add socket io endpoint. **You should add it in your nginx configuration: https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/production.md#nginx** * Moderators can manage users now (add/delete/update/block) * Add `tmp` and `redundancy` directories in configuration file. **You should configure them in your production.yaml** @@ -81,6 +83,9 @@ * Add missing translations in video embed page * Fix some styling issues in dark mode * Fix transcoding issues with some videos + * Fix Mac OS mkv/avi upload + * Fix menu overflow on mobile + * Fix ownership button icons ([@joshmorel](https://github.com/joshmorel)) ## v1.1.0 From f5305c04aae14467d6f957b713c5a902275cbb89 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 6 Feb 2019 11:57:57 +0100 Subject: [PATCH 137/137] Bumped to version v1.2.0 --- client/package.json | 2 +- package.json | 2 +- support/doc/api/openapi.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/package.json b/client/package.json index 42deddd5f..31fc77887 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "peertube-client", - "version": "1.2.0-rc.1", + "version": "1.2.0", "private": true, "licence": "GPLv3", "author": { diff --git a/package.json b/package.json index f91bf8593..0cf39c7ee 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "peertube", "description": "Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.", - "version": "1.2.0-rc.1", + "version": "1.2.0", "private": true, "licence": "AGPLv3", "engines": { diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml index cca555806..f2bb945f9 100644 --- a/support/doc/api/openapi.yaml +++ b/support/doc/api/openapi.yaml @@ -1,7 +1,7 @@ openapi: 3.0.0 info: title: PeerTube - version: 1.2.0-rc.1 + version: 1.2.0 contact: name: PeerTube Community url: 'https://joinpeertube.org'