diff --git a/localization/rssguard_ja.ts b/localization/rssguard_ja.ts
index 067a2c710..129b67962 100644
--- a/localization/rssguard_ja.ts
+++ b/localization/rssguard_ja.ts
@@ -3394,7 +3394,7 @@ You can install it now.
Some value is entered.
- Some value is entered.
+ 何らかの値が入力されています
@@ -5117,7 +5117,7 @@ Login tokens expiration: %2
Password for your Nextcloud account
- Password for your Nextcloud account
+ Nextcloudアカウントのパスワード
@@ -7603,8 +7603,8 @@ Unread news: %2
%n hour(s)
-
- %n hour(s)
+
+ %n 時間
@@ -7612,20 +7612,20 @@ Unread news: %2
%n minute(s)
- %n minute(s)
+ %n 分
and
- and
+
%n second(s)
- %n second(s)
+ %n 秒
@@ -7745,7 +7745,7 @@ Unread news: %2
URL of your TT-RSS instance WITHOUT trailing "/api/" string
- URL of your TT-RSS instance WITHOUT trailing "/api/" string
+ 末尾の"/api/" を除いたTT-RSSインスタンスのURL
diff --git a/src/librssguard/miscellaneous/application.cpp b/src/librssguard/miscellaneous/application.cpp
index 52e2dfeb9..b115eb2d0 100644
--- a/src/librssguard/miscellaneous/application.cpp
+++ b/src/librssguard/miscellaneous/application.cpp
@@ -177,11 +177,9 @@ Application::Application(const QString& id, int& argc, char** argv, const QStrin
#if defined(USE_WEBENGINE)
m_webFactory->urlIinterceptor()->load();
- const QString web_data_root = userDataFolder() + QDir::separator() + QSL("web");
-
- m_webFactory->engineProfile()->setCachePath(web_data_root + QDir::separator() + QSL("cache"));
+ m_webFactory->engineProfile()->setCachePath(cacheFolder() + QDir::separator() + QSL("web") + QDir::separator() + QSL("cache"));
m_webFactory->engineProfile()->setHttpCacheType(QWebEngineProfile::HttpCacheType::DiskHttpCache);
- m_webFactory->engineProfile()->setPersistentStoragePath(web_data_root + QDir::separator() + QSL("storage"));
+ m_webFactory->engineProfile()->setPersistentStoragePath(userDataFolder() + QDir::separator() + QSL("web") + QDir::separator() + QSL("storage"));
m_webFactory->loadCustomCss(userDataFolder() + QDir::separator() + QSL("web") + QDir::separator() +
QSL("user-styles.css"));
@@ -511,6 +509,14 @@ QString Application::userDataFolder() {
}
}
+QString Application::cacheFolder() {
+#if defined(Q_OS_LINUX)
+ return QStandardPaths::writableLocation(QStandardPaths::StandardLocation::CacheLocation);
+#else
+ return userDataFolder();
+#endif
+}
+
QString Application::replaceDataUserDataFolderPlaceholder(QString text) const {
auto user_data_folder = qApp->userDataFolder();
diff --git a/src/librssguard/miscellaneous/application.h b/src/librssguard/miscellaneous/application.h
index e56d7d493..d2c6711c7 100644
--- a/src/librssguard/miscellaneous/application.h
+++ b/src/librssguard/miscellaneous/application.h
@@ -148,6 +148,8 @@ class RSSGUARD_DLLSPEC Application : public SingleApplication {
// NOTE: Use this to get correct path under which store user data.
QString userDataFolder();
+ QString cacheFolder();
+
QString replaceDataUserDataFolderPlaceholder(QString text) const;
QStringList replaceDataUserDataFolderPlaceholder(QStringList texts) const;
diff --git a/src/rssguard/main.cpp b/src/rssguard/main.cpp
index 812e6e67b..afe5553d0 100644
--- a/src/rssguard/main.cpp
+++ b/src/rssguard/main.cpp
@@ -64,6 +64,11 @@ int main(int argc, char* argv[]) {
QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
#endif
+ // Set some names.
+ QCoreApplication::setApplicationName(QSL(APP_NAME));
+ QCoreApplication::setApplicationVersion(QSL(APP_VERSION));
+ QCoreApplication::setOrganizationDomain(QSL(APP_URL));
+
// Instantiate base application object.
Application application(QSL(APP_LOW_NAME), argc, argv, raw_cli_args);
@@ -84,11 +89,8 @@ int main(int argc, char* argv[]) {
qRegisterMetaType>("QList