Restore ability to use server-side translation by custom WebUI

PR #20968.
This commit is contained in:
Vladimir Golovnev 2024-06-29 21:59:22 +03:00 committed by Vladimir Golovnev (Glassez)
parent 7003ac3f4d
commit ec7a00af92
No known key found for this signature in database
GPG key ID: 52A2C7DEE2DFA6F7

View file

@ -537,15 +537,12 @@ void WebApplication::sendFile(const Path &path)
const QDateTime lastModified = Utils::Fs::lastModified(path); const QDateTime lastModified = Utils::Fs::lastModified(path);
// find translated file in cache // 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); print(it->data, it->mimeType);
(it != m_translatedFiles.constEnd()) && (lastModified <= it->lastModified)) 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); const auto readResult = Utils::IO::readFile(path, MAX_ALLOWED_FILESIZE);
@ -576,7 +573,7 @@ void WebApplication::sendFile(const Path &path)
QByteArray data = readResult.value(); QByteArray data = readResult.value();
const QMimeType mimeType = QMimeDatabase().mimeTypeForFileNameAndData(path.data(), data); 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) if (isTranslatable)
{ {