From 67ee634f203a0fe4e71bcd210f8ab0b95b136799 Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Tue, 17 Dec 2019 13:51:34 +0000 Subject: [PATCH] separate link text for a single certificate --- webui/src/main/java/com/muwire/webui/Util.java | 1 + webui/src/main/js/browse.js | 12 ++++++++++-- webui/src/main/js/search.js | 12 ++++++++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/webui/src/main/java/com/muwire/webui/Util.java b/webui/src/main/java/com/muwire/webui/Util.java index 2466ea04..3d0de289 100644 --- a/webui/src/main/java/com/muwire/webui/Util.java +++ b/webui/src/main/java/com/muwire/webui/Util.java @@ -100,6 +100,7 @@ public class Util { _x("Upload"), _x("Uploads"), _x("User"), + _x("View 1 Certificate"), _x("View {0} Certificates"), _x("Your Trust"), _x("{0}% of piece") diff --git a/webui/src/main/js/browse.js b/webui/src/main/js/browse.js index e0b6fdb7..5d70d414 100644 --- a/webui/src/main/js/browse.js +++ b/webui/src/main/js/browse.js @@ -13,7 +13,11 @@ class Result { if (this.certificates == "0") return "" var id = this.hostB64 + "_" + this.infoHash - var linkText = _t("View {0} Certificates", this.certificates) + var linkText + if (this.certificates == "1") + linkText = _t("View 1 Certificate") + else + linkText = _t("View {0} Certificates", this.certificates) var link = "" + linkText + "" var linkBlock = "" linkBlock += "
" @@ -103,7 +107,11 @@ function hideCertificates(hostB64, infoHash) { certSpan.innerHTML = "" var result = resultsByInfoHash.get(infoHash) - var showLinkText = _t("View {0} Certificates", result.certificates) + var showLinkText + if (result.certificates == "1") + showLinkText = _t("View 1 Certificate") + else + showLinkText = _t("View {0} Certificates", result.certificates) var showLink = "" + showLinkText + "" var linkSpan = document.getElementById("certificates-link-" + id) diff --git a/webui/src/main/js/search.js b/webui/src/main/js/search.js index 2bec87c0..88efdefe 100644 --- a/webui/src/main/js/search.js +++ b/webui/src/main/js/search.js @@ -326,8 +326,12 @@ class SenderForResult { getCertificatesBlock() { if (this.certificates == "0") return "" + var linkText + if (this.certificates == "1") + linkText = _t("View 1 Certificate") + else + linkText = _t("View {0} Certificates", this.certificates) var id = this.b64 + "_" + currentResult - var linkText = _t("View {0} Certificates", this.certificates) var link = "" + linkText + "" var linkBlock = "" var certBlock = "
" @@ -636,7 +640,11 @@ function hideCertificatesByFile(fileSenderB64, count) { fetchSpan.innerHTML = "" var linkSpan = document.getElementById("certificates-link-" + id) - var linkText = _t("View {0} Certificates", count) + var linkText + if (count == "1") + linkText = _t("View 1 Certificate") + else + linkText = _t("View {0} Certificates", count) var showLink = "" + linkText + "" linkSpan.innerHTML = showLink }