Merge branch 'master' of github.com:martinrotter/rssguard

localization/rssguard_ja.ts

@@ -3394,7 +3394,7 @@ You can install it now.</translation>
     <message>
       <location filename="../src/librssguard/services/gmail/gui/gmailaccountdetails.cpp" line="127"/>
       <source>Some value is entered.</source>
-      <translation type="unfinished">Some value is entered.</translation>
+      <translation>何らかの値が入力されています</translation>
     </message>
     <message>
       <location filename="../src/librssguard/services/gmail/gui/gmailaccountdetails.cpp" line="16"/>
@@ -5117,7 +5117,7 @@ Login tokens expiration: %2</translation>
     <message>
       <location filename="../src/librssguard/services/owncloud/gui/owncloudaccountdetails.cpp" line="18"/>
       <source>Password for your Nextcloud account</source>
-      <translation type="unfinished">Password for your Nextcloud account</translation>
+      <translation>Nextcloudアカウントのパスワード</translation>
     </message>
     <message>
       <location filename="../src/librssguard/services/owncloud/gui/owncloudaccountdetails.cpp" line="20"/>
@@ -7603,8 +7603,8 @@ Unread news: %2</translation>
     <message numerus="yes">
       <location filename="../src/librssguard/gui/reusable/timespinbox.cpp" line="54"/>
       <source>%n hour(s)</source>
-      <translation type="unfinished">
+      <translation>
-        <numerusform>%n hour(s)</numerusform>
+        <numerusform>%n 時間</numerusform>
       </translation>
     </message>
     <message numerus="yes">
@@ -7612,20 +7612,20 @@ Unread news: %2</translation>
       <location filename="../src/librssguard/gui/reusable/timespinbox.cpp" line="65"/>
       <source>%n minute(s)</source>
       <translation>
-        <numerusform>%n minute(s)</numerusform>
+        <numerusform>%n 分</numerusform>
       </translation>
     </message>
     <message>
       <location filename="../src/librssguard/gui/reusable/timespinbox.cpp" line="57"/>
       <location filename="../src/librssguard/gui/reusable/timespinbox.cpp" line="67"/>
       <source> and </source>
-      <translation> and </translation>
+      <translation> </translation>
     </message>
     <message numerus="yes">
       <location filename="../src/librssguard/gui/reusable/timespinbox.cpp" line="64"/>
       <source>%n second(s)</source>
       <translation>
-        <numerusform>%n second(s)</numerusform>
+        <numerusform>%n 秒</numerusform>
       </translation>
     </message>
   </context>
@@ -7745,7 +7745,7 @@ Unread news: %2</translation>
     <message>
       <location filename="../src/librssguard/services/tt-rss/gui/ttrssaccountdetails.cpp" line="32"/>
       <source>URL of your TT-RSS instance WITHOUT trailing &quot;/api/&quot; string</source>
-      <translation type="unfinished">URL of your TT-RSS instance WITHOUT trailing &quot;/api/&quot; string</translation>
+      <translation>末尾の&quot;/api/&quot; を除いたTT-RSSインスタンスのURL</translation>
     </message>
     <message>
       <location filename="../src/librssguard/services/tt-rss/gui/ttrssaccountdetails.cpp" line="34"/>

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(cacheFolder() + QDir::separator() + QSL("web") + QDir::separator() + QSL("cache"));
-
-  m_webFactory->engineProfile()->setCachePath(web_data_root + 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();
 

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;
 

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<Label*>>("QList<Label*>");
   qRegisterMetaType<Label*>("Label*");
 
-  // These settings needs to be set before any QSettings object.
+  // Set window icon, particularly for Linux/Wayland.
-  Application::setApplicationName(QSL(APP_NAME));
+  QGuiApplication::setWindowIcon(qApp->desktopAwareIcon());
-  Application::setApplicationVersion(QSL(APP_VERSION));
-  Application::setOrganizationDomain(QSL(APP_URL));
-  Application::setWindowIcon(qApp->desktopAwareIcon());
 
   qApp->reactOnForeignNotifications();