fix merge conflicts

[github/Chocobozzz/PeerTube.git] / client / angular.json

diff --git a/client/angular.json b/client/angular.json
index f3f146bcb8946594db82bfce40639b5a22a4e148..6c02890413b351ee20bfd55e8b5a87ed62ca1017 100644 (file)
--- a/client/angular.json
+++ b/client/angular.json
@@ -7,12 +7,124 @@
       "root": "",
       "sourceRoot": "src",
       "projectType": "application",
+      "i18n": {
+        "sourceLocale": {
+          "code": "en",
+          "baseHref": "/client/en-US/"
+        },
+        "locales": {
+          "ar": {
+            "translation": "src/locale/angular.ar.xlf",
+            "baseHref": "/client/ar/"
+          },
+          "hu": {
+            "translation": "src/locale/angular.hu-HU.xlf",
+            "baseHref": "/client/hu-HU/"
+          },
+          "th": {
+            "translation": "src/locale/angular.th-TH.xlf",
+            "baseHref": "/client/th-TH/"
+          },
+          "fi": {
+            "translation": "src/locale/angular.fi-FI.xlf",
+            "baseHref": "/client/fi-FI/"
+          },
+          "nl": {
+            "translation": "src/locale/angular.nl-NL.xlf",
+            "baseHref": "/client/nl-NL/"
+          },
+          "gd": {
+            "translation": "src/locale/angular.gd.xlf",
+            "baseHref": "/client/gd/"
+          },
+          "el": {
+            "translation": "src/locale/angular.el-GR.xlf",
+            "baseHref": "/client/el-GR/"
+          },
+          "es": {
+            "translation": "src/locale/angular.es-ES.xlf",
+            "baseHref": "/client/es-ES/"
+          },
+          "oc": {
+            "translation": "src/locale/angular.oc.xlf",
+            "baseHref": "/client/oc/"
+          },
+          "pt": {
+            "translation": "src/locale/angular.pt-BR.xlf",
+            "baseHref": "/client/pt-BR/"
+          },
+          "pt-PT": {
+            "translation": "src/locale/angular.pt-PT.xlf",
+            "baseHref": "/client/pt-PT/"
+          },
+          "sv": {
+            "translation": "src/locale/angular.sv-SE.xlf",
+            "baseHref": "/client/sv-SE/"
+          },
+          "pl": {
+            "translation": "src/locale/angular.pl-PL.xlf",
+            "baseHref": "/client/pl-PL/"
+          },
+          "ru": {
+            "translation": "src/locale/angular.ru-RU.xlf",
+            "baseHref": "/client/ru-RU/"
+          },
+          "zh-Hans": {
+            "translation": "src/locale/angular.zh-Hans-CN.xlf",
+            "baseHref": "/client/zh-Hans-CN/"
+          },
+          "zh-Hant": {
+            "translation": "src/locale/angular.zh-Hant-TW.xlf",
+            "baseHref": "/client/zh-Hant-TW/"
+          },
+          "fr": {
+            "translation": "src/locale/angular.fr-FR.xlf",
+            "baseHref": "/client/fr-FR/"
+          },
+          "ja": {
+            "translation": "src/locale/angular.ja-JP.xlf",
+            "baseHref": "/client/ja-JP/"
+          },
+          "eu": {
+            "translation": "src/locale/angular.eu-ES.xlf",
+            "baseHref": "/client/eu-ES/"
+          },
+          "ca": {
+            "translation": "src/locale/angular.ca-ES.xlf",
+            "baseHref": "/client/ca-ES/"
+          },
+          "cs": {
+            "translation": "src/locale/angular.cs-CZ.xlf",
+            "baseHref": "/client/cs-CZ/"
+          },
+          "eo": {
+            "translation": "src/locale/angular.eo.xlf",
+            "baseHref": "/client/eo/"
+          },
+          "de": {
+            "translation": "src/locale/angular.de-DE.xlf",
+            "baseHref": "/client/de-DE/"
+          },
+          "it": {
+            "translation": "src/locale/angular.it-IT.xlf",
+            "baseHref": "/client/it-IT/"
+          },
+          "vi": {
+            "translation": "src/locale/angular.vi-VN.xlf",
+            "baseHref": "/client/vi-VN/"
+          },
+          "kab": {
+            "translation": "src/locale/angular.kab.xlf",
+            "baseHref": "/client/kab/"
+          }
+        }
+      },
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
             "aot": true,
-            "deployUrl": "client/",
+            "localize": true,
             "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",
@@ -30,6 +142,39 @@
             "styles": [
               "src/sass/application.scss"
             ],
+            "allowedCommonJsDependencies": [
+              "@angularclass/hmr",
+              "debug",
+              "mousetrap",
+              "chart.js",
+              "linkifyjs/html",
+              "linkifyjs",
+              "markdown-it",
+              "markdown-it-emoji/light",
+              "sanitize-html",
+              "socket.io-client",
+              "socket.io-parser",
+              "@app/+about/about-peertube/about-peertube-contributors.component",
+              "path",
+              "video.js",
+              "p2p-media-loader-hlsjs",
+              "videojs-hotkeys/videojs.hotkeys",
+              "p2p-media-loader-core",
+              "qrcode",
+              "webtorrent",
+              "cache-chunk-store",
+              "global/document",
+              "videojs-vtt.js",
+              "videojs-vtt.js",
+              "@babel/runtime/helpers/possibleConstructorReturn",
+              "@babel/runtime/helpers/inherits",
+              "@babel/runtime/helpers/construct",
+              "@videojs/xhr",
+              "htmlparser2",
+              "url",
+              "parse-srcset",
+              "postcss"
+            ],
             "scripts": []
           },
           "configurations": {
@@ -37,7 +182,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,
@@ -54,7 +198,7 @@
                 {
                   "type": "anyComponentStyle",
                   "maximumWarning": "6kb",
-                  "maximumError": "10kb"
+                  "maximumError": "50kb"
                 }
               ],
               "fileReplacements": [
@@ -65,6 +209,7 @@
               ]
             },
             "hmr": {
+              "localize": false,
               "budgets": [
                 {
                   "type": "anyComponentStyle",
@@ -79,6 +224,7 @@
               ]
             },
             "e2e": {
+              "localize": false,
               "budgets": [
                 {
                   "type": "anyComponentStyle",
@@ -159,7 +305,7 @@
               "i18nBaseFile": "angular",
               "defaultLanguage": "en-US",
               "languages": [
-                "ar-001",
+                "ar",
                 "ca-ES",
                 "cs-CZ",
                 "da-DK",
@@ -179,6 +325,7 @@
                 "it-IT",
                 "ja-JP",
                 "jbo",
+                "kab",
                 "ko-KR",
                 "lt-LT",
                 "nb-NO",
@@ -239,7 +386,7 @@
   "schematics": {
     "@schematics/angular:component": {
       "prefix": "app",
-      "styleext": "scss"
+      "style": "scss"
     },
     "@schematics/angular:directive": {
       "prefix": "app"