Merge branch 'dev'

.linguirc

@@ -14,13 +14,17 @@
    "sourceLocale": "en",
    "locales": [
       "en",
+      "da",
       "de",
+      "el",
+      "es",
       "fr",
       "it",
+      "ko",
       "pl",
       "pt",
-      "es",
       "ru",
-      "ko"
+      "sl",
+      "tr"
    ]
 }

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Restreamer-UI
 
+## v1.6.0 > v1.7.0
+
+-   Add analyzeduration, probesize and max_probe_packets input options
+-   Add avoid_negative_ts input option
+-   Add http_proxy input option ([#513](https://github.com/datarhei/restreamer/issues/513))
+-   Add copyts, start_at_zero and use_wallclock_as_timestamps input options
+-   Add heuristic to find core address if UI is proxied
+-   Add Turkish translation (thanks to Ramazan Sancar) ([#22](https://github.com/datarhei/restreamer-ui/issues/22))
+-   Add Danish translation (Thanks to Filip Stadler and Info)
+-   Add Slovenian translation (thanks to Grega)
+-   Add Greek translation
+-   Mod allows general input settings for pull and push streams
+-   Mod updates npm dependencies
+-   Fix Creative Commons icons
+-   Fix positioning of the deinterlacing filter ([#465](https://github.com/datarhei/restreamer/issues/465))
+
 ## v1.5.1 > v1.6.0
 
 -   Add Bob Weaver Deinterlacing Filter ([#465](https://github.com/datarhei/restreamer/issues/465))

Dockerfile

@@ -1,5 +1,5 @@
-ARG NODE_IMAGE=node:19.0-alpine3.16
-ARG CADDY_IMAGE=caddy:2.6.2-alpine
+ARG NODE_IMAGE=node:19.6-alpine3.16
+ARG CADDY_IMAGE=caddy:2.6.3-alpine
 
 FROM $NODE_IMAGE as builder
 

package.json

@@ -1,51 +1,51 @@
 {
 	"name": "restreamer-ui",
-	"version": "1.6.0",
-	"bundle": "restreamer-v2.4.2",
+	"version": "1.7.0",
+	"bundle": "restreamer-v2.5.0",
 	"private": false,
 	"license": "Apache-2.0",
 	"dependencies": {
-		"@auth0/auth0-spa-js": "^2.0.0",
+		"@auth0/auth0-spa-js": "^2.0.4",
 		"@babel/plugin-syntax-flow": "^7.18.6",
-		"@babel/plugin-transform-react-jsx": "^7.19.0",
-		"@emotion/react": "^11.10.5",
-		"@emotion/styled": "^11.10.5",
-		"@fontsource/dosis": "^4.5.10",
+		"@babel/plugin-transform-react-jsx": "^7.21.0",
+		"@emotion/react": "^11.10.6",
+		"@emotion/styled": "^11.10.6",
+		"@fontsource/dosis": "^4.5.11",
 		"@fontsource/roboto": "^4.5.8",
-		"@fortawesome/fontawesome-svg-core": "^6.2.1",
-		"@fortawesome/free-brands-svg-icons": "^6.2.1",
-		"@fortawesome/free-solid-svg-icons": "^6.2.1",
+		"@fortawesome/fontawesome-svg-core": "^6.3.0",
+		"@fortawesome/free-brands-svg-icons": "^6.3.0",
+		"@fortawesome/free-solid-svg-icons": "^6.3.0",
 		"@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.15",
-		"@mui/lab": "^5.0.0-alpha.109",
-		"@mui/material": "^5.10.15",
-		"@mui/styles": "^5.10.15",
-		"@testing-library/dom": "^8.19.0",
+		"@lingui/core": "^3.17.1",
+		"@lingui/macro": "^3.17.1",
+		"@lingui/react": "^3.17.1",
+		"@mui/icons-material": "^5.11.9",
+		"@mui/lab": "^5.0.0-alpha.120",
+		"@mui/material": "^5.11.10",
+		"@mui/styles": "^5.11.9",
+		"@testing-library/dom": "^9.0.0",
 		"@testing-library/jest-dom": "^5.16.5",
-		"@testing-library/react": "^13.4.0",
+		"@testing-library/react": "^14.0.0",
 		"@testing-library/user-event": "^14.4.3",
-		"@types/react": "^18.0.25",
+		"@types/react": "^18.0.28",
 		"babel-plugin-macros": "^3.1.0",
-		"eslint": "^8.28.0",
+		"eslint": "^8.34.0",
 		"handlebars": "^4.7.7",
 		"jwt-decode": "^3.1.2",
 		"make-plural": "^7.2.0",
 		"react": "^18.2.0",
 		"react-colorful": "^5.6.1",
-		"react-device-detect": "^2.2.2",
+		"react-device-detect": "^2.2.3",
 		"react-dom": "^18.2.0",
-		"react-markdown": "^8.0.3",
-		"react-router-dom": "^6.4.3",
+		"react-markdown": "^8.0.5",
+		"react-router-dom": "^6.8.1",
 		"react-scripts": "5.0.1",
 		"semver": "^7.3.8",
-		"typescript": "^4.9.3",
+		"typescript": "^4.9.5",
 		"url-parse": "^1.5.10",
 		"uuid": "^9.0.0",
-		"video.js": "^7.20.3",
-		"videojs-overlay": "^2.1.5"
+		"video.js": "^8.0.4",
+		"videojs-overlay": "^3.0.0"
 	},
 	"scripts": {
 		"start": "react-scripts start",
@@ -83,11 +83,11 @@
 		]
 	},
 	"devDependencies": {
-		"@babel/core": "^7.20.2",
-		"@lingui/cli": "^3.15.0",
+		"@babel/core": "^7.21.0",
+		"@lingui/cli": "^3.17.1",
 		"babel-core": "^7.0.0-bridge.0",
 		"eslint-config-react-app": "^7.0.1",
-		"prettier": "^2.8.0",
+		"prettier": "^2.8.4",
 		"react-error-overlay": "^6.0.11"
 	},
 	"resolutions": {}

public/_playersite/index.html

@@ -698,10 +698,10 @@ <h2 class="content-headline">Channels</h2>
 		var license = '{{channel_license}}';
 		var license_url = '';
 		var license_name = 'unknown';
-		if (license === 'CC0 4.0') {
+		if (license === 'CC0 1.0') {
 			license_name = 'CC0 1.0 Universal'
 			license_url = 'https://creativecommons.org/publicdomain/zero/1.0/';
-			license_image = 'https://creativecommons.org/publicdomain/zero/1.0/';
+			license_image = 'https://mirrors.creativecommons.org/presskit/buttons/88x31/png/pd.png';
 		} else if (license === 'CC BY 4.0') {
 			license_name = 'CC BY 4.0'
 			license_url = 'https://creativecommons.org/licenses/by/4.0/';
@@ -725,7 +725,7 @@ <h2 class="content-headline">Channels</h2>
 		} else if (license === 'CC BY-NC-ND 4.0') {
 			license_name = 'CC BY-NC-ND 4.0';
 			license_url = 'https://creativecommons.org/licenses/by-nc-nd/4.0/';
-			license_image = 'https://creativecommons.org/licenses/by-nc-nd/4.0/';
+			license_image = 'https://mirrors.creativecommons.org/presskit/buttons/88x31/png/by-nc-nd.png';
 		}
 		document.getElementById("license").setAttribute("href", license_url);
 		document.getElementById("license_image").src = license_image;

src/I18n.js

@@ -5,35 +5,47 @@ import { i18n } from '@lingui/core';
 import * as plurals from 'make-plural/plurals';
 
 import { messages as EN } from './locales/en/messages.js';
+import { messages as DA } from './locales/da/messages.js';
 import { messages as DE } from './locales/de/messages.js';
+import { messages as EL } from './locales/el/messages.js';
 import { messages as ES } from './locales/es/messages.js';
 import { messages as FR } from './locales/fr/messages.js';
 import { messages as IT } from './locales/it/messages.js';
+import { messages as KO } from './locales/ko/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 { messages as SL } from './locales/sl/messages.js';
+import { messages as TR } from './locales/tr/messages.js';
 import * as Storage from './utils/storage';
 
 i18n.loadLocaleData('en', { plurals: plurals.en });
+i18n.loadLocaleData('da', { plurals: plurals.da });
 i18n.loadLocaleData('de', { plurals: plurals.de });
+i18n.loadLocaleData('el', { plurals: plurals.el });
 i18n.loadLocaleData('es', { plurals: plurals.es });
 i18n.loadLocaleData('fr', { plurals: plurals.fr });
 i18n.loadLocaleData('it', { plurals: plurals.it });
+i18n.loadLocaleData('ko', { plurals: plurals.ko });
 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.loadLocaleData('sl', { plurals: plurals.sl });
+i18n.loadLocaleData('tr', { plurals: plurals.tr });
 i18n.load({
 	en: EN,
+	da: DA,
 	de: DE,
+	el: EL,
 	es: ES,
 	fr: FR,
 	it: IT,
+	ko: KO,
 	pl: PL,
 	pt: PT,
 	ru: RU,
-	ko: KO,
+	sl: SL,
+	tr: TR,
 });
 
 const getLanguage = (defaultLanguage, supportedLanguages) => {
@@ -62,7 +74,7 @@ const getBrowserLanguage = (defaultLanguage) => {
 	return match[0].toLowerCase();
 };
 
-i18n.activate(getLanguage('en', ['en', 'de', 'es', 'fr', 'it', 'pl', 'pt', 'ru', 'ko']));
+i18n.activate(getLanguage('en', ['en', 'da', 'de', 'el', 'es', 'fr', 'it', 'ko', 'pl', 'pt', 'ru', 'sl', 'tr']));
 
 export default function Provider(props) {
 	return <I18nProvider i18n={i18n}>{props.children}</I18nProvider>;

src/index.js

@@ -10,6 +10,9 @@ import theme from './theme';
 import RestreamerUI from './RestreamerUI';
 
 let address = window.location.protocol + '//' + window.location.host;
+if (window.location.pathname.endsWith('/ui/')) {
+	address += window.location.pathname.replace(/ui\/$/, '');
+}
 
 const urlParams = new URLSearchParams(window.location.search.substring(1));
 if (urlParams.has('address') === true) {