From 982dd47f017ab07a0994dd39d281bd5a5effc460 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 29 Jun 2016 03:06:15 +0200 Subject: [PATCH] Translate a bunch of log strings --- intl/msg_hash_us.c | 24 +++++++++++++++++++ msg_hash.h | 12 ++++++++++ network/netplay/netplay_common.c | 40 +++++++++++++++++++++----------- 3 files changed, 62 insertions(+), 14 deletions(-) diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index ff691a3295..80f13579f5 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -2014,6 +2014,8 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) return "Compiled against API"; case MSG_FAILED_TO_LOAD: return "Failed to load"; + case MSG_CONNECTED_TO: + return "Connected to"; case MSG_FAILED_TO_ACCEPT_INCOMING_SPECTATOR: return "Failed to accept incoming spectator."; case MSG_FAILED_TO_GET_NICKNAME_FROM_CLIENT: @@ -2024,6 +2026,28 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) return "Failed to generate BSV header."; case MSG_FAILED_TO_SEND_HEADER_TO_CLIENT: return "Failed to send header to client."; + case MSG_FAILED_TO_RECEIVE_NICKNAME_SIZE_FROM_HOST: + return "Failed to receive nickname size from host."; + case MSG_FAILED_TO_RECEIVE_NICKNAME: + return "Failed to receive nickname."; + case MSG_FAILED_TO_RECEIVE_NICKNAME_FROM_HOST: + return "Failed to receive nickname from host."; + case MSG_FAILED_TO_SEND_NICKNAME_SIZE: + return "Failed to send nickname size."; + case MSG_FAILED_TO_SEND_SRAM_DATA_TO_CLIENT: + return "Failed to send SRAM data to client."; + case MSG_FAILED_TO_RECEIVE_HEADER_FROM_CLIENT: + return "Failed to receive header from client."; + case MSG_FAILED_TO_RECEIVE_SRAM_DATA_FROM_HOST: + return "Failed to receive SRAM data from host."; + case MSG_CONTENT_CRC32S_DIFFER: + return "Content CRC32s differ. Cannot use different games."; + case MSG_FAILED_TO_SEND_NICKNAME: + return "Failed to send nickname."; + case MSG_FAILED_TO_SEND_NICKNAME_TO_HOST: + return "Failed to send nickname to host."; + case MSG_INVALID_NICKNAME_SIZE: + return "Invalid nickname size."; case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ANALOG: return "Analog supported"; case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_COOP: diff --git a/msg_hash.h b/msg_hash.h index 268dba865b..73109bf7e2 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -115,12 +115,23 @@ enum msg_hash_enums MSG_UNKNOWN = 0, MSG_LIBRETRO_FRONTEND, MSG_LOADING, + MSG_CONNECTED_TO, MSG_FAILED_TO_LOAD, MSG_FAILED_TO_ACCEPT_INCOMING_SPECTATOR, MSG_FAILED_TO_GET_NICKNAME_FROM_CLIENT, MSG_FAILED_TO_SEND_NICKNAME_TO_CLIENT, + MSG_FAILED_TO_SEND_NICKNAME_TO_HOST, MSG_FAILED_TO_GENERATE_BSV_HEADER, MSG_FAILED_TO_SEND_HEADER_TO_CLIENT, + MSG_FAILED_TO_RECEIVE_NICKNAME_SIZE_FROM_HOST, + MSG_FAILED_TO_RECEIVE_NICKNAME, + MSG_FAILED_TO_RECEIVE_NICKNAME_FROM_HOST, + MSG_FAILED_TO_RECEIVE_HEADER_FROM_CLIENT, + MSG_FAILED_TO_RECEIVE_SRAM_DATA_FROM_HOST, + MSG_FAILED_TO_SEND_NICKNAME_SIZE, + MSG_FAILED_TO_SEND_NICKNAME, + MSG_FAILED_TO_SEND_SRAM_DATA_TO_CLIENT, + MSG_INVALID_NICKNAME_SIZE, MSG_VERSION_OF_LIBRETRO_API, MSG_COMPILED_AGAINST_API, MSG_ERROR_LIBRETRO_CORE_REQUIRES_SPECIAL_CONTENT, @@ -145,6 +156,7 @@ enum msg_hash_enums MSG_FAILED_TO_OPEN_LIBRETRO_CORE, MSG_COULD_NOT_FIND_ANY_NEXT_DRIVER, MSG_MOVIE_FORMAT_DIFFERENT_SERIALIZER_VERSION, + MSG_CONTENT_CRC32S_DIFFER, MSG_RECORDING_TERMINATED_DUE_TO_RESIZE, MSG_FAILED_TO_START_RECORDING, MSG_REVERTING_SAVEFILE_DIRECTORY_TO, diff --git a/network/netplay/netplay_common.c b/network/netplay/netplay_common.c index 4d5ae598c3..41004f41ac 100644 --- a/network/netplay/netplay_common.c +++ b/network/netplay/netplay_common.c @@ -17,6 +17,7 @@ #include "netplay_private.h" #include +#include "../../msg_hash.h" #include "../../content.h" bool netplay_get_nickname(netplay_t *netplay, int fd) @@ -25,19 +26,21 @@ bool netplay_get_nickname(netplay_t *netplay, int fd) if (!socket_receive_all_blocking(fd, &nick_size, sizeof(nick_size))) { - RARCH_ERR("Failed to receive nick size from host.\n"); + RARCH_ERR("%s\n", + msg_hash_to_str(MSG_FAILED_TO_RECEIVE_NICKNAME_SIZE_FROM_HOST)); return false; } if (nick_size >= sizeof(netplay->other_nick)) { - RARCH_ERR("Invalid nick size.\n"); + RARCH_ERR("%s\n", + msg_hash_to_str(MSG_INVALID_NICKNAME_SIZE)); return false; } if (!socket_receive_all_blocking(fd, netplay->other_nick, nick_size)) { - RARCH_ERR("Failed to receive nick.\n"); + RARCH_ERR("%s\n", msg_hash_to_str(MSG_FAILED_TO_RECEIVE_NICKNAME)); return false; } @@ -49,13 +52,13 @@ bool netplay_send_nickname(netplay_t *netplay, int fd) if (!socket_send_all_blocking(fd, &nick_size, sizeof(nick_size), false)) { - RARCH_ERR("Failed to send nick size.\n"); + RARCH_ERR("%s\n", msg_hash_to_str(MSG_FAILED_TO_SEND_NICKNAME_SIZE)); return false; } if (!socket_send_all_blocking(fd, netplay->nick, nick_size, false)) { - RARCH_ERR("Failed to send nick.\n"); + RARCH_ERR("%s\n", msg_hash_to_str(MSG_FAILED_TO_SEND_NICKNAME)); return false; } @@ -217,7 +220,8 @@ bool netplay_send_info(netplay_t *netplay) if (!netplay_send_nickname(netplay, netplay->fd)) { - RARCH_ERR("Failed to send nick to host.\n"); + RARCH_ERR("%s\n", + msg_hash_to_str(MSG_FAILED_TO_SEND_NICKNAME_TO_HOST)); return false; } @@ -227,17 +231,21 @@ bool netplay_send_info(netplay_t *netplay) if (!socket_receive_all_blocking(netplay->fd, sram, sram_size)) { - RARCH_ERR("Failed to receive SRAM data from host.\n"); + RARCH_ERR("%s\n", + msg_hash_to_str(MSG_FAILED_TO_RECEIVE_SRAM_DATA_FROM_HOST)); return false; } if (!netplay_get_nickname(netplay, netplay->fd)) { - RARCH_ERR("Failed to receive nick from host.\n"); + RARCH_ERR("%s\n", + msg_hash_to_str(MSG_FAILED_TO_RECEIVE_NICKNAME_FROM_HOST)); return false; } - snprintf(msg, sizeof(msg), "Connected to: \"%s\"", netplay->other_nick); + snprintf(msg, sizeof(msg), "%s: \"%s\"", + msg_hash_to_str(MSG_CONNECTED_TO), + netplay->other_nick); RARCH_LOG("%s\n", msg); runloop_msg_queue_push(msg, 1, 180, false); @@ -254,7 +262,8 @@ bool netplay_get_info(netplay_t *netplay) if (!socket_receive_all_blocking(netplay->fd, header, sizeof(header))) { - RARCH_ERR("Failed to receive header from client.\n"); + RARCH_ERR("%s\n", + msg_hash_to_str(MSG_FAILED_TO_RECEIVE_HEADER_FROM_CLIENT)); return false; } @@ -262,7 +271,7 @@ bool netplay_get_info(netplay_t *netplay) if (*content_crc_ptr != ntohl(header[0])) { - RARCH_ERR("Content CRC32s differ. Cannot use different games.\n"); + RARCH_ERR("%s\n", msg_hash_to_str(MSG_CONTENT_CRC32S_DIFFER)); return false; } @@ -285,7 +294,8 @@ bool netplay_get_info(netplay_t *netplay) if (!netplay_get_nickname(netplay, netplay->fd)) { - RARCH_ERR("Failed to get nickname from client.\n"); + RARCH_ERR("%s\n", + msg_hash_to_str(MSG_FAILED_TO_GET_NICKNAME_FROM_CLIENT)); return false; } @@ -295,13 +305,15 @@ bool netplay_get_info(netplay_t *netplay) if (!socket_send_all_blocking(netplay->fd, sram, sram_size, false)) { - RARCH_ERR("Failed to send SRAM data to client.\n"); + RARCH_ERR("%s\n", + msg_hash_to_str(MSG_FAILED_TO_SEND_SRAM_DATA_TO_CLIENT)); return false; } if (!netplay_send_nickname(netplay, netplay->fd)) { - RARCH_ERR("Failed to send nickname to client.\n"); + RARCH_ERR("%s\n", + msg_hash_to_str(MSG_FAILED_TO_SEND_NICKNAME_TO_CLIENT)); return false; }