diff --git a/Makefile.common b/Makefile.common index 7ee77cab4c..e6ae2be514 100644 --- a/Makefile.common +++ b/Makefile.common @@ -463,8 +463,7 @@ endif ifeq ($(UTF8), 1) DEFINES += -DHAVE_UTF8 - OBJ += intl/msg_hash_ru.o \ - menu/intl/menu_hash_ru.o + OBJ += intl/msg_hash_ru.o DEFINES += -finput-charset=UTF-8 endif diff --git a/menu/intl/menu_hash_ru.c b/intl/russian.h similarity index 98% rename from menu/intl/menu_hash_ru.c rename to intl/russian.h index a1316da6a5..bd85181b3c 100644 --- a/menu/intl/menu_hash_ru.c +++ b/intl/russian.h @@ -14,8 +14,8 @@ * If not, see . */ -#ifndef __INTL_ENGLISH_H -#define __INTL_ENGLISH_H +#ifndef __INTL_RUSSIAN_H +#define __INTL_RUSSIAN_H #define RETRO_LBL_JOYPAD_B "RetroPad, кнопка B" #define RETRO_LBL_JOYPAD_Y "RetroPad, кнопка Y" diff --git a/menu/menu_hash.c b/menu/menu_hash.c index 2b2e4b8adf..145e5daae3 100644 --- a/menu/menu_hash.c +++ b/menu/menu_hash.c @@ -57,11 +57,6 @@ const char *menu_hash_to_str(uint32_t hash) case RETRO_LANGUAGE_POLISH: ret = menu_hash_to_str_pl(hash); break; - case RETRO_LANGUAGE_RUSSIAN: -#ifdef HAVE_UTF8 - ret = menu_hash_to_str_ru(hash); -#endif - break; default: break; } @@ -106,11 +101,6 @@ int menu_hash_get_help(uint32_t hash, char *s, size_t len) case RETRO_LANGUAGE_POLISH: ret = menu_hash_get_help_pl(hash, s, len); break; - case RETRO_LANGUAGE_RUSSIAN: -#ifdef HAVE_UTF8 - ret = menu_hash_get_help_ru(hash, s, len); -#endif - break; default: break; } diff --git a/menu/menu_hash.h b/menu/menu_hash.h index 551af13a0b..f72df225cf 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -1149,11 +1149,6 @@ int menu_hash_get_help_nl(uint32_t hash, char *s, size_t len); const char *menu_hash_to_str_pl(uint32_t hash); int menu_hash_get_help_pl(uint32_t hash, char *s, size_t len); -#ifdef HAVE_UTF8 -const char *menu_hash_to_str_ru(uint32_t hash); -int menu_hash_get_help_ru(uint32_t hash, char *s, size_t len); -#endif - const char *menu_hash_to_str_pt(uint32_t hash); int menu_hash_get_help_pt(uint32_t hash, char *s, size_t len);