From d8cdee1cced106bdf97707ce5ffc23914bf4a3b8 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Mon, 26 Feb 2018 22:03:58 +0100 Subject: [PATCH] DataPaths: Remove Translations path --- src/lib/app/datapaths.cpp | 1 - src/lib/app/datapaths.h | 21 +++++++++---------- .../schemehandlers/falkonschemehandler.cpp | 3 +-- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/lib/app/datapaths.cpp b/src/lib/app/datapaths.cpp index a5854850b..d4ffedab8 100644 --- a/src/lib/app/datapaths.cpp +++ b/src/lib/app/datapaths.cpp @@ -156,7 +156,6 @@ void DataPaths::initCurrentProfile(const QString &profilePath) void DataPaths::initAssetsIn(const QString &path) { - m_paths[Translations].append(path + QLatin1String("/locale")); m_paths[Themes].append(path + QLatin1String("/themes")); m_paths[Plugins].append(path + QLatin1String("/plugins")); } diff --git a/src/lib/app/datapaths.h b/src/lib/app/datapaths.h index 67fca2cfe..3a75ca462 100644 --- a/src/lib/app/datapaths.h +++ b/src/lib/app/datapaths.h @@ -28,17 +28,16 @@ class FALKON_EXPORT DataPaths { public: enum Path { - AppData = 0, // /usr/share/falkon or . or ../Resources - Translations = 1, // $AppData/locale - Themes = 2, // $AppData/themes - Plugins = 3, // $AppData/plugins - Config = 4, // $XDG_CONFIG_HOME/falkon or %LOCALAPPDATA%/falkon or $AppData/data (portable) - Profiles = 5, // $Config/profiles - CurrentProfile = 6, // $Profiles/current_profile - Temp = 7, // $Config/tmp - Cache = 8, // $XDG_CACHE_HOME/falkon or $CurrentProfile/cache - Sessions = 9, // $CurrentProfile/sessions - LastPath = 10 + AppData = 0, + Themes, + Plugins, + Config, + Profiles, + CurrentProfile, + Temp, + Cache, + Sessions, + LastPath }; explicit DataPaths(); diff --git a/src/lib/network/schemehandlers/falkonschemehandler.cpp b/src/lib/network/schemehandlers/falkonschemehandler.cpp index 8a33ac947..d36fb8d25 100644 --- a/src/lib/network/schemehandlers/falkonschemehandler.cpp +++ b/src/lib/network/schemehandlers/falkonschemehandler.cpp @@ -326,8 +326,7 @@ QString FalkonSchemeReply::configPage() QString("
%1
%2
").arg(tr("Saved session"), SessionManager::defaultSessionPath()) + QString("
%1
%2
").arg(tr("Data"), allPaths(DataPaths::AppData)) + QString("
%1
%2
").arg(tr("Themes"), allPaths(DataPaths::Themes)) + - QString("
%1
%2
").arg(tr("Extensions"), allPaths(DataPaths::Plugins)) + - QString("
%1
%2
").arg(tr("Translations"), allPaths(DataPaths::Translations))); + QString("
%1
%2
").arg(tr("Extensions"), allPaths(DataPaths::Plugins))); #ifdef QT_DEBUG QString debugBuild = tr("Enabled");