From 8e0ad1b1fd6d51cf7dfc1e5db892aab9ac3700ac Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 18 Jun 2016 03:05:44 +0200 Subject: [PATCH] Add translatable strings --- menu/intl/menu_hash_us.c | 18 ++++++++++++++++++ menu/menu_displaylist.c | 29 ++++++++++++++++++----------- menu/menu_hash.h | 18 ++++++++++++++++++ 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/menu/intl/menu_hash_us.c b/menu/intl/menu_hash_us.c index e9e6fd15b1..f6e3e78fdf 100644 --- a/menu/intl/menu_hash_us.c +++ b/menu/intl/menu_hash_us.c @@ -26,6 +26,10 @@ static const char *menu_hash_to_str_us_label_enum(enum menu_hash_enums msg) { switch (msg) { + case MENU_ENUM_LABEL_CPU_ARCHITECTURE: + return "system_information_cpu_architecture"; + case MENU_ENUM_LABEL_CPU_CORES: + return "system_information_cpu_cores"; case MENU_ENUM_LABEL_NO_ITEMS: return "no_items"; case MENU_ENUM_LABEL_SETTINGS_TAB: @@ -848,6 +852,20 @@ const char *menu_hash_to_str_us_enum(enum menu_hash_enums msg) switch (msg) { + case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_EDGE_MAGAZINE_RATING: + return "Edge Magazine Rating"; + case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_EDGE_MAGAZINE_REVIEW: + return "Edge Magazine Review"; + case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_FAMITSU_MAGAZINE_RATING: + return "Famitsu Magazine Rating"; + case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_TGDB_RATING: + return "TGDB Rating"; + case MENU_ENUM_LABEL_VALUE_CPU_ARCHITECTURE: + return "CPU Architecture:"; + case MENU_ENUM_LABEL_VALUE_CPU_CORES: + return "CPU Cores:"; + case MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS: + return "Internal storage status"; case MENU_ENUM_LABEL_VALUE_PARENT_DIRECTORY: return ".."; case MENU_ENUM_LABEL_VALUE_RUN: diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 4df333b9fb..17db9321a1 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -666,7 +666,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info) #ifdef ANDROID bool perms = test_permissions(internal_storage_path); - snprintf(tmp, sizeof(tmp), "%s: %s", "Internal storage status", + snprintf(tmp, sizeof(tmp), "%s: %s", menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS), perms ? "read-write" : "read-only"); menu_entries_add_enum(info->list, tmp, "", MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0); @@ -691,7 +691,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info) char cpu_arch_str[PATH_MAX_LENGTH] = {0}; char cpu_text_str[PATH_MAX_LENGTH] = {0}; enum frontend_architecture arch = frontend_driver_get_cpu_architecture(); - strlcpy(cpu_text_str, "CPU Architecture: ", sizeof(cpu_text_str)); + strlcpy(cpu_text_str, menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_CPU_ARCHITECTURE), sizeof(cpu_text_str)); switch (arch) { @@ -724,17 +724,20 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info) snprintf(cpu_str, sizeof(cpu_str), "%s %s", cpu_text_str, cpu_arch_str); - menu_entries_add_enum(info->list, cpu_str, "", - MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0); + menu_entries_add_enum(info->list, cpu_str, + menu_hash_to_str_enum(MENU_ENUM_LABEL_CPU_ARCHITECTURE), + MENU_ENUM_LABEL_CPU_ARCHITECTURE, MENU_SETTINGS_CORE_INFO_NONE, 0, 0); } { char cpu_str[PATH_MAX_LENGTH] = {0}; unsigned amount_cores = cpu_features_get_core_amount(); - snprintf(cpu_str, sizeof(cpu_str), "CPU Cores: %d\n", amount_cores); - menu_entries_add_enum(info->list, cpu_str, "", - MENU_ENUM_LABEL_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0); + snprintf(cpu_str, sizeof(cpu_str), + "%s %d\n", menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_CPU_CORES), amount_cores); + menu_entries_add_enum(info->list, cpu_str, + menu_hash_to_str_enum(MENU_ENUM_LABEL_CPU_CORES), + MENU_ENUM_LABEL_CPU_CORES, MENU_SETTINGS_CORE_INFO_NONE, 0, 0); } @@ -1902,7 +1905,8 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) } if (db_info_entry->tgdb_rating) { - if (create_string_list_rdb_entry_int("TGDB Rating", + if (create_string_list_rdb_entry_int( + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_TGDB_RATING), menu_hash_to_str_enum(MENU_ENUM_LABEL_RDB_ENTRY_TGDB_RATING), db_info_entry->tgdb_rating, info->path, info->list) == -1) @@ -1910,7 +1914,8 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) } if (db_info_entry->famitsu_magazine_rating) { - if (create_string_list_rdb_entry_int("Famitsu Magazine Rating", + if (create_string_list_rdb_entry_int( + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_FAMITSU_MAGAZINE_RATING), menu_hash_to_str_enum(MENU_ENUM_LABEL_RDB_ENTRY_FAMITSU_MAGAZINE_RATING), db_info_entry->famitsu_magazine_rating, info->path, info->list) == -1) @@ -1918,14 +1923,16 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) } if (db_info_entry->edge_magazine_review) { - if (create_string_list_rdb_entry_string("Edge Magazine Review", + if (create_string_list_rdb_entry_string( + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_EDGE_MAGAZINE_REVIEW), menu_hash_to_str_enum(MENU_ENUM_LABEL_RDB_ENTRY_EDGE_MAGAZINE_REVIEW), db_info_entry->edge_magazine_review, info->path, info->list) == -1) goto error; } if (db_info_entry->edge_magazine_rating) { - if (create_string_list_rdb_entry_int("Edge Magazine Rating", + if (create_string_list_rdb_entry_int( + menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_EDGE_MAGAZINE_RATING), menu_hash_to_str_enum(MENU_ENUM_LABEL_RDB_ENTRY_EDGE_MAGAZINE_RATING), db_info_entry->edge_magazine_rating, info->path, info->list) == -1) diff --git a/menu/menu_hash.h b/menu/menu_hash.h index 31874f22fe..58cb863cc4 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -25,6 +25,14 @@ enum menu_hash_enums MENU_ENUM_LABEL_UNKNOWN = 0, MENU_ENUM_LABEL_START_NET_RETROPAD, MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD, + + MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS, + + MENU_ENUM_LABEL_VALUE_CPU_ARCHITECTURE, + MENU_ENUM_LABEL_CPU_ARCHITECTURE, + + MENU_ENUM_LABEL_VALUE_CPU_CORES, + MENU_ENUM_LABEL_CPU_CORES, MENU_ENUM_LABEL_INPUT_LIBRETRO_DEVICE, MENU_ENUM_LABEL_INPUT_PLAYER_ANALOG_DPAD_MODE, @@ -693,11 +701,21 @@ enum menu_hash_enums MENU_ENUM_LABEL_RDB_ENTRY_ELSPA_RATING, MENU_ENUM_LABEL_RDB_ENTRY_PEGI_RATING, MENU_ENUM_LABEL_RDB_ENTRY_CERO_RATING, + MENU_ENUM_LABEL_RDB_ENTRY_EDGE_MAGAZINE_RATING, + MENU_ENUM_LABEL_VALUE_RDB_ENTRY_EDGE_MAGAZINE_RATING, + MENU_ENUM_LABEL_RDB_ENTRY_EDGE_MAGAZINE_ISSUE, + MENU_ENUM_LABEL_RDB_ENTRY_EDGE_MAGAZINE_REVIEW, + MENU_ENUM_LABEL_VALUE_RDB_ENTRY_EDGE_MAGAZINE_REVIEW, + MENU_ENUM_LABEL_RDB_ENTRY_FAMITSU_MAGAZINE_RATING, + MENU_ENUM_LABEL_VALUE_RDB_ENTRY_FAMITSU_MAGAZINE_RATING, + MENU_ENUM_LABEL_RDB_ENTRY_TGDB_RATING, + MENU_ENUM_LABEL_VALUE_RDB_ENTRY_TGDB_RATING, + MENU_ENUM_LABEL_RDB_ENTRY_RELEASE_MONTH, MENU_ENUM_LABEL_VALUE_RDB_ENTRY_RELEASE_MONTH, MENU_ENUM_LABEL_RDB_ENTRY_RELEASE_YEAR,