From 4a352059ecd6d5ce1593baf2e06e0d29022e8d9f Mon Sep 17 00:00:00 2001
From: Daniel Shleifman <dancheskus@gmail.com>
Date: Mon, 5 Jul 2021 23:47:04 +0300
Subject: [PATCH] translations updated

---
 .../components/Settings/SettingsDialog.jsx    | 42 +++++++++++--------
 web/src/components/Settings/style.js          |  5 +++
 web/src/locales/en/translation.json           |  8 +++-
 web/src/locales/ru/translation.json           |  8 +++-
 4 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/web/src/components/Settings/SettingsDialog.jsx b/web/src/components/Settings/SettingsDialog.jsx
index 4605911..b467880 100644
--- a/web/src/components/Settings/SettingsDialog.jsx
+++ b/web/src/components/Settings/SettingsDialog.jsx
@@ -43,8 +43,16 @@ import {
 import defaultSettings from './defaultSettings'
 import { a11yProps, TabPanel } from './tabComponents'
 
-// {t('UseDisk')}
-// {t('UseDiskDesc')}
+const CacheStorageLocationLabel = ({ style }) => {
+  const { t } = useTranslation()
+
+  return (
+    <SettingSectionLabel style={style}>
+      {t('SettingsDialog.CacheStorageLocation')}
+      <small>{t('SettingsDialog.UseDiskDesc')}</small>
+    </SettingSectionLabel>
+  )
+}
 
 const SliderInput = ({
   isProMode,
@@ -213,24 +221,24 @@ export default function SettingsDialog({ handleClose }) {
 
                     <PreloadCachePercentage
                       value={100 - cachePercentage}
-                      label={t('SettingsDialog.CacheSizeLabel', { cacheSize })}
+                      label={`${t('Cache')} ${cacheSize} MB`}
                       isPreloadEnabled={PreloadBuffer}
                     />
 
                     <PreloadCacheValue color={cacheBeforeReaderColor}>
                       <div>
-                        {100 - cachePercentage}% ({Math.round((cacheSize / 100) * (100 - cachePercentage))} МБ)
+                        {100 - cachePercentage}% ({Math.round((cacheSize / 100) * (100 - cachePercentage))} MB)
                       </div>
 
-                      <div>От кеша будет оставаться позади воспроизводимого блока</div>
+                      <div>{t('SettingsDialog.CacheBeforeReaderDesc')}</div>
                     </PreloadCacheValue>
 
                     <PreloadCacheValue color={cacheAfterReaderColor}>
                       <div>
-                        {cachePercentage}% ({Math.round((cacheSize / 100) * cachePercentage)} МБ)
+                        {cachePercentage}% ({Math.round((cacheSize / 100) * cachePercentage)} MB)
                       </div>
 
-                      <div>От кеша будет спереди от воспроизводимого блока</div>
+                      <div>{t('SettingsDialog.CacheAfterReaderDesc')}</div>
                     </PreloadCacheValue>
 
                     <Divider />
@@ -269,7 +277,7 @@ export default function SettingsDialog({ handleClose }) {
 
                   {UseDisk ? (
                     <div>
-                      <SettingSectionLabel>Место хранения кеша</SettingSectionLabel>
+                      <CacheStorageLocationLabel />
 
                       <div style={{ display: 'grid', gridAutoFlow: 'column' }}>
                         <StorageButton small onClick={() => updateSettings({ UseDisk: false })}>
@@ -277,7 +285,7 @@ export default function SettingsDialog({ handleClose }) {
                             <RAMIcon color='#323637' />
                           </StorageIconWrapper>
 
-                          <div>Оперативная память</div>
+                          <div>{t('SettingsDialog.RAM')}</div>
                         </StorageButton>
 
                         <StorageButton small selected>
@@ -285,7 +293,7 @@ export default function SettingsDialog({ handleClose }) {
                             <USBIcon color='#dee3e5' />
                           </StorageIconWrapper>
 
-                          <div>Диск</div>
+                          <div>{t('SettingsDialog.Disk')}</div>
                         </StorageButton>
                       </div>
 
@@ -300,7 +308,9 @@ export default function SettingsDialog({ handleClose }) {
                         }
                         label={t('SettingsDialog.RemoveCacheOnDrop')}
                       />
-                      <small>{t('SettingsDialog.RemoveCacheOnDropDesc')}</small>
+                      <div>
+                        <small>{t('SettingsDialog.RemoveCacheOnDropDesc')}</small>
+                      </div>
 
                       <TextField
                         onChange={inputForm}
@@ -314,16 +324,14 @@ export default function SettingsDialog({ handleClose }) {
                     </div>
                   ) : (
                     <CacheStorageSelector>
-                      <SettingSectionLabel style={{ placeSelf: 'start', gridArea: 'label' }}>
-                        Место хранения кеша
-                      </SettingSectionLabel>
+                      <CacheStorageLocationLabel style={{ placeSelf: 'start', gridArea: 'label' }} />
 
                       <StorageButton selected>
                         <StorageIconWrapper selected>
                           <RAMIcon color='#dee3e5' />
                         </StorageIconWrapper>
 
-                        <div>Оперативная память</div>
+                        <div>{t('SettingsDialog.RAM')}</div>
                       </StorageButton>
 
                       <StorageButton onClick={() => updateSettings({ UseDisk: true })}>
@@ -331,7 +339,7 @@ export default function SettingsDialog({ handleClose }) {
                           <USBIcon color='#323637' />
                         </StorageIconWrapper>
 
-                        <div>Диск</div>
+                        <div>{t('SettingsDialog.Disk')}</div>
                       </StorageButton>
                     </CacheStorageSelector>
                   )}
@@ -340,7 +348,7 @@ export default function SettingsDialog({ handleClose }) {
 
               <TabPanel value={selectedTab} index={1} dir={direction}>
                 <SecondarySettingsContent>
-                  <SettingSectionLabel>Дополнительные настройки</SettingSectionLabel>
+                  <SettingSectionLabel>{t('SettingsDialog.AdditionalSettings')}</SettingSectionLabel>
 
                   <FormControlLabel
                     control={<Switch checked={EnableIPv6} onChange={inputForm} id='EnableIPv6' color='primary' />}
diff --git a/web/src/components/Settings/style.js b/web/src/components/Settings/style.js
index 1609dd8..d305534 100644
--- a/web/src/components/Settings/style.js
+++ b/web/src/components/Settings/style.js
@@ -129,6 +129,11 @@ export const CacheStorageSelector = styled.div`
 export const SettingSectionLabel = styled.div`
   font-size: 25px;
   padding-bottom: 20px;
+
+  small {
+    display: block;
+    font-size: 11px;
+  }
 `
 
 export const PreloadCachePercentage = styled.div.attrs(({ value }) => ({
diff --git a/web/src/locales/en/translation.json b/web/src/locales/en/translation.json
index da45444..7a8b82b 100644
--- a/web/src/locales/en/translation.json
+++ b/web/src/locales/en/translation.json
@@ -74,18 +74,23 @@
   "SelectSeason": "Select Season",
   "SettingsDialog": {
     "AddRetrackers": "Add retrackers",
+    "AdditionalSettings": "Additional Settings",
+    "CacheBeforeReaderDesc": "From cache will be saved before currently played frame",
+    "CacheAfterReaderDesc": "From cache will be loaded after currently played frame",
     "CacheSize": "Cache Size",
-    "CacheSizeLabel": "Cache {{cacheSize}} MB",
     "CacheSettings": "Cache Settings",
+    "CacheStorageLocation": "Cache Storage Location",
     "ConnectionsLimit": "Connections Limit",
     "DHT": "DHT (Distributed Hash Table)",
     "DhtConnectionLimit": "DHT Connection Limit",
+    "Disk": "Disk",
     "DontAddRetrackers": "Don`t add retrackers",
     "DownloadRateLimit": "Download Rate Limit (Kilobytes)",
     "ForceEncrypt": "Force Encrypt Headers",
     "PeersListenPort": "Peers Listen Port",
     "PreloadBuffer": "Preload Buffer",
     "ProMode": "PRO mode",
+    "RAM": "RAM",
     "ReaderReadAHead": "Reader Read Ahead (5-100%)",
     "RemoveCacheOnDrop": "Remove Cache from Disk on Drop Torrent",
     "RemoveCacheOnDropDesc": "If disabled, remove cache on delete torrent.",
@@ -97,7 +102,6 @@
     "TorrentsSavePath": "Torrents Save Path",
     "Upload": "Upload (not recommended to disable)",
     "UploadRateLimit": "Upload Rate Limit (Kilobytes)",
-    "UseDisk": "Use Disk for Cache",
     "UseDiskDesc": "Better use external media on flash-based devices",
     "Tabs": {
       "Main": "Main",
diff --git a/web/src/locales/ru/translation.json b/web/src/locales/ru/translation.json
index 7c69941..040b3ec 100644
--- a/web/src/locales/ru/translation.json
+++ b/web/src/locales/ru/translation.json
@@ -74,18 +74,23 @@
   "SelectSeason": "Выбор сезона",
   "SettingsDialog": {
     "AddRetrackers": "Добавлять",
+    "AdditionalSettings": "Дополнительные настройки",
+    "CacheBeforeReaderDesc": "От кеша будет оставаться позади воспроизводимого кадра",
+    "CacheAfterReaderDesc": "От кеша будет спереди от воспроизводимого кадра",
     "CacheSize": "Размер кеша",
-    "CacheSizeLabel": "Кеш {{cacheSize}} МБ",
     "CacheSettings": "Настройки кеша",
+    "CacheStorageLocation": "Место хранения кеша",
     "ConnectionsLimit": "Торрент-соединения (рек. 20-25)",
     "DHT": "DHT (Distributed Hash Table)",
     "DhtConnectionLimit": "Лимит подключений DHT",
+    "Disk": "Диск",
     "DontAddRetrackers": "Ничего не делать",
     "DownloadRateLimit": "Ограничение скорости загрузки (Килобайты)",
     "ForceEncrypt": "Принудительное шифрование заголовков",
     "PeersListenPort": "Порт для входящих подключений",
     "PreloadBuffer": "Наполнять кеш перед началом воспроизведения",
     "ProMode": "ПРО режим",
+    "RAM": "Оперативная память",
     "ReaderReadAHead": "Кеш предзагрузки (5-100%, рек. 95%)",
     "RemoveCacheOnDrop": "Очищать кеш на диске при отключении торрента",
     "RemoveCacheOnDropDesc": "Если отключено, кэш очищается при удалении торрента.",
@@ -97,7 +102,6 @@
     "TorrentsSavePath": "Путь хранения кеша",
     "Upload": "Отдача (не рекомендуется отключать)",
     "UploadRateLimit": "Ограничение скорости отдачи (Килобайты)",
-    "UseDisk": "Использовать диск для кеша",
     "UseDiskDesc": "Рекомендуется использовать внешние носители на устройствах с flash-памятью",
     "Tabs": {
       "Main": "Основные",