Replace 3 strings with format strings to better accommodate different languages

- "By" becomes "By %s" - "Select" becomes "Select %s" - "Items" becomes "%u Items"
2024-11-24 00:20:01 +00:00 · 2020-08-02 04:46:32 +09:00 · 2020-08-02 04:46:32 +09:00 · b396f29769
commit b396f29769
parent 83f4ce11f3
11 changed files with 43 additions and 130 deletions
--- a/intl/msg_hash_chs.h
+++ b/intl/msg_hash_chs.h
@ -5297,22 +5297,10 @@ MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_SEARCH_NAME,
   "搜索名称..."
   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_BY,
-   "按"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_ITEMS,
-   "条目"
-   )
 MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_SHOW_ALL,
   "显示全部"
   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_SELECT,
-   "选择"
-   )
 MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_ADDITIONAL_FILTER,
   "附加过滤器"
--- a/intl/msg_hash_es.h
+++ b/intl/msg_hash_es.h
@ -5485,22 +5485,10 @@ MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_SEARCH_NAME,
   "Buscar nombre..."
   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_BY,
-   "Por"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_ITEMS,
-   "Elementos"
-   )
 MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_SHOW_ALL,
   "Mostrar todo"
   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_SELECT,
-   "Seleccionar"
-   )
 MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_ADDITIONAL_FILTER,
   "Filtro adicional"
--- a/intl/msg_hash_fr.h
+++ b/intl/msg_hash_fr.h
@ -5481,22 +5481,10 @@ MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_SEARCH_NAME,
   "Rechercher le nom ..."
   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_BY,
-   "Par"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_ITEMS,
-   "Éléments"
-   )
 MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_SHOW_ALL,
   "Tout afficher"
   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_SELECT,
-   "Sélectionner"
-   )
 MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_ADDITIONAL_FILTER,
   "Filtre additionnel"
--- a/intl/msg_hash_it.h
+++ b/intl/msg_hash_it.h
@ -5457,22 +5457,10 @@ MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_SEARCH_NAME,
   "Cerca per Nome ..."
   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_BY,
-   "Da"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_ITEMS,
-   "Elementi"
-   )
 MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_SHOW_ALL,
   "Mostra Tutto"
   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_SELECT,
-   "Seleziona"
-   )
 MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_ADDITIONAL_FILTER,
   "Filtro Aggiuntivo"
--- a/intl/msg_hash_pt_br.h
+++ b/intl/msg_hash_pt_br.h
@ -5461,22 +5461,10 @@ MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_SEARCH_NAME,
   "Pesquisar nome..."
   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_BY,
-   "Por"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_ITEMS,
-   "Itens"
-   )
 MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_SHOW_ALL,
   "Mostrar tudo"
   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_SELECT,
-   "Selecionar"
-   )
 MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_ADDITIONAL_FILTER,
   "Filtro adicional"
--- a/intl/msg_hash_ru.h
+++ b/intl/msg_hash_ru.h
@ -5277,22 +5277,10 @@ MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_SEARCH_NAME,
   "Поиск по имени..."
   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_BY,
-   "От"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_ITEMS,
-   "Элементы"
-   )
 MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_SHOW_ALL,
   "Показать всё"
   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_SELECT,
-   "Выбрать"
-   )
 MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_ADDITIONAL_FILTER,
   "Дополнительный фильтр"
--- a/intl/msg_hash_tr.h
+++ b/intl/msg_hash_tr.h
@ -5489,22 +5489,10 @@ MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_SEARCH_NAME,
   "İsim Ara..."
   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_BY,
-   "Oluşturan"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_ITEMS,
-   "Ögeler"
-   )
 MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_SHOW_ALL,
   "Tümünü Göster"
   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_SELECT,
-   "Seç"
-   )
 MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_ADDITIONAL_FILTER,
   "Ek Filtre"
--- a/intl/msg_hash_uk.h
+++ b/intl/msg_hash_uk.h
@ -2961,22 +2961,10 @@ MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_SEARCH_NAME,
   "Пошук за назвою..."
   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_BY,
-   "За"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_ITEMS,
-   "Елементи"
-   )
 MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_SHOW_ALL,
   "Показати всі"
   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_SELECT,
-   "Вибрати"
-   )
 MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_ALL,
   "Усi"
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@ -5557,22 +5557,10 @@ MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_SEARCH_NAME,
   "Search Name ..."
   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_BY,
-   "By"
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_ITEMS,
-   "Items"
-   )
 MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_SHOW_ALL,
   "Show All"
   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_SELECT,
-   "Select"
-   )
 MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_ADDITIONAL_FILTER,
   "Additional Filter"
@ -5585,6 +5573,18 @@ MSG_HASH(
   MENU_ENUM_LABEL_VALUE_EXPLORE_ADD_ADDITIONAL_FILTER,
   "Add Additional Filter"
   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_CATEGORY,
+   "By %s"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_EXPLORE_ITEM_COUNT,
+   "%u Items"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_EXPLORE_SELECT_CATEGORY,
+   "Select %s"
+   )

 /* Playlist > Playlist Item */

