diff --git a/input/input_autodetect.c b/input/input_autodetect.c index a39c537140..4585226265 100644 --- a/input/input_autodetect.c +++ b/input/input_autodetect.c @@ -28,6 +28,7 @@ #include "../configuration.h" #include "../file_path_special.h" #include "../list_special.h" +#include "../msg_hash.h" #include "../runloop.h" #include "../verbosity.h" @@ -144,7 +145,7 @@ static void input_autoconfigure_joypad_add(config_file_t *conf, if (string_is_equal(device_type, "remote")) { - snprintf(msg, sizeof(msg), "%s configured", + snprintf(msg, sizeof(msg), "%s configured.", string_is_empty(display_name) ? params->name : display_name); if(!remote_is_bound) @@ -153,8 +154,9 @@ static void input_autoconfigure_joypad_add(config_file_t *conf, } else { - snprintf(msg, sizeof(msg), "%s configured in port #%u.", + snprintf(msg, sizeof(msg), "%s %s #%u.", string_is_empty(display_name) ? params->name : display_name, + msg_hash_to_str(MSG_DEVICE_CONFIGURED_IN_PORT), params->idx); if (!block_osd_spam) @@ -207,7 +209,7 @@ static bool input_autoconfigure_joypad_from_conf_dir( if(!list) return false; - RARCH_LOG("Autodetect: %d profiles found\n", list->size); + RARCH_LOG("Autodetect: %d profiles found.\n", list->size); for (i = 0; i < list->size; i++) { @@ -311,8 +313,9 @@ bool input_config_autoconfigure_joypad(autoconfig_params_t *params) RARCH_LOG("Autodetect: no profiles found for %s (%d/%d).\n", params->name, params->vid, params->pid); - snprintf(msg, sizeof(msg), "%s (%ld/%ld) not configured.", - params->name, (long)params->vid, (long)params->pid); + snprintf(msg, sizeof(msg), "%s (%ld/%ld) %s.", + params->name, (long)params->vid, (long)params->pid, + msg_hash_to_str(MSG_DEVICE_NOT_CONFIGURED)); runloop_msg_queue_push(msg, 2, 60, false); error: @@ -338,7 +341,10 @@ void input_config_autoconfigure_disconnect(unsigned i, const char *ident) msg[0] = '\0'; - snprintf(msg, sizeof(msg), "Device disconnected from port #%u (%s).", i, ident); + snprintf(msg, sizeof(msg), "%s #%u (%s).", + msg_hash_to_str(MSG_DEVICE_DISCONNECTED_FROM_PORT), + i, ident); runloop_msg_queue_push(msg, 2, 60, false); - RARCH_LOG("Autodetect: %s\n", msg); + RARCH_LOG("%s: %s\n", msg_hash_to_str(MSG_AUTODETECT), + msg); } diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index 05118fa9ef..7f25a68473 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -1920,12 +1920,20 @@ static const char *menu_hash_to_str_us_label_enum(enum msg_hash_enums msg) return "Got connection from"; case MSG_SHUTTING_DOWN: return "shutting_down"; + case MSG_AUTODETECT: + return "Autodetect"; case MSG_REBOOTING: return "rebooting"; case MSG_FAILED_TO_START_AUDIO_DRIVER: return "failed_to_start_audio_driver"; case MSG_FOUND_LAST_STATE_SLOT: return "found_last_state_slot"; + case MSG_DEVICE_CONFIGURED_IN_PORT: + return "configured in port"; + case MSG_DEVICE_NOT_CONFIGURED: + return "not configured"; + case MSG_DEVICE_DISCONNECTED_FROM_PORT: + return "Device disconnected from port"; case MSG_CONNECT_DEVICE_FROM_A_VALID_PORT: return "connect_device_from_a_valid_port"; case MSG_DISCONNECT_DEVICE_FROM_A_VALID_PORT: diff --git a/msg_hash.h b/msg_hash.h index 2226fcbc99..a66f403dc2 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -128,7 +128,11 @@ enum msg_file_type enum msg_hash_enums { MSG_UNKNOWN = 0, + MSG_AUTODETECT, MSG_LIBRETRO_FRONTEND, + MSG_DEVICE_CONFIGURED_IN_PORT, + MSG_DEVICE_NOT_CONFIGURED, + MSG_DEVICE_DISCONNECTED_FROM_PORT, MSG_LOADING, MSG_CONNECTED_TO, MSG_FAILED_TO_LOAD,