diff --git a/src/librssguard/gui/webviewer.cpp b/src/librssguard/gui/webviewer.cpp index 85eb84a96..ad568739d 100644 --- a/src/librssguard/gui/webviewer.cpp +++ b/src/librssguard/gui/webviewer.cpp @@ -143,7 +143,8 @@ void WebViewer::loadMessages(const QList& messages, RootItem* root) { QString msg_date = qApp->settings()->value(GROUP(Messages), SETTING(Messages::UseCustomDate)).toBool() ? message.m_created.toLocalTime().toString(qApp->settings()->value(GROUP(Messages), SETTING(Messages::CustomDateFormat)).toString()) - : QLocale().toString(message.m_created.toLocalTime(), QLocale::FormatType::ShortFormat); + : qApp->localization()->loadedLocale().toString(message.m_created.toLocalTime(), + QLocale::FormatType::ShortFormat); messages_layout.append(single_message_layout .arg(message.m_title, diff --git a/src/librssguard/miscellaneous/settings.cpp b/src/librssguard/miscellaneous/settings.cpp index c04a7613e..b25251b10 100644 --- a/src/librssguard/miscellaneous/settings.cpp +++ b/src/librssguard/miscellaneous/settings.cpp @@ -37,7 +37,7 @@ DVALUE(QString) Node::NpmExecutableDef = "npm"; #endif DKEY Node::PackageFolder = QSL("package_folder") + OS_ID; -DVALUE(QString) Node::PackageFolderDef = QSL(USER_DATA_PLACEHOLDER) + "/node-packages-" + OS_ID; +DVALUE(QString) Node::PackageFolderDef = QSL(USER_DATA_PLACEHOLDER) + "/node-packages-" + QSL(OS_ID).toLower(); // Cookies. DKEY Cookies::ID = "cookies"; diff --git a/src/librssguard/services/feedly/gui/feedlyaccountdetails.cpp b/src/librssguard/services/feedly/gui/feedlyaccountdetails.cpp index c8817b433..a9ae65b15 100644 --- a/src/librssguard/services/feedly/gui/feedlyaccountdetails.cpp +++ b/src/librssguard/services/feedly/gui/feedlyaccountdetails.cpp @@ -32,7 +32,7 @@ FeedlyAccountDetails::FeedlyAccountDetails(QWidget* parent) : QWidget(parent), m tr("Here, results of connection test are shown.")); #if defined(FEEDLY_OFFICIAL_SUPPORT) - m_ui.m_lblInfo->setHelpText(tr("Your %1 build has official Feedly support. You do not have to use \"developer acess " + m_ui.m_lblInfo->setHelpText(tr("Your %1 build has official Feedly support. You do not have to use \"developer access " "token\". You can therefore leave corresponding field empty.").arg(QSL(APP_NAME)), false); #else diff --git a/src/rssguard/CMakeLists.txt b/src/rssguard/CMakeLists.txt index 2e224ce5c..cf289074d 100644 --- a/src/rssguard/CMakeLists.txt +++ b/src/rssguard/CMakeLists.txt @@ -35,7 +35,7 @@ if(APPLE) elseif(WIN32) target_link_libraries(app PUBLIC Shell32.lib - odbc32 + odbc32.lib ) endif()