aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/kvirc/sparser/KviIrcServerParser_ctcp.cpp2
-rw-r--r--src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp2
-rw-r--r--src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp8
-rw-r--r--src/kvirc/ui/KviConsoleWindow.cpp2
-rw-r--r--src/kvirc/ui/KviCtcpPageDialog.cpp2
-rw-r--r--src/kvirc/ui/KviIrcView_loghandling.cpp6
-rw-r--r--src/kvirc/ui/KviMaskEditor.cpp2
-rw-r--r--src/kvirc/ui/KviUserListView.cpp2
-rw-r--r--src/kvirc/ui/KviWindow.cpp2
-rw-r--r--src/modules/list/ListWindow.cpp2
-rw-r--r--src/modules/logview/LogFile.cpp34
-rw-r--r--src/modules/theme/PackThemeDialog.cpp2
-rw-r--r--src/modules/theme/SaveThemeDialog.cpp2
13 files changed, 49 insertions, 19 deletions
diff --git a/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
index e8844d1bb..ce028c6c9 100644
--- a/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
@@ -1346,7 +1346,7 @@ void KviIrcServerParser::parseCtcpRequestTime(KviCtcpMessage *msg)
szTmp = date.toString(Qt::ISODate);
break;
case 2:
- szTmp = date.toString(Qt::SystemLocaleDate);
+ szTmp = date.toString(Qt::SystemLocaleShortDate);
break;
}
replyCtcp(msg,szTmp);
diff --git a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
index b1bcd6a4c..c2d8d6e98 100644
--- a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
@@ -1521,7 +1521,7 @@ void KviIrcServerParser::parseLiteralTopic(KviIrcMessage *msg)
szTmp = date.toString(Qt::ISODate);
break;
case 2:
- szTmp = date.toString(Qt::SystemLocaleDate);
+ szTmp = date.toString(Qt::SystemLocaleShortDate);
break;
}
chan->topicWidget()->setTopicSetAt(szTmp);
diff --git a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
index 5e2892abe..2cfe3935f 100644
--- a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
@@ -591,7 +591,7 @@ void KviIrcServerParser::parseNumericTopicWhoTime(KviIrcMessage *msg)
szDate = date.toString(Qt::ISODate);
break;
case 2:
- szDate = date.toString(Qt::SystemLocaleDate);
+ szDate = date.toString(Qt::SystemLocaleShortDate);
break;
}
@@ -672,7 +672,7 @@ void getDateTimeStringFromCharTimeT(QString & szBuffer, const char * time_t_stri
szBuffer = date.toString(Qt::ISODate);
break;
case 2:
- szBuffer = date.toString(Qt::SystemLocaleDate);
+ szBuffer = date.toString(Qt::SystemLocaleShortDate);
break;
}
} else szBuffer = __tr2qs("(Unknown)");
@@ -1386,7 +1386,7 @@ void KviIrcServerParser::parseNumericWhoisIdle(KviIrcMessage *msg)
szTmp = date.toString(Qt::ISODate);
break;
case 2:
- szTmp = date.toString(Qt::SystemLocaleDate);
+ szTmp = date.toString(Qt::SystemLocaleShortDate);
break;
}
@@ -1706,7 +1706,7 @@ void KviIrcServerParser::parseNumericCreationTime(KviIrcMessage *msg)
szDate = date.toString(Qt::ISODate);
break;
case 2:
- szDate = date.toString(Qt::SystemLocaleDate);
+ szDate = date.toString(Qt::SystemLocaleShortDate);
break;
}
diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp
index 120213a6a..d6af998b4 100644
--- a/src/kvirc/ui/KviConsoleWindow.cpp
+++ b/src/kvirc/ui/KviConsoleWindow.cpp
@@ -1241,7 +1241,7 @@ void KviConsoleWindow::getWindowListTipText(QString &buffer)
szTmp = date.toString(Qt::ISODate);
break;
case 2:
- szTmp = date.toString(Qt::SystemLocaleDate);
+ szTmp = date.toString(Qt::SystemLocaleShortDate);
break;
}
diff --git a/src/kvirc/ui/KviCtcpPageDialog.cpp b/src/kvirc/ui/KviCtcpPageDialog.cpp
index bfac60059..a56f8bd10 100644
--- a/src/kvirc/ui/KviCtcpPageDialog.cpp
+++ b/src/kvirc/ui/KviCtcpPageDialog.cpp
@@ -93,7 +93,7 @@ void KviCtcpPageDialog::addPage(const QString &szNick,const QString &szUser,cons
szDate = date.toString(Qt::ISODate);
break;
case 2:
- szDate = date.toString(Qt::SystemLocaleDate);
+ szDate = date.toString(Qt::SystemLocaleShortDate);
break;
}
diff --git a/src/kvirc/ui/KviIrcView_loghandling.cpp b/src/kvirc/ui/KviIrcView_loghandling.cpp
index 5d3542642..18e326e47 100644
--- a/src/kvirc/ui/KviIrcView_loghandling.cpp
+++ b/src/kvirc/ui/KviIrcView_loghandling.cpp
@@ -58,7 +58,7 @@ void KviIrcView::stopLogging()
szDate = date.toString(Qt::ISODate);
break;
case 2:
- szDate = date.toString(Qt::SystemLocaleDate);
+ szDate = date.toString(Qt::SystemLocaleShortDate);
break;
}
@@ -226,7 +226,7 @@ bool KviIrcView::startLogging(const QString& fname,bool bPrependCurBuffer)
szDate = date.toString(Qt::ISODate);
break;
case 2:
- szDate = date.toString(Qt::SystemLocaleDate);
+ szDate = date.toString(Qt::SystemLocaleShortDate);
break;
}
@@ -273,7 +273,7 @@ void KviIrcView::add2Log(const QString &szBuffer,int iMsgType,bool bPrependDate)
szDate = date.toString(Qt::ISODate);
break;
case 2:
- szDate = date.toString(Qt::SystemLocaleDate);
+ szDate = date.toString(Qt::SystemLocaleShortDate);
break;
}
diff --git a/src/kvirc/ui/KviMaskEditor.cpp b/src/kvirc/ui/KviMaskEditor.cpp
index 5ee693bcb..70549b7d1 100644
--- a/src/kvirc/ui/KviMaskEditor.cpp
+++ b/src/kvirc/ui/KviMaskEditor.cpp
@@ -52,7 +52,7 @@ KviMaskItem::KviMaskItem(QTreeWidget * pParent, KviMaskEntry * pEntry)
szDate = date.toString(Qt::ISODate);
break;
case 2:
- szDate = date.toString(Qt::SystemLocaleDate);
+ szDate = date.toString(Qt::SystemLocaleShortDate);
break;
}
setText(0,mask()->szMask);
diff --git a/src/kvirc/ui/KviUserListView.cpp b/src/kvirc/ui/KviUserListView.cpp
index 59208786f..e23efeb1c 100644
--- a/src/kvirc/ui/KviUserListView.cpp
+++ b/src/kvirc/ui/KviUserListView.cpp
@@ -1577,7 +1577,7 @@ void KviUserListView::maybeTip(KviUserListToolTip * pTip, const QPoint & pnt)
szTmp = date.toString(Qt::ISODate);
break;
case 2:
- szTmp = date.toString(Qt::SystemLocaleDate);
+ szTmp = date.toString(Qt::SystemLocaleShortDate);
break;
}
diff --git a/src/kvirc/ui/KviWindow.cpp b/src/kvirc/ui/KviWindow.cpp
index 0d0dbc15b..da0fc15c5 100644
--- a/src/kvirc/ui/KviWindow.cpp
+++ b/src/kvirc/ui/KviWindow.cpp
@@ -565,7 +565,7 @@ void KviWindow::getDefaultLogFileName(QString & szBuffer)
szDate = date.toString(Qt::ISODate);
break;
case 2:
- szDate = date.toString(Qt::SystemLocaleDate);
+ szDate = date.toString(Qt::SystemLocaleShortDate);
break;
case 0:
default:
diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp
index 6a936db6c..064482135 100644
--- a/src/modules/list/ListWindow.cpp
+++ b/src/modules/list/ListWindow.cpp
@@ -378,7 +378,7 @@ void ListWindow::exportList()
szDate = date.toString(Qt::ISODate);
break;
case 2:
- szDate = date.toString(Qt::SystemLocaleDate);
+ szDate = date.toString(Qt::SystemLocaleShortDate);
break;
}
szFile = QString(__tr2qs("Channel list for %1 - %2")).arg(connection()->currentNetworkName(),szDate);
diff --git a/src/modules/logview/LogFile.cpp b/src/modules/logview/LogFile.cpp
index 098d82636..172a1c32b 100644
--- a/src/modules/logview/LogFile.cpp
+++ b/src/modules/logview/LogFile.cpp
@@ -27,6 +27,7 @@
#include "KviQString.h"
#include "KviCString.h"
#include "KviOptions.h"
+#include "KviFileUtils.h"
#include <QFileInfo>
@@ -78,13 +79,28 @@ LogFile::LogFile(const QString & szName)
m_szNetwork = szUndecoded.hexDecode(szUndecoded.ptr()).ptr();
QString szDate = szTmpName.section('_',-1).section('.',0,-2);
+
switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat))
{
case 1:
m_date = QDate::fromString(szDate, Qt::ISODate);
break;
case 2:
- m_date = QDate::fromString(szDate, Qt::SystemLocaleDate);
+ m_date = QDate::fromString(szDate, Qt::SystemLocaleShortDate);
+ if(!m_date.isValid())
+ {
+ // some locale date formats use '/' as a separator; we change them to '-'
+ // when creating log files. Try to reverse that change here
+ QString szUnescapedDate = szDate;
+ szUnescapedDate.replace('-', KVI_PATH_SEPARATOR_CHAR);
+ m_date = QDate::fromString(szUnescapedDate, Qt::SystemLocaleShortDate);
+ if(m_date.isValid())
+ {
+ //qt4 defaults to 1900 for years. So "11" means "1911" instead of "2011".. what a pity
+ if(m_date.year() < 1990)
+ m_date = m_date.addYears(100);
+ }
+ }
break;
case 0:
default:
@@ -101,7 +117,21 @@ LogFile::LogFile(const QString & szName)
m_date = QDate::fromString(szDate, Qt::ISODate);
if(!m_date.isValid())
{
- m_date = QDate::fromString(szDate, Qt::SystemLocaleDate);
+ m_date = QDate::fromString(szDate, Qt::SystemLocaleShortDate);
+ if(!m_date.isValid())
+ {
+ // some locale date formats use '/' as a separator; we change them to '-'
+ // when creating log files. Try to reverse that change here
+ QString szUnescapedDate = szDate;
+ szUnescapedDate.replace('-', KVI_PATH_SEPARATOR_CHAR);
+ m_date = QDate::fromString(szUnescapedDate, Qt::SystemLocaleShortDate);
+ if(m_date.isValid())
+ {
+ //qt4 defaults to 1900 for years. So "11" means "1911" instead of "2011".. what a pity
+ if(m_date.year() < 1990)
+ m_date = m_date.addYears(100);
+ }
+ }
// if the date is still not valid, we give up
}
}
diff --git a/src/modules/theme/PackThemeDialog.cpp b/src/modules/theme/PackThemeDialog.cpp
index dc92c62a7..c3f07d443 100644
--- a/src/modules/theme/PackThemeDialog.cpp
+++ b/src/modules/theme/PackThemeDialog.cpp
@@ -476,7 +476,7 @@ bool PackThemeDialog::packTheme()
szTmp = date.toString(Qt::ISODate);
break;
case 2:
- szTmp = date.toString(Qt::SystemLocaleDate);
+ szTmp = date.toString(Qt::SystemLocaleShortDate);
break;
}
diff --git a/src/modules/theme/SaveThemeDialog.cpp b/src/modules/theme/SaveThemeDialog.cpp
index 3b7f5801b..9dd735cd0 100644
--- a/src/modules/theme/SaveThemeDialog.cpp
+++ b/src/modules/theme/SaveThemeDialog.cpp
@@ -256,7 +256,7 @@ bool SaveThemeDialog::saveTheme()
szTmp = date.toString(Qt::ISODate);
break;
case 2:
- szTmp = date.toString(Qt::SystemLocaleDate);
+ szTmp = date.toString(Qt::SystemLocaleShortDate);
break;
}
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 10:39:22 +0000