Adding proper translations for changing resolution

This commit is contained in:
Francisco Javier Trujillo Mata 2021-10-01 19:52:52 +02:00
parent 3bbfcf7b39
commit 9f96723dd0
6 changed files with 87 additions and 22 deletions

View File

@ -12283,6 +12283,50 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION, MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION,
"Screen Resolution" "Screen Resolution"
) )
MSG_HASH(
MSG_SCREEN_RESOLUTION_FORMAT_NO_DESC,
"%ux%u"
)
MSG_HASH(
MSG_SCREEN_RESOLUTION_FORMAT_DESC,
"%ux%u - %s"
)
MSG_HASH(
MSG_SCREEN_RESOLUTION_DEFAULT,
"Screen Resolution: Default"
)
MSG_HASH(
MSG_SCREEN_RESOLUTION_NO_DESC,
"Screen Resolution: %dx%d"
)
MSG_HASH(
MSG_SCREEN_RESOLUTION_DESC,
"Screen Resolution: %dx%d - %s"
)
MSG_HASH(
MSG_SCREEN_RESOLUTION_APPLYING_DEFAULT,
"Applying: Default"
)
MSG_HASH(
MSG_SCREEN_RESOLUTION_APPLYING_NO_DESC,
"Applying: %dx%d\nSTART to reset"
)
MSG_HASH(
MSG_SCREEN_RESOLUTION_APPLYING_DESC,
"Applying: %dx%d - %s\nSTART to reset"
)
MSG_HASH(
MSG_SCREEN_RESOLUTION_RESETTING_DEFAULT,
"Resetting to: Default"
)
MSG_HASH(
MSG_SCREEN_RESOLUTION_RESETTING_NO_DESC,
"Resetting to: %dx%d"
)
MSG_HASH(
MSG_SCREEN_RESOLUTION_RESETTING_DESC,
"Resetting to: %dx%d - %s"
)
MSG_HASH( MSG_HASH(
MENU_ENUM_SUBLABEL_SCREEN_RESOLUTION, MENU_ENUM_SUBLABEL_SCREEN_RESOLUTION,
"Select display mode." "Select display mode."

View File

@ -1046,13 +1046,17 @@ static void menu_action_setting_disp_set_label_menu_video_resolution(
{ {
#ifdef GEKKO #ifdef GEKKO
if (width == 0 || height == 0) if (width == 0 || height == 0)
strcpy_literal(s, "DEFAULT"); snprintf(s, len, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DONT_CARE));
else else
#endif #endif
snprintf(s, len, "%ux%u", width, height); {
/* Add video output description if exists */
if (!string_is_empty(desc)) if (!string_is_empty(desc))
snprintf(s, len, "%s - %s", s, desc); snprintf(s, len, msg_hash_to_str(MSG_SCREEN_RESOLUTION_FORMAT_DESC),
width, height, desc);
else
snprintf(s, len, msg_hash_to_str(MSG_SCREEN_RESOLUTION_FORMAT_NO_DESC),
width, height);
}
} }
else else
strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), len); strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), len);

View File

@ -6774,16 +6774,17 @@ static int action_ok_video_resolution(const char *path,
video_driver_set_video_mode(width, height, true); video_driver_set_video_mode(width, height, true);
#ifdef GEKKO #ifdef GEKKO
if (width == 0 || height == 0) if (width == 0 || height == 0)
strcpy_literal(msg, "Applying: DEFAULT"); snprintf(msg, sizeof(msg), msg_hash_to_str(MSG_SCREEN_RESOLUTION_APPLYING_DEFAULT));
else else
#endif #endif
snprintf(msg, sizeof(msg), {
"Applying: %dx%d",
width, height);
/* Add description of resolution */
if (!string_is_empty(desc)) if (!string_is_empty(desc))
snprintf(msg, sizeof(msg), "%s - %s", msg, desc); snprintf(msg, sizeof(msg), msg_hash_to_str(MSG_SCREEN_RESOLUTION_APPLYING_DESC),
snprintf(msg, sizeof(msg), "%s\n START to reset", msg); width, height, desc);
else
snprintf(msg, sizeof(msg), msg_hash_to_str(MSG_SCREEN_RESOLUTION_APPLYING_NO_DESC),
width, height);
}
runloop_msg_queue_push(msg, 1, 100, true, NULL, runloop_msg_queue_push(msg, 1, 100, true, NULL,
MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO); MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
} }

