From 54a9a25e07c76ea759cd151900d1e4806ea93fc9 Mon Sep 17 00:00:00 2001
From: aandrew-me <ahammadandrew@protonmail.com>
Date: Fri, 2 Sep 2022 21:37:52 +0600
Subject: [PATCH] More localization changes

---
 csv2json.js                  | 28 +++++++++++---------
 html/index.html              |  2 +-
 html/preferences.html        |  2 +-
 input.csv                    | 24 -----------------
 json2csv.js                  |  6 +++--
 src/translate_index.js       |  3 ++-
 src/translate_preferences.js |  3 ++-
 translate.csv                | 51 ++++++++++++++++++------------------
 translations/ru.json         | 10 ++++---
 translations/translate.json  |  5 ++--
 10 files changed, 60 insertions(+), 74 deletions(-)

diff --git a/csv2json.js b/csv2json.js
index 1e484e8..e32e286 100644
--- a/csv2json.js
+++ b/csv2json.js
@@ -1,7 +1,7 @@
 // Converts the csv translation file to json and puts in translations folder
 
 // Language of output file
-const language = "ru"
+const language = "ru";
 
 const { readFileSync, writeFileSync } = require("fs");
 
@@ -10,7 +10,7 @@ let result = "";
 
 let count = 0;
 let size = csvFile.length;
