diff --git a/docker-all.sh b/docker-all.sh new file mode 100755 index 0000000..b2817c1 --- /dev/null +++ b/docker-all.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +ROOT=${PWD} + +#### Build web +echo "Build web" +cd "${ROOT}/web" || exit 1 +npm install --silent +npm run --silent build-js +cp "${ROOT}/web/dest/index.html" "${ROOT}/server/web/pages/template/pages/" +cd .. + +sudo docker run --rm -v "$PWD":/usr/src/torr -w /usr/src/torr golang:1.16 ./build-all.sh +sudo chmod 0777 ./dist/* \ No newline at end of file diff --git a/server/version/version.go b/server/version/version.go index d5ba2f0..3b7111f 100644 --- a/server/version/version.go +++ b/server/version/version.go @@ -1,3 +1,3 @@ package version -const Version = "MatriX.97" +const Version = "MatriX.98" diff --git a/server/web/pages/template/pages/index.html b/server/web/pages/template/pages/index.html index b23070c..ea54034 100644 --- a/server/web/pages/template/pages/index.html +++ b/server/web/pages/template/pages/index.html @@ -1,10 +1,10 @@ -TorrServer
\ No newline at end of file + \ No newline at end of file diff --git a/web/dest/index.html b/web/dest/index.html index b23070c..ea54034 100644 --- a/web/dest/index.html +++ b/web/dest/index.html @@ -1,10 +1,10 @@ -TorrServer
\ No newline at end of file + \ No newline at end of file diff --git a/web/src/components/DialogTorrentDetailsContent/widgets.jsx b/web/src/components/DialogTorrentDetailsContent/widgets.jsx index f9571ff..c3d65e3 100644 --- a/web/src/components/DialogTorrentDetailsContent/widgets.jsx +++ b/web/src/components/DialogTorrentDetailsContent/widgets.jsx @@ -71,7 +71,20 @@ export const PiecesLengthWidget = ({ data }) => { export const StatusWidget = ({ data }) => { const { t } = useTranslation() - return + let i18nd = data + if (data.toLowerCase() === 'torrent added') + i18nd = t('TorrentAdded') + else if (data.toLowerCase() === 'torrent getting info') + i18nd = t('TorrentGettingInfo') + else if (data.toLowerCase() === 'torrent preload') + i18nd = t('TorrentPreload') + else if (data.toLowerCase() === 'torrent working') + i18nd = t('TorrentWorking') + else if (data.toLowerCase() === 'torrent closed') + i18nd = t('TorrentClosed') + else if (data.toLowerCase() === 'torrent in db') + i18nd = t('TorrentInDb') + return } export const SizeWidget = ({ data }) => { diff --git a/web/src/components/Donate/index.jsx b/web/src/components/Donate/index.jsx index eff69da..c689e4a 100644 --- a/web/src/components/Donate/index.jsx +++ b/web/src/components/Donate/index.jsx @@ -4,10 +4,12 @@ import Snackbar from '@material-ui/core/Snackbar' import IconButton from '@material-ui/core/IconButton' import CreditCardIcon from '@material-ui/icons/CreditCard' import CloseIcon from '@material-ui/icons/Close' +import { useTranslation } from 'react-i18next' import DonateDialog from './DonateDialog' export default function DonateSnackbar() { + const { t } = useTranslation() const [open, setOpen] = useState(false) const [snackbarOpen, setSnackbarOpen] = useState(true) @@ -27,7 +29,7 @@ export default function DonateSnackbar() { }} open={snackbarOpen} onClose={disableSnackbar} - message='Donate?' + message={t('Donate?')} action={ <> diff --git a/web/src/locales/en/translation.json b/web/src/locales/en/translation.json index 8a0d806..bdfba9b 100644 --- a/web/src/locales/en/translation.json +++ b/web/src/locales/en/translation.json @@ -24,6 +24,7 @@ "DHT": "DHT (Distributed Hash Table)", "DhtConnectionLimit": "DHT Connection Limit", "Donate": "Donate", + "Donate?": "Want to donate?", "DontAddRetrackers": "Don`t add retrackers", "DownloadPlaylist": "Download Playlist", "DownloadRateLimit": "Download Rate Limit (Kilobytes)", @@ -69,16 +70,23 @@ "Size": "Size", "SpecialThanks": "Special Thanks:", "Speed": "Speed", + "Support": "Support", "TCP": "TCP (Transmission Control Protocol)", "ThanksToEveryone": "Thanks to everyone who tested and helped.", "Title": "Title", + "TorrentAdded": "Added", + "TorrentClosed": "Сlosed", "TorrentContent": "Torrent Content", "TorrentDetails": "Torrent Details", "TorrentDisconnectTimeout": "Torrent Disconnect Timeout", + "TorrentGettingInfo": "Getting Info", + "TorrentInDb": "In DB", + "TorrentPreload": "Preload", "TorrentSize": "Torrent size", "TorrentsSavePath": "Torrents Save Path", "TorrentState": "Torrent State", "TorrentStatus": "Torrent Status", + "TorrentWorking": "Active", "TurnOff": "Turn Off", "Upload": "Upload (not recommended to disable)", "UploadFile": "Upload File", diff --git a/web/src/locales/ru/translation.json b/web/src/locales/ru/translation.json index bb4a46c..eb28836 100644 --- a/web/src/locales/ru/translation.json +++ b/web/src/locales/ru/translation.json @@ -24,6 +24,7 @@ "DHT": "DHT (Distributed Hash Table)", "DhtConnectionLimit": "Лимит подключений DHT", "Donate": "Поддержка", + "Donate?": "Хотите поддержать проект?", "DontAddRetrackers": "Ничего не делать", "DownloadPlaylist": "Скачать плейлист", "DownloadRateLimit": "Ограничение скорости загрузки (Килобайты)", @@ -69,16 +70,23 @@ "Size": "Размер", "SpecialThanks": "Отдельное спасибо:", "Speed": "Скорость", + "Support": "Поддержать", "TCP": "TCP (Transmission Control Protocol)", "ThanksToEveryone": "Спасибо всем, кто тестировал и помогал!", "Title": "Название", + "TorrentAdded": "Добавлен", + "TorrentClosed": "Закрыт", "TorrentContent": "Содержимое торрента", "TorrentDetails": "Информация о торренте", "TorrentDisconnectTimeout": "Тайм-аут отключения торрента (секунды)", + "TorrentGettingInfo": "Получение инфо", + "TorrentInDb": "Торрент в БД", + "TorrentPreload": "Предзагрузка", "TorrentSize": "Размер торрента", "TorrentsSavePath": "Путь хранения кеша", "TorrentState": "Данные торрента", - "TorrentStatus": "Состояние", + "TorrentStatus": "Состояние торрента", + "TorrentWorking": "Активен", "TurnOff": "Выключить", "Upload": "Отдача (не рекомендуется отключать)", "UploadFile": "Загрузить файл",