Re-fix #11146 with recent LaTeX

[lyx.git] / src / support / lyxtime.cpp

diff --git a/src/support/lyxtime.cpp b/src/support/lyxtime.cpp
index 9bdde9cb3af6696b68125cecd14ae4070b4012e3..f3318eb3f0e35aeea8bf98021c1fb84a1061c11e 100644 (file)
--- a/src/support/lyxtime.cpp
+++ b/src/support/lyxtime.cpp
@@ -31,16 +31,19 @@ time_t current_time()
 }
 
 
-string const formatted_time(time_t t, string const & fmt)
+docstring formatted_datetime(time_t t, string const & fmt)
 {
-       struct tm * loc_tm = localtime(&t);
-       char date[50];
-       strftime(date, sizeof(date), fmt.c_str(), loc_tm);
-       return string(date);
+       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_ctime(string t)
+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)
@@ -57,6 +60,7 @@ time_t from_ctime(string t)
                                << "´ (invalid format)");
                return static_cast<time_t>(-1);
        }
+       loc_dt.setTimeSpec(Qt::UTC);
        return loc_dt.toTime_t();
 }