diff options
author | Chocobozzz <me@florianbigard.com> | 2023-01-19 14:09:57 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2023-01-19 14:09:57 +0100 |
commit | 32fde390f465b9ceef9e49c4037acdacbe176d65 (patch) | |
tree | bd0f28ac72d0e920387da7d4e68cf73bba736bbc | |
parent | 1f6dd0084485e10623aeb222f1429edf30e5f823 (diff) | |
download | PeerTube-32fde390f465b9ceef9e49c4037acdacbe176d65.tar.gz PeerTube-32fde390f465b9ceef9e49c4037acdacbe176d65.tar.zst PeerTube-32fde390f465b9ceef9e49c4037acdacbe176d65.zip |
Use unknown when category is not set
Unstead of Misc, that could be a real category
-rwxr-xr-x | scripts/i18n/create-custom-files.ts | 1 | ||||
-rw-r--r-- | server/models/video/formatter/video-format-utils.ts | 2 | ||||
-rw-r--r-- | server/tests/api/videos/video-imports.ts | 2 | ||||
-rw-r--r-- | server/tests/shared/videos.ts | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/scripts/i18n/create-custom-files.ts b/scripts/i18n/create-custom-files.ts index 3b5045954..eca2fe09d 100755 --- a/scripts/i18n/create-custom-files.ts +++ b/scripts/i18n/create-custom-files.ts | |||
@@ -90,7 +90,6 @@ Object.values(VIDEO_CATEGORIES) | |||
90 | 90 | ||
91 | // More keys | 91 | // More keys |
92 | Object.assign(serverKeys, { | 92 | Object.assign(serverKeys, { |
93 | Misc: 'Misc', | ||
94 | Unknown: 'Unknown' | 93 | Unknown: 'Unknown' |
95 | }) | 94 | }) |
96 | 95 | ||
diff --git a/server/models/video/formatter/video-format-utils.ts b/server/models/video/formatter/video-format-utils.ts index f285db477..6f05dbdc8 100644 --- a/server/models/video/formatter/video-format-utils.ts +++ b/server/models/video/formatter/video-format-utils.ts | |||
@@ -488,7 +488,7 @@ function videoModelToActivityPubObject (video: MVideoAP): VideoObject { | |||
488 | } | 488 | } |
489 | 489 | ||
490 | function getCategoryLabel (id: number) { | 490 | function getCategoryLabel (id: number) { |
491 | return VIDEO_CATEGORIES[id] || 'Misc' | 491 | return VIDEO_CATEGORIES[id] || 'Unknown' |
492 | } | 492 | } |
493 | 493 | ||
494 | function getLicenceLabel (id: number) { | 494 | function getLicenceLabel (id: number) { |
diff --git a/server/tests/api/videos/video-imports.ts b/server/tests/api/videos/video-imports.ts index 0583134b2..5636de45f 100644 --- a/server/tests/api/videos/video-imports.ts +++ b/server/tests/api/videos/video-imports.ts | |||
@@ -41,7 +41,7 @@ async function checkVideosServer1 (server: PeerTubeServer, idHttp: string, idMag | |||
41 | const videoTorrent = await server.videos.get({ id: idTorrent }) | 41 | const videoTorrent = await server.videos.get({ id: idTorrent }) |
42 | 42 | ||
43 | for (const video of [ videoMagnet, videoTorrent ]) { | 43 | for (const video of [ videoMagnet, videoTorrent ]) { |
44 | expect(video.category.label).to.equal('Misc') | 44 | expect(video.category.label).to.equal('Unknown') |
45 | expect(video.licence.label).to.equal('Unknown') | 45 | expect(video.licence.label).to.equal('Unknown') |
46 | expect(video.language.label).to.equal('Unknown') | 46 | expect(video.language.label).to.equal('Unknown') |
47 | expect(video.nsfw).to.be.false | 47 | expect(video.nsfw).to.be.false |
diff --git a/server/tests/shared/videos.ts b/server/tests/shared/videos.ts index c8339584b..f8ec65752 100644 --- a/server/tests/shared/videos.ts +++ b/server/tests/shared/videos.ts | |||
@@ -59,7 +59,7 @@ async function completeVideoCheck ( | |||
59 | 59 | ||
60 | expect(video.name).to.equal(attributes.name) | 60 | expect(video.name).to.equal(attributes.name) |
61 | expect(video.category.id).to.equal(attributes.category) | 61 | expect(video.category.id).to.equal(attributes.category) |
62 | expect(video.category.label).to.equal(attributes.category !== null ? VIDEO_CATEGORIES[attributes.category] : 'Misc') | 62 | expect(video.category.label).to.equal(attributes.category !== null ? VIDEO_CATEGORIES[attributes.category] : 'Unknown') |
63 | expect(video.licence.id).to.equal(attributes.licence) | 63 | expect(video.licence.id).to.equal(attributes.licence) |
64 | expect(video.licence.label).to.equal(attributes.licence !== null ? VIDEO_LICENCES[attributes.licence] : 'Unknown') | 64 | expect(video.licence.label).to.equal(attributes.licence !== null ? VIDEO_LICENCES[attributes.licence] : 'Unknown') |
65 | expect(video.language.id).to.equal(attributes.language) | 65 | expect(video.language.id).to.equal(attributes.language) |