Restore ability to use server-side translation by custom WebUI

PR #20711.
This commit is contained in:
Vladimir Golovnev 2024-04-27 17:53:29 +03:00 committed by GitHub
parent 694661d751
commit 769de08463
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 10 deletions

View File

@ -114,7 +114,7 @@ namespace
if ((contentType == Http::CONTENT_TYPE_CSS)
|| (contentType == Http::CONTENT_TYPE_JS))
{
{
// short interval in case of program update
return u"private, max-age=43200"_s; // 12 hrs
}
@ -520,15 +520,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);
@ -559,7 +556,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)
{