From 017d1b710e6c3864518adbdbba6ddcaf273b4f52 Mon Sep 17 00:00:00 2001
From: =Christian Murphy <cfm.work@gmail.com>
Date: Fri, 5 Oct 2018 23:11:38 +0100
Subject: [PATCH] Restore default time mode, replace non-sensical time date
 formats with more commonly used ones

---
 config.def.h        | 2 +-
 intl/msg_hash_us.h  | 6 +++---
 menu/menu_driver.c  | 6 +++---
 menu/menu_setting.c | 2 +-
 msg_hash.h          | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config.def.h b/config.def.h
index de7e1dd4fe..3a73c9044b 100644
--- a/config.def.h
+++ b/config.def.h
@@ -697,7 +697,7 @@ static const unsigned menu_thumbnails_default = 3;
 
 static const unsigned menu_left_thumbnails_default = 0;
 
-static const unsigned menu_timedate_style = 4;
+static const unsigned menu_timedate_style = 5;
 
 static const bool xmb_vertical_thumbnails = false;
 
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index fee3011d21..8e12aa6fe3 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -2886,8 +2886,8 @@ MSG_HASH(
        "YYYY-MM-DD HH:MM"
     )
     MSG_HASH(
-       MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD,
-       "YY-MM-DD"
+       MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY,
+       "MM-DD-YYYY HH:MM"
     )
     MSG_HASH(
        MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS,
@@ -2907,7 +2907,7 @@ MSG_HASH(
     )
     MSG_HASH(
        MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_AM_PM,
-       "HH:MM (AM/PM)"
+       "HH:MM:SS (AM/PM)"
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_TITLE_COLOR,
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index ebdfa229a6..38303dcb68 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -358,9 +358,9 @@ void menu_display_timedate(menu_display_ctx_datetime_t *datetime)
          strftime(datetime->s, datetime->len,
                "%Y-%m-%d %H:%M", localtime(&time_));
          break;
-      case 2: /* Date */
+      case 2: /* MM-DD-YYYY HH:MM  */
          strftime(datetime->s, datetime->len,
-               "%y-%m-%d", localtime(&time_));
+               "%m-%d-%Y %H:%M", localtime(&time_));
          break;
       case 3: /* Time */
          strftime(datetime->s, datetime->len,
@@ -384,7 +384,7 @@ void menu_display_timedate(menu_display_ctx_datetime_t *datetime)
             "%r", localtime(&time_));
 #else
          strftime(datetime->s, datetime->len,
-            "%I:%M %p", localtime(&time_));
+            "%I:%M:%S %p", localtime(&time_));
 #endif
    }
 }
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 853dd69f66..23812b4e9b 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -525,7 +525,7 @@ static void setting_get_string_representation_uint_menu_timedate_style(
    case 2:
       strlcpy(s,
          msg_hash_to_str(
-            MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD), len);
+            MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY), len);
       break;
    case 3:
       strlcpy(s,
diff --git a/msg_hash.h b/msg_hash.h
index 0eda40602e..f35b4502de 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -2129,7 +2129,7 @@ enum msg_hash_enums
    MSG_CHEEVOS_HARDCORE_MODE_DISABLED,
    MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS,
    MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM,
-   MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD,
+   MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY,
    MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS,
    MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM,
    MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DM_HM,