tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Encode strftime output into utf-8 before displaying in GUI

Browse Source
This commit is contained in:
Jean-Francois Dockes
2016-08-06 15:01:34 +02:00
parent 1d51eff4d8
commit bfb0f4c03b
4 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/qtgui/restable.cpp
+7 -4
View File
@@ -49,6 +49,7 @@
#include "rclmain_w.h"
#include "multisave.h"
#include "appformime.h"
#include "transcode.h"
static const QKeySequence quitKeySeq("Ctrl+q");
static const QKeySequence closeKeySeq("Ctrl+w");
@@ -177,15 +178,17 @@ static string sizegetter(const string& fld, const Rcl::Doc& doc)
static string dategetter(const string&, const Rcl::Doc& doc)
{
char datebuf[100];
datebuf[0] = 0;
string sdate;
if (!doc.dmtime.empty() || !doc.fmtime.empty()) {
char datebuf[100];
datebuf[0] = 0;
time_t mtime = doc.dmtime.empty() ?
atoll(doc.fmtime.c_str()) : atoll(doc.dmtime.c_str());
struct tm *tm = localtime(&mtime);
strftime(datebuf, 99, "%Y-%m-%d", tm);
transcode(datebuf, sdate, RclConfig::getLocaleCharset(), "UTF-8");
}
return datebuf;
return sdate;
}
static string datetimegetter(const string&, const Rcl::Doc& doc)
@@ -196,7 +199,7 @@ static string datetimegetter(const string&, const Rcl::Doc& doc)
time_t mtime = doc.dmtime.empty() ?
atoll(doc.fmtime.c_str()) : atoll(doc.dmtime.c_str());
struct tm *tm = localtime(&mtime);
strftime(datebuf, 99, "%Y-%m-%d %H:%M:%S %z", tm);
strftime(datebuf, 99, prefs.creslistdateformat.c_str(), tm);
}
return datebuf;
}