mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-12-13 07:42:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #9777 from glassez/fix-altwebui

Browse source 
Fix Alternative Web UI to be available. Closes #9720
This commit is contained in:
Vladimir Golovnev 2018-10-29 09:20:14 +03:00 committed by GitHub
commit 69bf848f32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/webui/webapplication.cpp
View file

@ -414,13 +414,19 @@ void WebApplication::doProcessRequest()
void WebApplication::configure() void WebApplication::configure()
{ {
const auto pref = Preferences::instance(); const auto *pref = Preferences::instance();
const bool isAltUIUsed = pref->isAltWebUiEnabled();
const QString rootFolder = Utils::Fs::expandPathAbs( const QString rootFolder = Utils::Fs::expandPathAbs(
!pref->isAltWebUiEnabled() ? WWW_FOLDER : pref->getWebUiRootFolder()); !isAltUIUsed ? WWW_FOLDER : pref->getWebUiRootFolder());
if (rootFolder != m_rootFolder) { if ((isAltUIUsed != m_isAltUIUsed) || (rootFolder != m_rootFolder)) {
m_translatedFiles.clear(); m_isAltUIUsed = isAltUIUsed;
m_rootFolder = rootFolder; m_rootFolder = rootFolder;
m_translatedFiles.clear();
if (!m_isAltUIUsed)
LogMsg(tr("Using built-in Web UI."));
else
LogMsg(tr("Using custom Web UI. Location: \"%1\".").arg(m_rootFolder));
} }
const QString newLocale = pref->getLocale(); const QString newLocale = pref->getLocale();
@ -428,11 +434,11 @@ void WebApplication::configure()
m_currentLocale = newLocale; m_currentLocale = newLocale;
m_translatedFiles.clear(); m_translatedFiles.clear();
if (m_translator.load(m_rootFolder + QLatin1String("/translations/webui_") + m_currentLocale)) { if (m_translator.load(m_rootFolder + QLatin1String("/translations/webui_") + m_currentLocale)) {
LogMsg(tr("WebUI translation for selected locale (%1) is successfully loaded.") LogMsg(tr("Web UI translation for selected locale (%1) is successfully loaded.")
.arg(m_currentLocale)); .arg(m_currentLocale));
} }
else { else {
LogMsg(tr("Couldn't load WebUI translation for selected locale (%1). Falling back to default (en).") LogMsg(tr("Couldn't load Web UI translation for selected locale (%1). Falling back to default (en).")
.arg(m_currentLocale), Log::WARNING); .arg(m_currentLocale), Log::WARNING);
} }
} }