--- a/menu/menu_explore.c
+++ b/menu/menu_explore.c
@ -1000,6 +1000,7 @@ unsigned menu_displaylist_explore(file_list_t *list)
      for (cat = 0; cat < EXPLORE_CAT_COUNT; cat++)
      {
         explore_string_t **entries = explore_state->by[cat];
+         int tmplen;

         if (!EX_BUF_LEN(entries))
            continue;
@ -1008,21 +1009,26 @@ unsigned menu_displaylist_explore(file_list_t *list)
            if (stack_top[i].type == cat + EXPLORE_TYPE_FIRSTCATEGORY)
               goto SKIP_EXPLORE_BY_CATEGORY;

-         if (!is_top)
-            snprintf(tmp, sizeof(tmp), "%s %s",
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_EXPLORE_BY),
-                  msg_hash_to_str(explore_by_info[cat].name_enum));
-         else if (explore_by_info[cat].is_numeric)
-            snprintf(tmp, sizeof(tmp), "%s %s (%s - %s)",
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_EXPLORE_BY),
-                  msg_hash_to_str(explore_by_info[cat].name_enum),
-                  entries[0]->str, entries[EX_BUF_LEN(entries) - 1]->str);
-         else
-            snprintf(tmp, sizeof(tmp), "%s %s (%u %s)",
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_EXPLORE_BY),
-                  msg_hash_to_str(explore_by_info[cat].name_enum),
-                  (unsigned)EX_BUF_LEN(entries),
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_EXPLORE_ITEMS));
+         tmplen = snprintf(tmp, sizeof(tmp),
+               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_EXPLORE_BY_CATEGORY),
+               msg_hash_to_str(explore_by_info[cat].name_enum));
+
+         if (is_top && tmplen >= 0 && tmplen < sizeof(tmp) - 5)
+         {
+            if (explore_by_info[cat].is_numeric)
+            {
+               snprintf(tmp + tmplen, sizeof(tmp) - tmplen, " (%s - %s)",
+                     entries[0]->str, entries[EX_BUF_LEN(entries) - 1]->str);
+            }
+            else
+            {
+               strlcat(tmp, " (", sizeof(tmp));
+               snprintf(tmp + tmplen + 2, sizeof(tmp) - tmplen - 2,
+                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_EXPLORE_ITEM_COUNT),
+                     (unsigned)EX_BUF_LEN(entries));
+               strlcat(tmp, ")", sizeof(tmp));
+            }
+         }

         explore_menu_entry(list, explore_state,
               tmp, cat + EXPLORE_TYPE_FIRSTCATEGORY);
@ -1057,8 +1063,8 @@ SKIP_EXPLORE_BY_CATEGORY:;
               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UNKNOWN), EXPLORE_TYPE_FILTERNULL);
      }

-      explore_append_title(explore_state, "%s %s",
-            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_EXPLORE_SELECT),
+      explore_append_title(explore_state,
+            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_EXPLORE_SELECT_CATEGORY),
            msg_hash_to_str(explore_by_info[current_cat].name_enum));
   }
   else if (
@ -1081,9 +1087,12 @@ SKIP_EXPLORE_BY_CATEGORY:;

      /* List filtered items in a selected explore by category */
      if (is_filtered_category)
-         explore_append_title(explore_state, " - %s %s",
-               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_EXPLORE_SELECT),
+      {
+         explore_append_title(explore_state, " - ");
+         explore_append_title(explore_state,
+               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_EXPLORE_SELECT_CATEGORY),
               msg_hash_to_str(explore_by_info[current_cat].name_enum));
+      }
      else
      {
         /* Game list */
--- a/msg_hash.h
+++ b/msg_hash.h
@ -1868,13 +1868,13 @@ enum msg_hash_enums
   MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_REGION,
   MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_TAGS,
   MENU_ENUM_LABEL_VALUE_EXPLORE_SEARCH_NAME,
-   MENU_ENUM_LABEL_VALUE_EXPLORE_BY,
-   MENU_ENUM_LABEL_VALUE_EXPLORE_ITEMS,
   MENU_ENUM_LABEL_VALUE_EXPLORE_SHOW_ALL,
-   MENU_ENUM_LABEL_VALUE_EXPLORE_SELECT,
   MENU_ENUM_LABEL_VALUE_EXPLORE_ADDITIONAL_FILTER,
   MENU_ENUM_LABEL_VALUE_EXPLORE_ALL,
   MENU_ENUM_LABEL_VALUE_EXPLORE_ADD_ADDITIONAL_FILTER,
+   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_CATEGORY,
+   MENU_ENUM_LABEL_VALUE_EXPLORE_ITEM_COUNT,
+   MENU_ENUM_LABEL_VALUE_EXPLORE_SELECT_CATEGORY,

   /* Content information settings */
   MENU_LABEL(CONTENT_INFO_LABEL),