From ec7a00af927589c951e4d17cd5fa2aaa88980cbe Mon Sep 17 00:00:00 2001 From: Vladimir Golovnev Date: Sat, 29 Jun 2024 21:59:22 +0300 Subject: [PATCH] Restore ability to use server-side translation by custom WebUI PR #20968. --- src/webui/webapplication.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/webui/webapplication.cpp b/src/webui/webapplication.cpp index 168fd16c2..74f582f4a 100644 --- a/src/webui/webapplication.cpp +++ b/src/webui/webapplication.cpp @@ -537,15 +537,12 @@ void WebApplication::sendFile(const Path &path) const QDateTime lastModified = Utils::Fs::lastModified(path); // find translated file in cache - if (!m_isAltUIUsed) + if (const auto it = m_translatedFiles.constFind(path); + (it != m_translatedFiles.constEnd()) && (lastModified <= it->lastModified)) { - if (const auto it = m_translatedFiles.constFind(path); - (it != m_translatedFiles.constEnd()) && (lastModified <= it->lastModified)) - { - print(it->data, it->mimeType); - setHeader({Http::HEADER_CACHE_CONTROL, getCachingInterval(it->mimeType)}); - return; - } + print(it->data, it->mimeType); + setHeader({Http::HEADER_CACHE_CONTROL, getCachingInterval(it->mimeType)}); + return; } const auto readResult = Utils::IO::readFile(path, MAX_ALLOWED_FILESIZE); @@ -576,7 +573,7 @@ void WebApplication::sendFile(const Path &path) QByteArray data = readResult.value(); const QMimeType mimeType = QMimeDatabase().mimeTypeForFileNameAndData(path.data(), data); - const bool isTranslatable = !m_isAltUIUsed && mimeType.inherits(u"text/plain"_s); + const bool isTranslatable = mimeType.inherits(u"text/plain"_s); if (isTranslatable) {