From ff2fc19b086d801fec3ae01e06ef713988f34e42 Mon Sep 17 00:00:00 2001
From: shel <9306996+afwn90cj93201nixr2e1re@users.noreply.github.com>
Date: Fri, 17 Jul 2020 03:57:29 +0400
Subject: [PATCH] Update newmenus.cpp (#884)

Fixes: #881

Co-authored-by: shel <2@shelru.ru>
---
 amxmodx/newmenus.cpp | 80 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 60 insertions(+), 20 deletions(-)

diff --git a/amxmodx/newmenus.cpp b/amxmodx/newmenus.cpp
index 6f2e0c24..216602fb 100755
--- a/amxmodx/newmenus.cpp
+++ b/amxmodx/newmenus.cpp
@@ -418,27 +418,27 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 	{
 		flags &= ~Display_Back;
 	}
-	
+
 	menuitem *pItem = NULL;
-	
+
 	int option = 0;
 	keys = 0;
 	bool enabled = true;
 	int ret = 0;
 	int slots = 0;
 	int option_display = 0;
-	
+
 	for (item_t i = start; i < end; i++)
 	{
 		// reset enabled
 		enabled = true;
 		pItem = m_Items[i];
-		
+
 		if (pItem->access && !(pItem->access & g_players[player].flags[0]))
 		{
 			enabled = false;
 		}
-		
+
 		if (pItem->handler != -1)
 		{
 			ret = executeForwards(pItem->handler, static_cast<cell>(player), static_cast<cell>(thisId), static_cast<cell>(i));
@@ -470,7 +470,7 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 		{
 			keys |= (1<<option);
 		}
-		
+
 		option_display = ++option;
 		if (option_display == 10)
 		{
@@ -544,6 +544,20 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 		/* Don't bother if there is only one page */
 		if (pages > 1)
 		{
+
+			auto tempItemName = m_OptNames[abs(MENU_BACK)].chars();
+
+			if (this->useMultilingual)
+			{
+				const auto language = playerlang(player);
+				const auto definition = translate(this->amx, language, tempItemName);
+
+				if (definition)
+				{
+					tempItemName = definition;
+				}
+			}
+
 			if (flags & Display_Back)
 			{
 				keys |= (1<<option++);
@@ -554,13 +568,13 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 						"%s%d. \\w%s\n", 
 						m_ItemColor.chars(), 
 						option == 10 ? 0 : option, 
-						m_OptNames[abs(MENU_BACK)].chars());
+						tempItemName);
 				} else {
 					ke::SafeSprintf(buffer,
 						sizeof(buffer), 
 						"%d. %s\n", 
 						option == 10 ? 0 : option, 
-						m_OptNames[abs(MENU_BACK)].chars());
+						tempItemName);
 				}
 			} else {
 				option++;
@@ -570,13 +584,26 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 						sizeof(buffer),
 						"\\d%d. %s\n\\w",
 						option == 10 ? 0 : option,
-						m_OptNames[abs(MENU_BACK)].chars());
+						tempItemName);
 				} else {
-					ke::SafeSprintf(buffer, sizeof(buffer), "#. %s\n", m_OptNames[abs(MENU_BACK)].chars());
+					ke::SafeSprintf(buffer, sizeof(buffer), "#. %s\n", tempItemName);
 				}
 			}
 			m_Text = m_Text + buffer;
-	
+
+			tempItemName = m_OptNames[abs(MENU_MORE)].chars();
+
+			if (this->useMultilingual)
+			{
+				const auto language = playerlang(player);
+				const auto definition = translate(this->amx, language, tempItemName);
+
+				if (definition)
+				{
+					tempItemName = definition;
+				}
+			}
+
 			if (flags & Display_Next)
 			{
 				keys |= (1<<option++);
@@ -587,13 +614,13 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 						"%s%d. \\w%s\n", 
 						m_ItemColor.chars(), 
 						option == 10 ? 0 : option, 
-						m_OptNames[abs(MENU_MORE)].chars());
+						tempItemName);
 				} else {
 					ke::SafeSprintf(buffer,
 						sizeof(buffer), 
 						"%d. %s\n", 
 						option == 10 ? 0 : option, 
-						m_OptNames[abs(MENU_MORE)].chars());
+						tempItemName);
 				}
 			} else {
 				option++;
@@ -603,9 +630,9 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 						sizeof(buffer),
 						"\\d%d. %s\n\\w",
 						option == 10 ? 0 : option,
-						m_OptNames[abs(MENU_MORE)].chars());
+						tempItemName);
 				} else {
-					ke::SafeSprintf(buffer, sizeof(buffer), "#. %s\n", m_OptNames[abs(MENU_MORE)].chars());
+					ke::SafeSprintf(buffer, sizeof(buffer), "#. %s\n", tempItemName);
 				}
 			}
 			m_Text = m_Text + buffer;
@@ -614,13 +641,26 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 			option += 2;
 		}
 	}
-	
+
 	if ((items_per_page && !m_NeverExit) || (m_ForceExit && numItems < 10))
 	{
+		auto exitName = m_OptNames[abs(MENU_EXIT)].chars();
+
+		if (this->useMultilingual)
+		{
+			const auto language = playerlang(player);
+			const auto definition = translate(this->amx, language, exitName);
+
+			if (definition)
+			{
+				exitName = definition;
+			}
+		}
+
 		/* Visual pad has not been added yet */
 		if (!items_per_page)
 			m_Text = m_Text + "\n";
-		
+
 		keys |= (1<<option++);
 		if (m_AutoColors)
 		{
@@ -629,17 +669,17 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 				"%s%d. \\w%s\n", 
 				m_ItemColor.chars(), 
 				option == 10 ? 0 : option, 
-				m_OptNames[abs(MENU_EXIT)].chars());
+				exitName);
 		} else {
 			ke::SafeSprintf(buffer,
 				sizeof(buffer), 
 				"%d. %s\n", 
 				option == 10 ? 0 : option, 
-				m_OptNames[abs(MENU_EXIT)].chars());
+				exitName);
 		}
 		m_Text = m_Text + buffer;
 	}
-	
+
 	return m_Text.ptr();
 }