Merge pull request #296 from Stunkymonkey/include-order

[i3/i3status] / src / print_time.c

diff --git a/src/print_time.c b/src/print_time.c
index 9fa6642c600644e66bd2781153d4cf837a9f14df..3a6c4cc0752757aa77170500baf4b9e6e1aa2b37 100644 (file)
--- a/src/print_time.c
+++ b/src/print_time.c
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
+#include <locale.h>
 #include <yajl/yajl_gen.h>
 #include <yajl/yajl_version.h>
 
@@ -28,12 +29,12 @@ void set_timezone(const char *tz) {
         } else {
             unsetenv("TZ");
         }
-        tzset();
         current_timezone = tz;
     }
+    tzset();
 }
 
-void print_time(yajl_gen json_gen, char *buffer, const char *title, const char *format, const char *tz, const char *format_time, time_t t) {
+void print_time(yajl_gen json_gen, char *buffer, const char *title, const char *format, const char *tz, const char *locale, const char *format_time, time_t t) {
     const char *walk;
     char *outwalk = buffer;
     struct tm tm;
@@ -45,6 +46,10 @@ void print_time(yajl_gen json_gen, char *buffer, const char *title, const char *
     set_timezone(tz);
     localtime_r(&t, &tm);
 
+    if (locale != NULL) {
+        setlocale(LC_ALL, locale);
+    }
+
     if (format_time == NULL) {
         strftime(timebuf, sizeof(timebuf), format, &tm);
         maybe_escape_markup(timebuf, &outwalk);
@@ -52,17 +57,22 @@ void print_time(yajl_gen json_gen, char *buffer, const char *title, const char *
         for (walk = format; *walk != '\0'; walk++) {
             if (*walk != '%') {
                 *(outwalk++) = *walk;
-                continue;
-            }
 
-            if (BEGINS_WITH(walk + 1, "time")) {
+            } else if (BEGINS_WITH(walk + 1, "time")) {
                 strftime(timebuf, sizeof(timebuf), format_time, &tm);
                 maybe_escape_markup(timebuf, &outwalk);
                 walk += strlen("time");
+
+            } else {
+                *(outwalk++) = '%';
             }
         }
     }
 
+    if (locale != NULL) {
+        setlocale(LC_ALL, "");
+    }
+
     *outwalk = '\0';
     OUTPUT_FULL_TEXT(buffer);
 }