X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Flyxtime.cpp;h=5415ac4eeb034057234b363d3931d7d004ca40ba;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=f5290a2324a4cf67696c1928221ae81316958250;hpb=e04523f77be2a6d2b5ca708900857154b1eff902;p=lyx.git diff --git a/src/support/lyxtime.cpp b/src/support/lyxtime.cpp index f5290a2324..5415ac4eeb 100644 --- a/src/support/lyxtime.cpp +++ b/src/support/lyxtime.cpp @@ -40,7 +40,19 @@ string const formatted_time(time_t t, string const & fmt) } -time_t from_gmtime(string t) +docstring formatted_datetime(time_t t, string const & fmt) +{ + QString qres; + if (fmt.empty()) + qres = QLocale().toString(QDateTime::fromTime_t(t), + QLocale::ShortFormat); + else + qres = QLocale().toString(QDateTime::fromTime_t(t), toqstr(fmt)); + return qstring_to_ucs4(qres); +} + + +time_t from_asctime_utc(string t) { // Example for the format: "Sun Nov 6 10:39:39 2011\n" // Generously remove trailing '\n' (and other whitespace if needed)