From efadd6eda15122944d95e1b3f01c3f4c35d1f40a Mon Sep 17 00:00:00 2001 From: Minteck Date: Sat, 4 Dec 2021 15:42:09 +0100 Subject: Commit --- metranslator/api.php | 5 ++++- metranslator/index.php | 28 ++++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 5 deletions(-) (limited to 'metranslator') diff --git a/metranslator/api.php b/metranslator/api.php index 0fe98b0..747686e 100644 --- a/metranslator/api.php +++ b/metranslator/api.php @@ -24,7 +24,10 @@ if (isset($_GET['u'])) { die(); } -$raw = json_decode(exec("bash -c 'cd /mnt/metranslator-api; node index.js api {$target} \"{$text}\"'"), true); +$raw = json_decode(exec("cd /mnt/metranslator-api && node index.js api {$target} \"{$text}\""), true); +$last = exec("cd /mnt/metranslator-api && git log -1 --pretty=format:'%an'"); $raw["system"]["version"] = $raw["system"]["version"] . "-" . substr(file_get_contents("/mnt/metranslator-api/.git/refs/heads/trunk"), 0, 8); +$raw["system"]["last_author"] = $last; +$raw["call"] = "cd /mnt/metranslator-api && node index.js api {$target} \"{$text}\""; die(json_encode($raw)); \ No newline at end of file diff --git a/metranslator/index.php b/metranslator/index.php index 2d35169..1b9bab7 100644 --- a/metranslator/index.php +++ b/metranslator/index.php @@ -98,6 +98,12 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/header.php"; ?> }, 2000) function translate() { + if (document.getElementById("text-source").value.trim() === "") { + document.getElementById("facts-inner").innerText = "No facts available for this text"; + document.getElementById("text-target").innerText = ""; + return; + } + document.getElementById("facts-inner").innerText = "Translating..."; document.getElementById("text-target").innerText = "..."; @@ -148,11 +154,25 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/header.php"; ?> document.getElementById("insights-04").innerText = "n/a"; } - document.getElementById("insights-01").innerText = data.system.name; - document.getElementById("insights-02").innerText = data.system.version; - document.getElementById("insights-03").innerText = data.system.length + " entries"; - document.getElementById("insights-04").innerText = data.duration + " ms"; + if (data.system.version.startsWith("-")) { + document.getElementById("insights-01").innerText = "n/a"; + document.getElementById("insights-02").innerText = "n/a"; + document.getElementById("insights-03").innerText = "n/a"; + document.getElementById("insights-04").innerText = "n/a"; + } else { + document.getElementById("insights-01").innerText = data.system.name; + document.getElementById("insights-02").innerText = data.system.version + " (last update by " + data.system.last_author + ")"; + document.getElementById("insights-03").innerText = data.system.length + " entries"; + document.getElementById("insights-04").innerText = data.duration + " ms"; + } resizeTarget() + + if (data.system.version.startsWith("-")) { + document.getElementById("insights-01").innerText = "n/a"; + document.getElementById("insights-02").innerText = "n/a"; + document.getElementById("insights-03").innerText = "n/a"; + document.getElementById("insights-04").innerText = "n/a"; + } }) }) }) -- cgit