Update translations

client/src/app/+my-library/+my-video-channels/my-video-channels.component.ts

@@ -4,6 +4,7 @@ import { Subject } from 'rxjs'
 import { Component } from '@angular/core'
 import { AuthService, ComponentPagination, ConfirmService, hasMoreItems, Notifier, ScreenService } from '@app/core'
 import { VideoChannel, VideoChannelService } from '@app/shared/shared-main'
+import { formatICU } from '@app/helpers'
 
 @Component({
   templateUrl: './my-video-channels.component.html',
@@ -52,9 +53,13 @@ export class MyVideoChannelsComponent {
 
   async deleteVideoChannel (videoChannel: VideoChannel) {
     const res = await this.confirmService.confirmWithExpectedInput(
-      $localize`Do you really want to delete ${videoChannel.displayName}?
-It will delete ${videoChannel.videosCount} videos uploaded in this channel, and you will not be able to create another
-channel or account with the same name (${videoChannel.name})!`,
+      $localize`Do you really want to delete ${videoChannel.displayName}?` +
+      `<br />` +
+      formatICU(
+        // eslint-disable-next-line max-len
+        $localize`It will delete {count, plural, =1 {1 video} other {{count} videos}} uploaded in this channel, and you will not be able to create another channel or account with the same name (${videoChannel.name})!`,
+        { count: videoChannel.videosCount }
+      ),
 
       $localize`Please type the name of the video channel (${videoChannel.name}) to confirm`,
 

client/src/locale/server.en-US.json

@@ -67,204 +67,5 @@
     "Playlist: {1}": "Playlist: {1}",
     "By {1}": "By {1}",
     "Unavailable video": "Unavailable video",
-    "Unknown": "Unknown",
-    "Afar": "Afar",
-    "Abkhazian": "Abkhazian",
-    "Afrikaans": "Afrikaans",
-    "Akan": "Akan",
-    "Amharic": "Amharic",
-    "Arabic": "Arabic",
-    "Aragonese": "Aragonese",
-    "American Sign Language": "American Sign Language",
-    "Assamese": "Assamese",
-    "Austrian Sign Language": "Austrian Sign Language",
-    "Avaric": "Avaric",
-    "Kotava": "Kotava",
-    "Aymara": "Aymara",
-    "Azerbaijani": "Azerbaijani",
-    "Bashkir": "Bashkir",
-    "Bambara": "Bambara",
-    "Belarusian": "Belarusian",
-    "Bengali": "Bengali",
-    "British Sign Language": "British Sign Language",
-    "Bislama": "Bislama",
-    "Tibetan": "Tibetan",
-    "Bosnian": "Bosnian",
-    "Breton": "Breton",
-    "Bulgarian": "Bulgarian",
-    "Brazilian Sign Language": "Brazilian Sign Language",
-    "Catalan": "Catalan",
-    "Czech": "Czech",
-    "Chamorro": "Chamorro",
-    "Chechen": "Chechen",
-    "Chuvash": "Chuvash",
-    "Cornish": "Cornish",
-    "Corsican": "Corsican",
-    "Cree": "Cree",
-    "Czech Sign Language": "Czech Sign Language",
-    "Chinese Sign Language": "Chinese Sign Language",
-    "Welsh": "Welsh",
-    "Danish": "Danish",
-    "German": "German",
-    "Dhivehi": "Dhivehi",
-    "Danish Sign Language": "Danish Sign Language",
-    "Dzongkha": "Dzongkha",
-    "Greek": "Greek",
-    "English": "English",
-    "Esperanto": "Esperanto",
-    "Estonian": "Estonian",
-    "Basque": "Basque",
-    "Ewe": "Ewe",
-    "Faroese": "Faroese",
-    "Persian": "Persian",
-    "Fijian": "Fijian",
-    "Finnish": "Finnish",
-    "French": "French",
-    "Western Frisian": "Western Frisian",
-    "French Sign Language": "French Sign Language",
-    "Fulah": "Fulah",
-    "Scottish Gaelic": "Scottish Gaelic",
-    "Irish": "Irish",
-    "Galician": "Galician",
-    "Manx": "Manx",
-    "Guarani": "Guarani",
-    "German Sign Language": "German Sign Language",
-    "Gujarati": "Gujarati",
-    "Haitian": "Haitian",
-    "Hausa": "Hausa",
-    "Serbo-Croatian": "Serbo-Croatian",
-    "Hebrew": "Hebrew",
-    "Herero": "Herero",
-    "Hindi": "Hindi",
-    "Hiri Motu": "Hiri Motu",
-    "Croatian": "Croatian",
-    "Hungarian": "Hungarian",
-    "Armenian": "Armenian",
-    "Igbo": "Igbo",
-    "Sichuan Yi": "Sichuan Yi",
-    "Inuktitut": "Inuktitut",
-    "Indonesian": "Indonesian",
-    "Inupiaq": "Inupiaq",
-    "Icelandic": "Icelandic",
-    "Italian": "Italian",
-    "Javanese": "Javanese",
-    "Lojban": "Lojban",
-    "Japanese": "Japanese",
-    "Japanese Sign Language": "Japanese Sign Language",
-    "Kabyle": "Kabyle",
-    "Kalaallisut": "Kalaallisut",
-    "Kannada": "Kannada",
-    "Kashmiri": "Kashmiri",
-    "Georgian": "Georgian",
-    "Kanuri": "Kanuri",
-    "Kazakh": "Kazakh",
-    "Khmer": "Khmer",
-    "Kikuyu": "Kikuyu",
-    "Kinyarwanda": "Kinyarwanda",
-    "Kirghiz": "Kirghiz",
-    "Komi": "Komi",
-    "Kongo": "Kongo",
-    "Korean": "Korean",
-    "Kuanyama": "Kuanyama",
-    "Kurdish": "Kurdish",
-    "Lao": "Lao",
-    "Latin": "Latin",
-    "Latvian": "Latvian",
-    "Limburgan": "Limburgan",
-    "Lingala": "Lingala",
-    "Lithuanian": "Lithuanian",
-    "Luxembourgish": "Luxembourgish",
-    "Luba-Katanga": "Luba-Katanga",
-    "Ganda": "Ganda",
-    "Marshallese": "Marshallese",
-    "Malayalam": "Malayalam",
-    "Marathi": "Marathi",
-    "Macedonian": "Macedonian",
-    "Malagasy": "Malagasy",
-    "Maltese": "Maltese",
-    "Mongolian": "Mongolian",
-    "Maori": "Maori",
-    "Malay (macrolanguage)": "Malay (macrolanguage)",
-    "Burmese": "Burmese",
-    "Nauru": "Nauru",
-    "Navajo": "Navajo",
-    "South Ndebele": "South Ndebele",
-    "North Ndebele": "North Ndebele",
-    "Ndonga": "Ndonga",
-    "Nepali (macrolanguage)": "Nepali (macrolanguage)",
-    "Dutch": "Dutch",
-    "Norwegian Nynorsk": "Norwegian Nynorsk",
-    "Norwegian Bokmål": "Norwegian Bokmål",
-    "Norwegian": "Norwegian",
-    "Nyanja": "Nyanja",
-    "Occitan": "Occitan",
-    "Ojibwa": "Ojibwa",
-    "Oriya (macrolanguage)": "Oriya (macrolanguage)",
-    "Oromo": "Oromo",
-    "Ossetian": "Ossetian",
-    "Panjabi": "Panjabi",
-    "Pakistan Sign Language": "Pakistan Sign Language",
-    "Polish": "Polish",
-    "Portuguese": "Portuguese",
-    "Pushto": "Pushto",
-    "Quechua": "Quechua",
-    "Romansh": "Romansh",
-    "Romanian": "Romanian",
-    "Russian Sign Language": "Russian Sign Language",
-    "Rundi": "Rundi",
-    "Russian": "Russian",
-    "Sango": "Sango",
-    "Saudi Arabian Sign Language": "Saudi Arabian Sign Language",
-    "South African Sign Language": "South African Sign Language",
-    "Sinhala": "Sinhala",
-    "Slovak": "Slovak",
-    "Slovenian": "Slovenian",
-    "Northern Sami": "Northern Sami",
-    "Samoan": "Samoan",
-    "Shona": "Shona",
-    "Sindhi": "Sindhi",
-    "Somali": "Somali",
-    "Southern Sotho": "Southern Sotho",
-    "Spanish": "Spanish",
-    "Albanian": "Albanian",
-    "Sardinian": "Sardinian",
-    "Serbian": "Serbian",
-    "Swati": "Swati",
-    "Sundanese": "Sundanese",
-    "Swahili (macrolanguage)": "Swahili (macrolanguage)",
-    "Swedish": "Swedish",
-    "Swedish Sign Language": "Swedish Sign Language",
-    "Tahitian": "Tahitian",
-    "Tamil": "Tamil",
-    "Tatar": "Tatar",
-    "Telugu": "Telugu",
-    "Tajik": "Tajik",
-    "Tagalog": "Tagalog",
-    "Thai": "Thai",
-    "Tigrinya": "Tigrinya",
-    "Klingon": "Klingon",
-    "Tonga (Tonga Islands)": "Tonga (Tonga Islands)",
-    "Tswana": "Tswana",
-    "Tsonga": "Tsonga",
-    "Turkmen": "Turkmen",
-    "Turkish": "Turkish",
-    "Twi": "Twi",
-    "Uighur": "Uighur",
-    "Ukrainian": "Ukrainian",
-    "Urdu": "Urdu",
-    "Uzbek": "Uzbek",
-    "Venda": "Venda",
-    "Vietnamese": "Vietnamese",
-    "Walloon": "Walloon",
-    "Wolof": "Wolof",
-    "Xhosa": "Xhosa",
-    "Yiddish": "Yiddish",
-    "Yoruba": "Yoruba",
-    "Zhuang": "Zhuang",
-    "Chinese": "Chinese",
-    "Zulu": "Zulu",
-    "No linguistic content": "No linguistic content",
-    "Toki Pona": "Toki Pona",
-    "Simplified Chinese": "Simplified Chinese",
-    "Traditional Chinese": "Traditional Chinese"
+    "Unknown": "Unknown"
 }

package.json

@@ -57,7 +57,7 @@
     "test": "bash ./scripts/test.sh",
     "generate-cli-doc": "bash ./scripts/generate-cli-doc.sh",
     "generate-types-package": "tsx --conditions=peertube:tsx ./packages/types-generator/generate-package.ts",
-    "i18n:create-custom-files": "tsx --conditions=peertube:tsx ./scripts/i18n/create-custom-files.ts",
+    "i18n:create-custom-files": "tsx --tsconfig ./scripts/tsconfig.json --conditions=peertube:tsx ./scripts/i18n/create-custom-files.ts",
     "benchmark-server": "tsx --conditions=peertube:tsx ./scripts/benchmark.ts",
     "client:build-stats": "tsx --conditions=peertube:tsx ./scripts/client-build-stats.ts",
     "generate-code-contributors": "tsx --conditions=peertube:tsx ./scripts/generate-code-contributors.ts",

scripts/ci.sh

@@ -144,7 +144,5 @@ elif [ "$1" = "lint" ]; then
 
     npm run swagger-cli -- validate support/doc/api/openapi.yaml
 
-    ( cd client
-      npm run lint
-    )
+    ( cd client && npm run lint )
 fi

scripts/i18n/create-custom-files.ts

@@ -15,7 +15,7 @@ import {
   VIDEO_PLAYLIST_TYPES,
   VIDEO_PRIVACIES,
   VIDEO_STATES
-} from '../../server/initializers/constants.js'
+} from '@peertube/peertube-server/server/initializers/constants.js'
 
 const videojs = readJsonSync(join(root(), 'client', 'src', 'locale', 'videojs.en-US.json'))
 const playerKeys = {

scripts/tsconfig.json

@@ -1,7 +1,10 @@
 {
   "extends": "../tsconfig.base.json",
   "compilerOptions": {
-    "outDir": "../dist/scripts"
+    "outDir": "../dist/scripts",
+    "paths": {
+      "@server/*": [ "./server/server/*" ]
+    }
   },
   "references": [
     { "path": "../packages/core-utils" },