From 67e9f761ec0f1131c58ffe111be36d02e093b351 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Fri, 9 Jun 2023 16:43:41 +0200 Subject: Merge changes from 1.19 branch * Create vi_vn.json * Update vi_vn.json Update changelog.html Build 1.19.4-v2.1.6 coming right up Remove unnecessary debug log Update changelog.html Build 1.19.4-v2.1.5 coming right up Improve English and update German translation (#403) * Update English language to sound more fluent * Update German translation Account for full-width colon when decrypting Fixes #376 --- .../java/com/aizistral/nochatreports/common/core/EncryptionUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/common/core/EncryptionUtil.java b/src/main/java/com/aizistral/nochatreports/common/core/EncryptionUtil.java index 842dc86..d770525 100644 --- a/src/main/java/com/aizistral/nochatreports/common/core/EncryptionUtil.java +++ b/src/main/java/com/aizistral/nochatreports/common/core/EncryptionUtil.java @@ -2,6 +2,7 @@ package com.aizistral.nochatreports.common.core; import java.util.Optional; +import com.aizistral.nochatreports.common.NCRCore; import com.aizistral.nochatreports.common.config.NCRConfig; import com.aizistral.nochatreports.common.encryption.Encryptor; @@ -55,7 +56,8 @@ public class EncryptionUtil { public static Optional tryDecrypt(String message, Encryptor encryptor) { try { - String[] splat = message.contains(" ") ? message.split(" ") : new String[] { message }; + String messageCopy = message.replace(':', ' '); + String[] splat = messageCopy.contains(" ") ? messageCopy.split(" ") : new String[] { messageCopy }; String decryptable = splat[splat.length-1]; String decrypted = encryptor.decrypt(decryptable); -- cgit v1.2.3