From 5a8106308e902c820732b63e45d9482cbea3af22 Mon Sep 17 00:00:00 2001 From: Ryunam Date: Thu, 19 Mar 2020 18:47:42 +0100 Subject: [PATCH] Update timedate style options for Last Played sublabel metadata --- intl/msg_hash_es.h | 64 +++++++++++++++++++++++++++---- intl/msg_hash_fr.h | 64 +++++++++++++++++++++++++++---- intl/msg_hash_pt_br.h | 64 +++++++++++++++++++++++++++---- intl/msg_hash_us.h | 64 +++++++++++++++++++++++++++---- menu/menu_setting.c | 88 +++++++++++++++++++++++++++++++++++++++---- msg_hash.h | 20 ++++++++-- runtime_file.c | 85 +++++++++++++++++++++++++++++++++++------ runtime_file.h | 20 ++++++++-- 8 files changed, 410 insertions(+), 59 deletions(-) diff --git a/intl/msg_hash_es.h b/intl/msg_hash_es.h index d44a2725eb..9b706b4337 100644 --- a/intl/msg_hash_es.h +++ b/intl/msg_hash_es.h @@ -9458,17 +9458,53 @@ MSG_HASH( "AAAA/MM/DD - HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY, - "MM/DD/AAAA - HH:MM" + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD, + "AAAA/MM/DD" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DM_HM, - "DD/MM - HH:MM" + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YM, + "AAAA/MM" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS, + "MM/DD/AAAA - HH:MM:SS" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM, + "MM/DD/AAAA - HH:MM" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM, "MM/DD - HH:MM" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY, + "MM/DD/AAAA" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD, + "MM/DD" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS, + "DD/MM/AAAA - HH:MM:SS" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM, + "DD/MM/AAAA - HH:MM" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM, + "DD/MM - HH:MM" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY, + "DD/MM/AAAA" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM, + "DD/MM" + ) MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HMS_AM_PM, "AAAA/MM/DD - HH:MM:SS (AM/PM)" @@ -9478,17 +9514,29 @@ MSG_HASH( "AAAA/MM/DD - HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_AM_PM, - "MM/DD/AAAA - HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS_AM_PM, + "MM/DD/AAAA - HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DM_HM_AM_PM, - "DD/MM - HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM_AM_PM, + "MM/DD/AAAA - HH:MM (AM/PM)" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM_AM_PM, "MM/DD - HH:MM (AM/PM)" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AM_PM, + "DD/MM/AAAA - HH:MM:SS (AM/PM)" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM_AM_PM, + "DD/MM/AAAA - HH:MM (AM/PM)" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM_AM_PM, + "DD/MM - HH:MM (AM/PM)" + ) MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_FUZZY_ARCHIVE_MATCH, "Búsqueda difusa de archivos" diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index c807cfbf66..46fca2c574 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -9466,17 +9466,53 @@ MSG_HASH( "AAAA/MM/JJ - HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY, - "MM/JJ/AAAA - HH:MM" + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD, + "AAAA/MM/JJ" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DM_HM, - "JJ/MM - HH:MM" + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YM, + "AAAA/MM" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS, + "MM/JJ/AAAA - HH:MM:SS" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM, + "MM/JJ/AAAA - HH:MM" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM, "MM/JJ - HH:MM" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY, + "MM/JJ/AAAA" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD, + "MM/JJ" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS, + "JJ/MM/AAAA - HH:MM:SS" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM, + "JJ/MM/AAAA - HH:MM" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM, + "JJ/MM - HH:MM" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY, + "JJ/MM/AAAA" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM, + "JJ/MM" + ) MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HMS_AM_PM, "AAAA/MM/JJ - HH:MM:SS (AM/PM)" @@ -9486,17 +9522,29 @@ MSG_HASH( "AAAA/MM/JJ - HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_AM_PM, - "MM/JJ/AAAA - HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS_AM_PM, + "MM/JJ/AAAA - HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DM_HM_AM_PM, - "JJ/MM - HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM_AM_PM, + "MM/JJ/AAAA - HH:MM (AM/PM)" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM_AM_PM, "MM/JJ - HH:MM (AM/PM)" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AM_PM, + "JJ/MM/AAAA - HH:MM:SS (AM/PM)" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM_AM_PM, + "JJ/MM/AAAA - HH:MM (AM/PM)" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM_AM_PM, + "JJ/MM - HH:MM (AM/PM)" + ) MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_FUZZY_ARCHIVE_MATCH, "Correspondance approximative pour les archives" diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h index 35188bdbec..b627ce6316 100644 --- a/intl/msg_hash_pt_br.h +++ b/intl/msg_hash_pt_br.h @@ -9518,17 +9518,53 @@ MSG_HASH( "AAAA/MM/DD - HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY, - "MM/DD/AAAA - HH:MM" + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD, + "AAAA/MM/DD" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DM_HM, - "DD/MM - HH:MM" + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YM, + "AAAA/MM" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS, + "MM/DD/AAAA - HH:MM:SS" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM, + "MM/DD/AAAA - HH:MM" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM, "MM/DD - HH:MM" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY, + "MM/DD/AAAA" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD, + "MM/DD" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS, + "DD/MM/AAAA - HH:MM:SS" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM, + "DD/MM/AAAA - HH:MM" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM, + "DD/MM - HH:MM" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY, + "DD/MM/AAAA" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM, + "DD/MM" + ) MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HMS_AM_PM, "AAAA/MM/DD - HH:MM:SS (AM/PM)" @@ -9538,17 +9574,29 @@ MSG_HASH( "AAAA/MM/DD - HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_AM_PM, - "MM/DD/AAAA - HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS_AM_PM, + "MM/DD/AAAA - HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DM_HM_AM_PM, - "DD/MM - HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM_AM_PM, + "MM/DD/AAAA - HH:MM (AM/PM)" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM_AM_PM, "MM/DD - HH:MM (AM/PM)" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AM_PM, + "DD/MM/AAAA - HH:MM:SS (AM/PM)" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM_AM_PM, + "DD/MM/AAAA - HH:MM (AM/PM)" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM_AM_PM, + "DD/MM - HH:MM (AM/PM)" + ) MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_FUZZY_ARCHIVE_MATCH, "Correspondência de arquivos difusos" diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index f4da77ca47..ee89c377c8 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -9542,17 +9542,53 @@ MSG_HASH( "YYYY/MM/DD - HH:MM" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY, - "MM/DD/YYYY - HH:MM" + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD, + "YYYY/MM/DD" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DM_HM, - "DD/MM - HH:MM" + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YM, + "YYYY/MM" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS, + "MM/DD/YYYY - HH:MM:SS" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM, + "MM/DD/YYYY - HH:MM" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM, "MM/DD - HH:MM" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY, + "MM/DD/YYYY" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD, + "MM/DD" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS, + "DD/MM/YYYY - HH:MM:SS" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM, + "DD/MM/YYYY - HH:MM" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM, + "DD/MM - HH:MM" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY, + "DD/MM/YYYY" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM, + "DD/MM" + ) MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HMS_AM_PM, "YYYY/MM/DD - HH:MM:SS (AM/PM)" @@ -9562,17 +9598,29 @@ MSG_HASH( "YYYY/MM/DD - HH:MM (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_AM_PM, - "MM/DD/YYYY - HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS_AM_PM, + "MM/DD/YYYY - HH:MM:SS (AM/PM)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DM_HM_AM_PM, - "DD/MM - HH:MM (AM/PM)" + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM_AM_PM, + "MM/DD/YYYY - HH:MM (AM/PM)" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM_AM_PM, "MM/DD - HH:MM (AM/PM)" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AM_PM, + "DD/MM/YYYY - HH:MM:SS (AM/PM)" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM_AM_PM, + "DD/MM/YYYY - HH:MM (AM/PM)" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM_AM_PM, + "DD/MM - HH:MM (AM/PM)" + ) MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_FUZZY_ARCHIVE_MATCH, "Fuzzy archive matching" diff --git a/menu/menu_setting.c b/menu/menu_setting.c index f7f1050c27..2d8d083081 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -4531,16 +4531,28 @@ static void setting_get_string_representation_uint_playlist_sublabel_last_played MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HM), len); break; - case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY: + case PLAYLIST_LAST_PLAYED_STYLE_YMD: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY), + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD), len); break; - case PLAYLIST_LAST_PLAYED_STYLE_DM_HM: + case PLAYLIST_LAST_PLAYED_STYLE_YM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DM_HM), + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YM), + len); + break; + case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HMS: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS), + len); + break; + case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HM: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM), len); break; case PLAYLIST_LAST_PLAYED_STYLE_MD_HM: @@ -4549,6 +4561,48 @@ static void setting_get_string_representation_uint_playlist_sublabel_last_played MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM), len); break; + case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY), + len); + break; + case PLAYLIST_LAST_PLAYED_STYLE_MD: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD), + len); + break; + case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HMS: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS), + len); + break; + case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HM: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM), + len); + break; + case PLAYLIST_LAST_PLAYED_STYLE_DDMM_HM: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM), + len); + break; + case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY), + len); + break; + case PLAYLIST_LAST_PLAYED_STYLE_DDMM: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM), + len); + break; case PLAYLIST_LAST_PLAYED_STYLE_YMD_HMS_AM_PM: strlcpy(s, msg_hash_to_str( @@ -4561,16 +4615,16 @@ static void setting_get_string_representation_uint_playlist_sublabel_last_played MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HM_AM_PM), len); break; - case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_AM_PM: + case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HMS_AM_PM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_AM_PM), + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS_AM_PM), len); break; - case PLAYLIST_LAST_PLAYED_STYLE_DM_HM_AM_PM: + case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HM_AM_PM: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DM_HM_AM_PM), + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM_AM_PM), len); break; case PLAYLIST_LAST_PLAYED_STYLE_MD_HM_AM_PM: @@ -4579,6 +4633,24 @@ static void setting_get_string_representation_uint_playlist_sublabel_last_played MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM_AM_PM), len); break; + case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AM_PM: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AM_PM), + len); + break; + case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HM_AM_PM: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM_AM_PM), + len); + break; + case PLAYLIST_LAST_PLAYED_STYLE_DDMM_HM_AM_PM: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM_AM_PM), + len); + break; } } diff --git a/msg_hash.h b/msg_hash.h index d5fd32c686..bd3dbddd98 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -2734,14 +2734,26 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HMS, MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HM, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DM_HM, + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD, + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YM, + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS, + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM, MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM, + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY, + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD, + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS, + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM, + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM, + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY, + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM, MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HMS_AM_PM, MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_YMD_HM_AM_PM, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_AM_PM, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DM_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MDYYYY_HM_AM_PM, MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_MD_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AM_PM, + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMMYYYY_HM_AM_PM, + MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE_DDMM_HM_AM_PM, MENU_LABEL(HELP_SEND_DEBUG_INFO), MENU_ENUM_LABEL_VALUE_HELP_SEND_DEBUG_INFO_DESC, diff --git a/runtime_file.c b/runtime_file.c index f8e6a3a3f2..d61039ea9d 100644 --- a/runtime_file.c +++ b/runtime_file.c @@ -717,13 +717,13 @@ void runtime_log_get_last_played_str(runtime_log_t *runtime_log, strlcpy(str, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), len); strlcat(str, tmp, len); return; - case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_AM_PM: - last_played_strftime(runtime_log, tmp, sizeof(tmp), " %m/%d/%Y - %I:%M %p"); + case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HMS_AM_PM: + last_played_strftime(runtime_log, tmp, sizeof(tmp), " %m/%d/%Y - %I:%M:%S %p"); strlcpy(str, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), len); strlcat(str, tmp, len); return; - case PLAYLIST_LAST_PLAYED_STYLE_DM_HM_AM_PM: - last_played_strftime(runtime_log, tmp, sizeof(tmp), " %d/%m - %I:%M %p"); + case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HM_AM_PM: + last_played_strftime(runtime_log, tmp, sizeof(tmp), " %m/%d/%Y - %I:%M %p"); strlcpy(str, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), len); strlcat(str, tmp, len); return; @@ -732,6 +732,21 @@ void runtime_log_get_last_played_str(runtime_log_t *runtime_log, strlcpy(str, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), len); strlcat(str, tmp, len); return; + case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AM_PM: + last_played_strftime(runtime_log, tmp, sizeof(tmp), " %d/%m/%Y - %I:%M:%S %p"); + strlcpy(str, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), len); + strlcat(str, tmp, len); + return; + case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HM_AM_PM: + last_played_strftime(runtime_log, tmp, sizeof(tmp), " %d/%m/%Y - %I:%M %p"); + strlcpy(str, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), len); + strlcat(str, tmp, len); + return; + case PLAYLIST_LAST_PLAYED_STYLE_DDMM_HM_AM_PM: + last_played_strftime(runtime_log, tmp, sizeof(tmp), " %d/%m - %I:%M %p"); + strlcpy(str, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), len); + strlcat(str, tmp, len); + return; default: break; } @@ -745,24 +760,72 @@ void runtime_log_get_last_played_str(runtime_log_t *runtime_log, runtime_log->last_played.year, runtime_log->last_played.month, runtime_log->last_played.day, runtime_log->last_played.hour, runtime_log->last_played.minute); return; - case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY: + case PLAYLIST_LAST_PLAYED_STYLE_YMD: + n = snprintf(str, len, "%s %04u/%02u/%02u", + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), + runtime_log->last_played.year, runtime_log->last_played.month, runtime_log->last_played.day); + return; + case PLAYLIST_LAST_PLAYED_STYLE_YM: + n = snprintf(str, len, "%s %04u/%02u", + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), + runtime_log->last_played.year, runtime_log->last_played.month); + return; + case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HMS: + n = snprintf(str, len, "%s %02u/%02u/%04u - %02u:%02u:%02u", + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), + runtime_log->last_played.month, runtime_log->last_played.day, runtime_log->last_played.year, + runtime_log->last_played.hour, runtime_log->last_played.minute, runtime_log->last_played.second); + return; + case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HM: n = snprintf(str, len, "%s %02u/%02u/%04u - %02u:%02u", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), runtime_log->last_played.month, runtime_log->last_played.day, runtime_log->last_played.year, runtime_log->last_played.hour, runtime_log->last_played.minute); return; - case PLAYLIST_LAST_PLAYED_STYLE_DM_HM: - n = snprintf(str, len, "%s %02u/%02u - %02u:%02u", - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), - runtime_log->last_played.day, runtime_log->last_played.month, - runtime_log->last_played.hour, runtime_log->last_played.minute); - return; case PLAYLIST_LAST_PLAYED_STYLE_MD_HM: n = snprintf(str, len, "%s %02u/%02u - %02u:%02u", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), runtime_log->last_played.month, runtime_log->last_played.day, runtime_log->last_played.hour, runtime_log->last_played.minute); return; + case PLAYLIST_LAST_PLAYED_STYLE_MDYYYY: + n = snprintf(str, len, "%s %02u/%02u/%04u", + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), + runtime_log->last_played.month, runtime_log->last_played.day, runtime_log->last_played.year); + return; + case PLAYLIST_LAST_PLAYED_STYLE_MD: + n = snprintf(str, len, "%s %02u/%02u", + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), + runtime_log->last_played.month, runtime_log->last_played.day); + return; + case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HMS: + n = snprintf(str, len, "%s %02u/%02u/%04u - %02u:%02u:%02u", + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), + runtime_log->last_played.day, runtime_log->last_played.month, runtime_log->last_played.year, + runtime_log->last_played.hour, runtime_log->last_played.minute, runtime_log->last_played.second); + return; + case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HM: + n = snprintf(str, len, "%s %02u/%02u/%04u - %02u:%02u", + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), + runtime_log->last_played.day, runtime_log->last_played.month, runtime_log->last_played.year, + runtime_log->last_played.hour, runtime_log->last_played.minute); + return; + case PLAYLIST_LAST_PLAYED_STYLE_DDMM_HM: + n = snprintf(str, len, "%s %02u/%02u - %02u:%02u", + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), + runtime_log->last_played.day, runtime_log->last_played.month, + runtime_log->last_played.hour, runtime_log->last_played.minute); + return; + case PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY: + n = snprintf(str, len, "%s %02u/%02u/%04u", + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), + runtime_log->last_played.day, runtime_log->last_played.month, runtime_log->last_played.year); + return; + case PLAYLIST_LAST_PLAYED_STYLE_DDMM: + n = snprintf(str, len, "%s %02u/%02u", + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED), + runtime_log->last_played.day, runtime_log->last_played.month); + return; case PLAYLIST_LAST_PLAYED_STYLE_YMD_HMS: default: n = snprintf(str, len, "%s %04u/%02u/%02u - %02u:%02u:%02u", diff --git a/runtime_file.h b/runtime_file.h index 701d19293b..4dadf3237e 100644 --- a/runtime_file.h +++ b/runtime_file.h @@ -61,14 +61,26 @@ enum playlist_sublabel_last_played_style_type { PLAYLIST_LAST_PLAYED_STYLE_YMD_HMS = 0, PLAYLIST_LAST_PLAYED_STYLE_YMD_HM, - PLAYLIST_LAST_PLAYED_STYLE_MDYYYY, - PLAYLIST_LAST_PLAYED_STYLE_DM_HM, + PLAYLIST_LAST_PLAYED_STYLE_YMD, + PLAYLIST_LAST_PLAYED_STYLE_YM, + PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HMS, + PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HM, PLAYLIST_LAST_PLAYED_STYLE_MD_HM, + PLAYLIST_LAST_PLAYED_STYLE_MDYYYY, + PLAYLIST_LAST_PLAYED_STYLE_MD, + PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HMS, + PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HM, + PLAYLIST_LAST_PLAYED_STYLE_DDMM_HM, + PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY, + PLAYLIST_LAST_PLAYED_STYLE_DDMM, PLAYLIST_LAST_PLAYED_STYLE_YMD_HMS_AM_PM, PLAYLIST_LAST_PLAYED_STYLE_YMD_HM_AM_PM, - PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_AM_PM, - PLAYLIST_LAST_PLAYED_STYLE_DM_HM_AM_PM, + PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HMS_AM_PM, + PLAYLIST_LAST_PLAYED_STYLE_MDYYYY_HM_AM_PM, PLAYLIST_LAST_PLAYED_STYLE_MD_HM_AM_PM, + PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HMS_AM_PM, + PLAYLIST_LAST_PLAYED_STYLE_DDMMYYYY_HM_AM_PM, + PLAYLIST_LAST_PLAYED_STYLE_DDMM_HM_AM_PM, PLAYLIST_LAST_PLAYED_STYLE_LAST };