From 552ba7fd94286135690f3a39f74c8e6f7743d415 Mon Sep 17 00:00:00 2001 From: Vincent Loupmon Date: Thu, 10 Mar 2016 16:50:32 +0100 Subject: [PATCH] Fixed locale defaulting to English Changed get_datetime() a bit so it respects the user-configured locale (to use time formats with strings for days, months etc.) Same commit as last time, except it merges. --- slstatus.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/slstatus.c b/slstatus.c index 23ed940..fe27be4 100644 --- a/slstatus.c +++ b/slstatus.c @@ -3,6 +3,7 @@ /* global libraries */ #include #include +#include #include #include #include @@ -191,11 +192,14 @@ get_datetime() /* get time in format */ time(&tm); + setlocale(LC_TIME, ""); if(!strftime(buf, bufsize, timeformat, localtime(&tm))) { + setlocale(LC_TIME, "C"); fprintf(stderr, "Strftime failed.\n"); return smprintf("n/a"); } + setlocale(LC_TIME, "C"); /* return time */ return smprintf("%s", buf); }