-let index = 0
+let index = 0;
 
 result += "{";
 for (let letter of csvFile) {
@@ -18,18 +18,20 @@ for (let letter of csvFile) {
 		count++;
 		if (count < 4) {
 			result += letter;
-            index ++;
+			index++;
 		} else {
-            index ++;
-            if (index == size-1){
-                result += `${letter}`;
-            }
-            else{
-                result += `${letter},`;
-            }
-			
+			index++;
+			if (index == size - 1) {
+				result += `${letter}`;
+			} else {
+				result += `${letter},`;
+			}
+
 			count = 0;
 		}
+	} else if (letter == "," && count == 2) {
+		index++
+		result += ":"
 	} else {
 		result += letter;
 		index++;
@@ -37,6 +39,6 @@ for (let letter of csvFile) {
 }
 result += "}";
 
-writeFileSync(`translations/${language}.json`, result)
+writeFileSync(`translations/${language}.json`, result);
 
-console.log(`Converted and saved to translations/${language}.json`)
\ No newline at end of file
+console.log(`Converted and saved to translations/${language}.json`);
diff --git a/html/index.html b/html/index.html
index 871e849..4586d78 100644
--- a/html/index.html
+++ b/html/index.html
@@ -54,7 +54,7 @@
     <button id="pasteUrl" class="submitBtn">Click to paste video URL or ID [Ctrl + V]</button>
 
     <div id="loadingWrapper">
-        <span>Processing </span>
+        <span id="processing">Processing </span>
         <svg version="1.1" id="L4" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
             y="0px" viewBox="0 0 100 100" enable-background="new 0 0 0 0" xml:space="preserve">
             <circle fill="rgb(84, 171, 222)" stroke="none" cx="6" cy="50" r="6">
diff --git a/html/preferences.html b/html/preferences.html
index 1e9a3d6..f8296ae 100644
--- a/html/preferences.html
+++ b/html/preferences.html
@@ -30,7 +30,7 @@
 
         <br><br>
 
-        <label>Select Language</label>
+        <label id="selectLn">Select Language</label>
         <select id="select" onchange="changeLanguage()">
             <option value="en">English</option>
             <option value="ru">Русский</option>
diff --git a/input.csv b/input.csv
index f806a9f..e69de29 100644
--- a/input.csv
+++ b/input.csv
@@ -1,24 +0,0 @@
-"Click to paste video URL or ID [Ctrl + V]":"Нажмите, чтобы вставить URL-адрес или идентификатор видео [Ctrl + V]"
-"Preferences":"Настройки"
-"About":"О программе"
-"Download location":"Папка загрузки"
-"Current download location - ":"Текущее место загрузки - "
-"Enable transparent dark mode(only Linux, needs restart)":"Включить прозрачный темный режим (только для Linux, требуется перезагрузка)"
-"Please wait, yt-dlp is being downloaded":"Пожалуйста, подождите, yt-dlp загружается"
-"Video":"Видео"
-"Audio":"Аудио"
-"Title ":"Название "
-"Select Format ":"Выберите формат "
-"Download":"Скачать"
-"Select Download Location":"Выберите место загрузки"
-"More options":"Дополнительные опции"
-"Start":"Начало"
-"Download particular time-range":"Скачать определенную часть"
-"End":"Конец"
-"If kept empty, it will start from the beginning":"Если оставить пустым, оно начнется с начала"
-"If kept empty, it will be downloaded to the end":"Если оставить пустым, оно будет загружено до конца"
-"Homepage":"Главная страница"
-"ytDownloader lets you download videos (and sometimes audios) from hundreds of sites like Youtube, Facebook, Instagram, Tiktok, Twitter and so on":"ytDownloader позволяет вам загружать видео (и иногда аудио) с сотен таких сайтов, как Youtube, Facebook, Instagram, Tiktok, Twitter и т.д"
-"It's a Free and Open Source app built on top of Node.js and Electron. yt-dlp has been used for downloading":"Это бесплатное приложение с открытым исходным кодом, созданное поверх Node.js и Electron. yt-dlp используется для загрузки"
-"Source Code is available":"Исходный код доступен"
-"here":"здесь"
diff --git a/json2csv.js b/json2csv.js
index 8c48253..39581ad 100644
--- a/json2csv.js
+++ b/json2csv.js
@@ -5,5 +5,7 @@ let inputFile = JSON.parse(fs.readFileSync('translations/translate.json', 'utf8'
 
 fs.writeFileSync("translate.csv", "")
 for (const [key, value] of Object.entries(inputFile)){
-    fs.appendFileSync("translate.csv", key + "\n")
-}
\ No newline at end of file
+    fs.appendFileSync("translate.csv", `"${key}"` + "\n")
+}
+
+console.log("Saved to translate.csv");
\ No newline at end of file
diff --git a/src/translate_index.js b/src/translate_index.js
index 18cfe41..d13850c 100644
--- a/src/translate_index.js
+++ b/src/translate_index.js
@@ -18,4 +18,5 @@ getId("audioDownload").textContent = i18n.__("Download")
 getId("advancedToggle").textContent = i18n.__("More options")
 getId("rangeText").textContent= i18n.__("Download particular time-range")
 getId("startTime").title = i18n.__("If kept empty, it will start from the beginning")
-getId("endTime").title = i18n.__("If kept empty, it will be downloaded to the end")
\ No newline at end of file
+getId("endTime").title = i18n.__("If kept empty, it will be downloaded to the end")
+getId("processing").textContent = i18n.__("Processing ")
\ No newline at end of file
diff --git a/src/translate_preferences.js b/src/translate_preferences.js
index 71e9603..2d7d2f5 100644
--- a/src/translate_preferences.js
+++ b/src/translate_preferences.js
@@ -13,4 +13,5 @@ getId("dlText").textContent = i18n.__("Download location")
 getId("clText").innerHTML = i18n.__("Current download location - ")
 getId("selectLocation").textContent = i18n.__("Select Download Location")
 getId("transparentText").textContent = i18n.__("Enable transparent dark mode(only Linux, needs restart)")
-getId("preferences").textContent = i18n.__("Preferences")
\ No newline at end of file
+getId("preferences").textContent = i18n.__("Preferences")
+getId("selectLn").textContent = i18n.__("Select Language")
\ No newline at end of file
diff --git a/translate.csv b/translate.csv
index 6b3328f..e83d98d 100644
--- a/translate.csv
+++ b/translate.csv
@@ -1,25 +1,26 @@
-Click to paste video URL or ID [Ctrl + V]
-Preferences
-About
-Download location
-Current download location - 
-Enable transparent dark mode(only Linux, needs restart)
-Please wait, yt-dlp is being downloaded
-Video
-Audio
-Title 
-Select Format 
-Download
-Select Download Location
-More options
-Start
-Select Language
-Download particular time-range
-End
-If kept empty, it will start from the beginning
-If kept empty, it will be downloaded to the end
-Homepage
-ytDownloader lets you download videos (and sometimes audios) from hundreds of sites like Youtube, Facebook, Instagram, Tiktok, Twitter and so on
-It's a Free and Open Source app built on top of Node.js and Electron. yt-dlp has been used for downloading
-Source Code is available
-here
+"Click to paste video URL or ID [Ctrl + V]"
+"Preferences"
+"About"
+"Download location"
+"Current download location - "
+"Enable transparent dark mode(only Linux, needs restart)"
+"Please wait, yt-dlp is being downloaded"
+"Video"
+"Audio"
+"Title "
+"Select Format "
+"Download"
+"Select Download Location"
+"More options"
+"Start"
+"Select Language"
+"Download particular time-range"
+"End"
+"If kept empty, it will start from the beginning"
+"If kept empty, it will be downloaded to the end"
+"Homepage"
+"ytDownloader lets you download videos (and sometimes audios) from hundreds of sites like Youtube, Facebook, Instagram, Tiktok, Twitter and so on"
+"It's a Free and Open Source app built on top of Node.js and Electron. yt-dlp has been used for downloading"
+"Source Code is available "
+"here"
+"Processing"
diff --git a/translations/ru.json b/translations/ru.json
index b201ed2..49a04fb 100644
--- a/translations/ru.json
+++ b/translations/ru.json
@@ -13,13 +13,15 @@
 "Select Download Location":"Выберите место загрузки",
 "More options":"Дополнительные опции",
 "Start":"Начало",
+"Select Language":"Выберите язык",
 "Download particular time-range":"Скачать определенную часть",
 "End":"Конец",
 "If kept empty, it will start from the beginning":"Если оставить пустым, оно начнется с начала",
-"If kept empty, it will be downloaded to the end":"Если оставить пустым, оно будет загружено до конца",
+"If kept empty, it will be downloaded to the end":"Если оставить пустым, оно будет скачено до конца",
 "Homepage":"Главная страница",
-"ytDownloader lets you download videos (and sometimes audios) from hundreds of sites like Youtube, Facebook, Instagram, Tiktok, Twitter and so on":"ytDownloader позволяет вам загружать видео (и иногда аудио) с сотен таких сайтов, как Youtube, Facebook, Instagram, Tiktok, Twitter и т.д",
+"ytDownloader lets you download videos (and sometimes audios) from hundreds of sites like Youtube, Facebook, Instagram, Tiktok, Twitter and so on":"ytDownloader позволяет скачать видео (а иногда и аудио) с сотен сайтов, таких как Youtube, Facebook, Instagram, Tiktok, Twitter и так далее",
 "It's a Free and Open Source app built on top of Node.js and Electron. yt-dlp has been used for downloading":"Это бесплатное приложение с открытым исходным кодом, созданное поверх Node.js и Electron. yt-dlp используется для загрузки",
-"Source Code is available":"Исходный код доступен",
-"here":"здесь"
+"Source Code is available ":"Исходный код доступен ",
+"here":"здесь",
+"Processing":"Обрабатывается"
 }
\ No newline at end of file
diff --git a/translations/translate.json b/translations/translate.json
index 11933ef..2f1ea80 100644
--- a/translations/translate.json
+++ b/translations/translate.json
@@ -24,6 +24,7 @@
 
     "It's a Free and Open Source app built on top of Node.js and Electron. yt-dlp has been used for downloading":"",
 
-    "Source Code is available":"",
-    "here":""
+    "Source Code is available ":"",
+    "here":"",
+    "Processing":""
 }
\ No newline at end of file