View File

@ -509,11 +509,14 @@ static int action_start_video_resolution(
strlcpy(msg, "Resetting to: DEFAULT", sizeof(msg)); strlcpy(msg, "Resetting to: DEFAULT", sizeof(msg));
else else
#endif #endif
snprintf(msg, sizeof(msg), {
"Resetting to: %dx%d", width, height);
/* Add description of resolution */
if (!string_is_empty(desc)) if (!string_is_empty(desc))
snprintf(msg, sizeof(msg), "%s - %s", msg, desc); snprintf(msg, sizeof(msg), msg_hash_to_str(MSG_SCREEN_RESOLUTION_RESETTING_DESC),
width, height, desc);
else
snprintf(msg, sizeof(msg), msg_hash_to_str(MSG_SCREEN_RESOLUTION_RESETTING_NO_DESC),
width, height);
}
runloop_msg_queue_push(msg, 1, 100, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO); runloop_msg_queue_push(msg, 1, 100, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
} }

View File

@ -1845,6 +1845,19 @@ enum msg_hash_enums
MENU_LABEL(CHEAT_COPY_MATCH), MENU_LABEL(CHEAT_COPY_MATCH),
MENU_LABEL(CHEAT_DELETE_MATCH), MENU_LABEL(CHEAT_DELETE_MATCH),
MENU_LABEL(SCREEN_RESOLUTION), MENU_LABEL(SCREEN_RESOLUTION),
MSG_SCREEN_RESOLUTION_FORMAT_NO_DESC,
MSG_SCREEN_RESOLUTION_FORMAT_DESC,
MSG_SCREEN_RESOLUTION_DEFAULT,
MSG_SCREEN_RESOLUTION_NO_DESC,
MSG_SCREEN_RESOLUTION_DESC,
MSG_SCREEN_RESOLUTION_APPLYING_DEFAULT,
MSG_SCREEN_RESOLUTION_APPLYING_NO_DESC,
MSG_SCREEN_RESOLUTION_APPLYING_DESC,
MSG_SCREEN_RESOLUTION_RESETTING_DEFAULT,
MSG_SCREEN_RESOLUTION_RESETTING_NO_DESC,
MSG_SCREEN_RESOLUTION_RESETTING_DESC,
MENU_LABEL(SAVESTATE_AUTO_INDEX), MENU_LABEL(SAVESTATE_AUTO_INDEX),
MENU_LABEL(SAVESTATE_MAX_KEEP), MENU_LABEL(SAVESTATE_MAX_KEEP),
MENU_LABEL(SAVESTATE_AUTO_SAVE), MENU_LABEL(SAVESTATE_AUTO_SAVE),

View File

@ -7208,16 +7208,16 @@ bool command_event(enum event_command cmd, void *data)
video_driver_set_video_mode(width, height, true); video_driver_set_video_mode(width, height, true);
if (width == 0 || height == 0) if (width == 0 || height == 0)
snprintf(msg, sizeof(msg), "%s: DEFAULT", snprintf(msg, sizeof(msg), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION_DEFAULT));
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION));
else else
{ {
snprintf(msg, sizeof(msg),"%s: %dx%d",
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION),
width, height);
/* Add description of resolution */
if (!string_is_empty(desc)) if (!string_is_empty(desc))
snprintf(msg, sizeof(msg), "%s - %s", msg, desc); snprintf(msg, sizeof(msg),
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION_DESC),
width, height, desc);
else
snprintf(msg, sizeof(msg), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION_NO_DESC),
width, height);
} }
runloop_msg_queue_push(msg, 1, 100, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO); runloop_msg_queue_push(msg, 1, 100, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);