Merge remote-tracking branch 'incertia/time'

Conflicts: src/config/preferences.c
2015-07-01 20:16:09 +01:00
parent d5f79c7b35 837f8b1f10
commit 106e909fbd
6 changed files with 82 additions and 90 deletions
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -954,12 +954,10 @@ void
 cons_time_setting(void)
 {
    char *pref_time = prefs_get_string(PREF_TIME);
-    if (g_strcmp0(pref_time, "minutes") == 0)
-        cons_show("Time (/time)                  : minutes");
-    else if (g_strcmp0(pref_time, "off") == 0)
+    if (g_strcmp0(pref_time, "off") == 0)
        cons_show("Time (/time)                  : OFF");
    else
-        cons_show("Time (/time)                  : seconds");
+        cons_show("Time (/time)                  : %s", pref_time);

    prefs_free_string(pref_time);