From 227dc8436ceaa8baad1d626ba6d32086cfd2ca20 Mon Sep 17 00:00:00 2001
From: wukko <me@wukko.me>
Date: Thu, 14 Jul 2022 02:49:09 +0600
Subject: [PATCH] beginning of 2.2 (one more fix)

- added download popup to solve the issue with downloads on ios
- merged big and small popups into one
- made buttons in donation menu act like buttons
- began to clean up localisation
- added ability to embed repo url into localisation strings
- moved ffmpeg args to config for more flexibility (and hopefully future changes)
- removed error response in stream that could result in a crash
- removed notice for ios users from about cause it's no longer relevant
- made error popup look and act like the rest
- a tiny bit of clean up
- changelog is now made out of latest commit (and doesn't break)
---
 modules/page-renderer.js      | 2 +-
 modules/sub/current-commit.js | 2 +-
 strings/en/changelog.json     | 5 -----
 strings/en/desc.json          | 3 ++-
 4 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 strings/en/changelog.json

diff --git a/modules/page-renderer.js b/modules/page-renderer.js
index 567701e..499ff7b 100644
--- a/modules/page-renderer.js
+++ b/modules/page-renderer.js
@@ -91,7 +91,7 @@ export default function(obj) {
             </div>
             <div id="content" class="popup-content">
                 <div id="desc" class="popup-desc about-padding">${com[1]}</div>
-                <div id="desc" class="popup-desc"><a class="text-backdrop" href="${repo}/commits">${loc(obj.lang, 'changelog', 'github')}</a></div>
+                <div id="desc" class="popup-desc"><a class="text-backdrop" href="${repo}/commits">${loc(obj.lang, 'desc', 'github')}</a></div>
             </div>
         </div>
         <div id="popup-donate" class="popup scrollable center box" style="visibility: hidden;">
diff --git a/modules/sub/current-commit.js b/modules/sub/current-commit.js
index 140fb20..f289732 100644
--- a/modules/sub/current-commit.js
+++ b/modules/sub/current-commit.js
@@ -4,7 +4,7 @@ export function shortCommit() {
     return execSync('git rev-parse --short HEAD').toString().trim()
 }
 export function getCommitInfo() {
-    let d = execSync(`git show -s --format='%s;;;%B'`).toString().trim().slice(1,-1).replace(/[\r\n]/gm, '\n').split(';;;')
+    let d = execSync(`git show -s --format='%s;;;%B'`).toString().trim().replace(/[\r\n]/gm, '\n').split(';;;')
     d[1] = d[1].replace(d[0], '').trim().toString().replace(/[\r\n]/gm, '<br>')
     return d
 }
\ No newline at end of file
diff --git a/strings/en/changelog.json b/strings/en/changelog.json
deleted file mode 100644
index c11d0d8..0000000
--- a/strings/en/changelog.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "subtitle": "beginning of 2.2",
-    "text": "- added download popup to solve the issue with downloads on ios\n- merged big and small popups into one\n- made buttons in donation menu act like buttons\n- began to clean up localisation\n- added ability to embed repo url into localisation strings\n- moved ffmpeg args to config for more flexibility (and hopefully future changes)\n- removed error response in stream that could result in a crash\n- removed notice for ios users from about cause it's no longer relevant\n- made error popup look and act like the rest\n- a tiny bit of clean up",
-    "github": "&gt;&gt; see previous changes and contribute on github"
-}
\ No newline at end of file
diff --git a/strings/en/desc.json b/strings/en/desc.json
index 0868081..ea05092 100644
--- a/strings/en/desc.json
+++ b/strings/en/desc.json
@@ -14,5 +14,6 @@
     "normalDownload": "download button opens a new tab with requested video. you can disable this popup in settings.",
     "download": "download",
     "copy": "copy url",
-    "open": "open"
+    "open": "open",
+    "github": "&gt;&gt; see previous changes and contribute on github"
 }
\ No newline at end of file