d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-11 07:18:08 +00:00
Code Issues Projects Releases Wiki Activity

Apply locale changes immediately in WebUI

Browse Source
This commit is contained in:
Chocobo1 2018-05-11 20:45:00 +08:00
parent 2230d96705
commit 92a4e73a22
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/webui/webapplication.cpp
View File

@ -95,15 +95,15 @@ namespace
return ret; return ret;
} }
void translateDocument(QString &data) void translateDocument(const QString &locale, QString &data)
{ {
const QRegExp regex("QBT_TR\\((([^\\)]|\\)(?!QBT_TR))+)\\)QBT_TR(\\[CONTEXT=([a-zA-Z_][a-zA-Z0-9_]*)\\])"); const QRegExp regex("QBT_TR\\((([^\\)]|\\)(?!QBT_TR))+)\\)QBT_TR(\\[CONTEXT=([a-zA-Z_][a-zA-Z0-9_]*)\\])");
const QRegExp mnemonic("\\(?&([a-zA-Z]?\\))?"); const QRegExp mnemonic("\\(?&([a-zA-Z]?\\))?");
int i = 0; int i = 0;
bool found = true; bool found = true;
const QString locale = Preferences::instance()->getLocale(); bool isTranslationNeeded = !locale.startsWith("en")
bool isTranslationNeeded = !locale.startsWith("en") || locale.startsWith("en_AU") || locale.startsWith("en_GB"); || locale.startsWith("en_AU") || locale.startsWith("en_GB");
while (i < data.size() && found) { while (i < data.size() && found) {
i = regex.indexIn(data, i); i = regex.indexIn(data, i);
@ -420,7 +420,7 @@ void WebApplication::configure()
{ {
const auto pref = Preferences::instance(); const auto pref = Preferences::instance();
m_domainList = Preferences::instance()->getServerDomains().split(';', QString::SkipEmptyParts); m_domainList = pref->getServerDomains().split(';', QString::SkipEmptyParts);
std::for_each(m_domainList.begin(), m_domainList.end(), [](QString &entry) { entry = entry.trimmed(); }); std::for_each(m_domainList.begin(), m_domainList.end(), [](QString &entry) { entry = entry.trimmed(); });
const QString rootFolder = Utils::Fs::expandPathAbs( const QString rootFolder = Utils::Fs::expandPathAbs(
@ -429,6 +429,12 @@ void WebApplication::configure()
m_translatedFiles.clear(); m_translatedFiles.clear();
m_rootFolder = rootFolder; m_rootFolder = rootFolder;
} }
const QString newLocale = pref->getLocale();
if (m_currentLocale != newLocale) {
m_currentLocale = newLocale;
m_translatedFiles.clear();
}
} }
void WebApplication::registerAPIController(const QString &scope, APIController *controller) void WebApplication::registerAPIController(const QString &scope, APIController *controller)
@ -476,7 +482,7 @@ void WebApplication::sendFile(const QString &path)
// Translate the file // Translate the file
if (isTranslatable) { if (isTranslatable) {
QString dataStr {data}; QString dataStr {data};
translateDocument(dataStr); translateDocument(m_currentLocale, dataStr);
data = dataStr.toUtf8(); data = dataStr.toUtf8();
m_translatedFiles[path] = {data, lastModified}; // caching translated file m_translatedFiles[path] = {data, lastModified}; // caching translated file

1
src/webui/webapplication.h
View File

@ -141,4 +141,5 @@ private:
QDateTime lastModified; QDateTime lastModified;
}; };
QMap<QString, TranslatedFile> m_translatedFiles; QMap<QString, TranslatedFile> m_translatedFiles;
QString m_currentLocale;
}; };