Merge branch 'dev'

.github/workflows/build_restreamer-ui.yaml

@@ -53,6 +53,7 @@ jobs:
           build-args: |
             PUBLIC_URL=./
             NODE_IMAGE=${{ env.NODE_IMAGE }}
+            CADDY_IMAGE=${{ env.CADDY_IMAGE }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
           tags: |

.github_build/Build.restreamer-ui.env

@@ -1,3 +1,4 @@
 # RESTREAMER UI
-RELEASE=1.5.0
-NODE_IMAGE=node:19.0-alpine3.16
+RELEASE=1.6.0
+NODE_IMAGE=node:19.1-alpine3.16
+CADDY_IMAGE=caddy:2.6.2-alpine

.linguirc

@@ -20,6 +20,7 @@
       "pl",
       "pt",
       "es",
-      "ru"
+      "ru",
+      "ko"
    ]
 }

CHANGELOG.md

@@ -1,8 +1,16 @@
 # Restreamer-UI
 
+## v1.5.1 > v1.6.0
+
+-   Add Bob Weaver Deinterlacing Filter ([#465](https://github.com/datarhei/restreamer/issues/465))
+-   Add tests for wizard, network source, and coders
+-   Add Korean translation (thanks to Jihaeng)
+-   Mod splitting wizard in components
+-   Fix wrong call to encoder defaults ([#467](https://github.com/datarhei/restreamer/issues/467))
+
 ## v1.5.0 > v1.5.1
 
--   Fix FFmpeg version check for RTSP sources (datarhei/restreamer#455)
+-   Fix FFmpeg version check for RTSP sources ([#455](https://github.com/datarhei/restreamer/issues/455))
 -   Fix requires Core >= v16.11.0 and FFmpeg >= 5.1.0
 
 ## v1.4.0 > v1.5.0

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "restreamer-ui",
-	"version": "1.5.1",
-	"bundle": "restreamer-v2.4.1",
+	"version": "1.6.0",
+	"bundle": "restreamer-v2.4.2",
 	"private": false,
 	"license": "Apache-2.0",
 	"dependencies": {
@@ -12,27 +12,27 @@
 		"@emotion/styled": "^11.10.5",
 		"@fontsource/dosis": "^4.5.10",
 		"@fontsource/roboto": "^4.5.8",
-		"@fortawesome/fontawesome-svg-core": "^6.2.0",
-		"@fortawesome/free-brands-svg-icons": "^6.2.0",
-		"@fortawesome/free-solid-svg-icons": "^6.2.0",
+		"@fortawesome/fontawesome-svg-core": "^6.2.1",
+		"@fortawesome/free-brands-svg-icons": "^6.2.1",
+		"@fortawesome/free-solid-svg-icons": "^6.2.1",
 		"@fortawesome/react-fontawesome": "^0.2.0",
 		"@lingui/core": "^3.15.0",
 		"@lingui/macro": "^3.15.0",
 		"@lingui/react": "^3.15.0",
-		"@mui/icons-material": "^5.10.9",
-		"@mui/lab": "^5.0.0-alpha.107",
-		"@mui/material": "^5.10.13",
-		"@mui/styles": "^5.10.10",
+		"@mui/icons-material": "^5.10.15",
+		"@mui/lab": "^5.0.0-alpha.109",
+		"@mui/material": "^5.10.15",
+		"@mui/styles": "^5.10.15",
 		"@testing-library/dom": "^8.19.0",
 		"@testing-library/jest-dom": "^5.16.5",
 		"@testing-library/react": "^13.4.0",
 		"@testing-library/user-event": "^14.4.3",
 		"@types/react": "^18.0.25",
 		"babel-plugin-macros": "^3.1.0",
-		"eslint": "^8.27.0",
+		"eslint": "^8.28.0",
 		"handlebars": "^4.7.7",
 		"jwt-decode": "^3.1.2",
-		"make-plural": "^7.1.0",
+		"make-plural": "^7.2.0",
 		"react": "^18.2.0",
 		"react-colorful": "^5.6.1",
 		"react-device-detect": "^2.2.2",
@@ -41,7 +41,7 @@
 		"react-router-dom": "^6.4.3",
 		"react-scripts": "5.0.1",
 		"semver": "^7.3.8",
-		"typescript": "^4.8.4",
+		"typescript": "^4.9.3",
 		"url-parse": "^1.5.10",
 		"uuid": "^9.0.0",
 		"video.js": "^7.20.3",
@@ -51,6 +51,8 @@
 		"start": "react-scripts start",
 		"build": "react-scripts --optimize-for-size build",
 		"test": "react-scripts test",
+		"test-ci": "react-scripts test --watchAll=false --testTimeout 50000",
+		"test-coverage": "react-scripts test --watchAll=false --testTimeout 50000 --coverage",
 		"eject": "react-scripts eject",
 		"i18n-extract": "lingui extract",
 		"i18n-extract:clean": "lingui extract --clean",
@@ -85,8 +87,8 @@
 		"@lingui/cli": "^3.15.0",
 		"babel-core": "^7.0.0-bridge.0",
 		"eslint-config-react-app": "^7.0.1",
-		"prettier": "^2.7.1",
+		"prettier": "^2.8.0",
 		"react-error-overlay": "^6.0.11"
 	},
 	"resolutions": {}
-}
+}

src/I18n.js

@@ -12,6 +12,7 @@ import { messages as IT } from './locales/it/messages.js';
 import { messages as PL } from './locales/pl/messages.js';
 import { messages as PT } from './locales/pt/messages.js';
 import { messages as RU } from './locales/ru/messages.js';
+import { messages as KO } from './locales/ko/messages.js';
 import * as Storage from './utils/storage';
 
 i18n.loadLocaleData('en', { plurals: plurals.en });
@@ -22,6 +23,7 @@ i18n.loadLocaleData('it', { plurals: plurals.it });
 i18n.loadLocaleData('pl', { plurals: plurals.pl });
 i18n.loadLocaleData('pt', { plurals: plurals.pt });
 i18n.loadLocaleData('ru', { plurals: plurals.ru });
+i18n.loadLocaleData('ko', { plurals: plurals.ko });
 i18n.load({
 	en: EN,
 	de: DE,
@@ -31,6 +33,7 @@ i18n.load({
 	pl: PL,
 	pt: PT,
 	ru: RU,
+	ko: KO,
 });
 
 const getLanguage = (defaultLanguage, supportedLanguages) => {
@@ -59,7 +62,7 @@ const getBrowserLanguage = (defaultLanguage) => {
 	return match[0].toLowerCase();
 };
 
-i18n.activate(getLanguage('en', ['en', 'de', 'es', 'fr', 'it', 'pl', 'pt', 'ru']));
+i18n.activate(getLanguage('en', ['en', 'de', 'es', 'fr', 'it', 'pl', 'pt', 'ru', 'ko']));
 
 export default function Provider(props) {
 	return <I18nProvider i18n={i18n}>{props.children}</I18nProvider>;