Merge remote-tracking branch 'origin/master'

web/src/components/DialogTorrentDetailsContent/widgets.jsx

@@ -71,7 +71,20 @@ export const PiecesLengthWidget = ({ data }) => {
 
 export const StatusWidget = ({ data }) => {
   const { t } = useTranslation()
-  return <StatisticsField title={t('TorrentStatus')} value={data} iconBg='#aea25b' valueBg='#b4aa6e' icon={BuildIcon} />
+  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 <StatisticsField title={t('TorrentStatus')} value={i18nd} iconBg='#aea25b' valueBg='#b4aa6e' icon={BuildIcon} />
 }
 
 export const SizeWidget = ({ data }) => {

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={
           <>
             <Button
@@ -40,7 +42,7 @@ export default function DonateSnackbar() {
               }}
             >
               <CreditCardIcon style={{ marginRight: '10px' }} fontSize='small' />
-              Support
+              {t('Support')}
             </Button>
 
             <IconButton size='small' aria-label='close' color='inherit' onClick={disableSnackbar}>

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",

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": "Загрузить файл",