diff options
| author | 2011-08-22 15:25:32 +0000 | |
|---|---|---|
| committer | 2011-08-22 15:25:32 +0000 | |
| commit | 88ff25fb5784523e540a097b031ff8fe992464fc (patch) | |
| tree | c8c61fa8a339a00828143ad69d1aaa8be077377a /src/modules | |
| parent | fixed parsing the date of some log files (#1188) + updated deprecated Qt::Sys... (diff) | |
| download | KVIrc-88ff25fb5784523e540a097b031ff8fe992464fc.tar.gz KVIrc-88ff25fb5784523e540a097b031ff8fe992464fc.tar.bz2 KVIrc-88ff25fb5784523e540a097b031ff8fe992464fc.zip | |
fix for #1187
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5938 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/list/ListWindow.cpp | 4 | ||||
| -rw-r--r-- | src/modules/theme/PackThemeDialog.cpp | 4 | ||||
| -rw-r--r-- | src/modules/theme/SaveThemeDialog.cpp | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp index 064482135..b005f4420 100644 --- a/src/modules/list/ListWindow.cpp +++ b/src/modules/list/ListWindow.cpp @@ -372,7 +372,9 @@ void ListWindow::exportList() switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat)) { case 0: - szDate = date.toString("d MMM yyyy hh-mm"); + // this is the equivalent to an empty date.toString() call, but it's needed + // to ensure qt4 will use the default() locale and not the system() one + szDate = QLocale().toString(date, "ddd MMM d hh:mm:ss yyyy"); break; case 1: szDate = date.toString(Qt::ISODate); diff --git a/src/modules/theme/PackThemeDialog.cpp b/src/modules/theme/PackThemeDialog.cpp index c3f07d443..875266f06 100644 --- a/src/modules/theme/PackThemeDialog.cpp +++ b/src/modules/theme/PackThemeDialog.cpp @@ -470,7 +470,9 @@ bool PackThemeDialog::packTheme() switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat)) { case 0: - szTmp = date.toString(); + // this is the equivalent to an empty date.toString() call, but it's needed + // to ensure qt4 will use the default() locale and not the system() one + szTmp = QLocale().toString(date, "ddd MMM d hh:mm:ss yyyy"); break; case 1: szTmp = date.toString(Qt::ISODate); diff --git a/src/modules/theme/SaveThemeDialog.cpp b/src/modules/theme/SaveThemeDialog.cpp index 9dd735cd0..009858128 100644 --- a/src/modules/theme/SaveThemeDialog.cpp +++ b/src/modules/theme/SaveThemeDialog.cpp @@ -250,7 +250,9 @@ bool SaveThemeDialog::saveTheme() switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat)) { case 0: - szTmp = date.toString(); + // this is the equivalent to an empty date.toString() call, but it's needed + // to ensure qt4 will use the default() locale and not the system() one + szTmp = QLocale().toString(date, "ddd MMM d hh:mm:ss yyyy"); break; case 1: szTmp = date.toString(Qt::ISODate); |
