From bf6de9f3422f7bfdababa5b4f292bf0dea83c1c8 Mon Sep 17 00:00:00 2001
From: "Marco Antonio J. Costa" <marco.antonio.costa@gmail.com>
Date: Wed, 25 Dec 2024 07:45:38 -0300
Subject: [PATCH] Move GetLanguagePrefix function into i18n

---
 Ja2/Init.cpp              | 30 ++----------------------------
 Tactical/XML.h            |  8 --------
 i18n/include/language.hpp |  4 ++++
 i18n/language.cpp         | 22 ++++++++++++++++++++++
 4 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/Ja2/Init.cpp b/Ja2/Init.cpp
index 44a90d76..1d803358 100644
--- a/Ja2/Init.cpp
+++ b/Ja2/Init.cpp
@@ -78,6 +78,8 @@
 #include "DynamicDialogueWidget.h"		// added by Flugente for InitMyBoxes()
 #include "Animation Data.h"				// added by Flugente
 
+#include <language.hpp>
+
 extern INT16 APBPConstants[TOTAL_APBP_VALUES] = {0};
 extern INT16 gubMaxActionPoints[TOTALBODYTYPES];//MAXBODYTYPES = 28... JUST GETTING IT TO WORK NOW.  GOTTHARD 7/2/08
 extern BOOLEAN GetCDromDriveLetter( STR8	pString );
@@ -134,34 +136,6 @@ static void AddLanguagePrefix(STR fileName, const STR language)
 	memmove( fileComponent, language, strlen( language) );
 }
 
-static const STR GetLanguagePrefix()
-{
-#ifdef ENGLISH
-	return "";
-#endif
-#ifdef GERMAN 
-	return GERMAN_PREFIX;
-#endif
-#ifdef RUSSIAN 
-	return RUSSIAN_PREFIX;
-#endif
-#ifdef DUTCH 
-	return DUTCH_PREFIX;
-#endif
-#ifdef POLISH 
-	return POLISH_PREFIX;
-#endif
-#ifdef FRENCH 
-	return FRENCH_PREFIX;
-#endif
-#ifdef ITALIAN 
-	return ITALIAN_PREFIX;
-#endif
-#ifdef CHINESE
-	return CHINESE_PREFIX;
-#endif
-}
-
 static void AddLanguagePrefix(STR fileName)
 {
 	AddLanguagePrefix( fileName, GetLanguagePrefix());
diff --git a/Tactical/XML.h b/Tactical/XML.h
index 963417ef..d1ab96b9 100644
--- a/Tactical/XML.h
+++ b/Tactical/XML.h
@@ -58,14 +58,6 @@ typedef PARSE_STAGE;
 #define TABLEDATA_DIRECTORY						"TableData\\"
 #define TABLEDATA_LAPTOP_DIRECTORY				"Laptop\\"
 
-#define GERMAN_PREFIX							"German."
-#define RUSSIAN_PREFIX							"Russian."
-#define DUTCH_PREFIX							"Dutch."
-#define POLISH_PREFIX							"Polish."
-#define FRENCH_PREFIX							"French."
-#define ITALIAN_PREFIX							"Italian."
-#define CHINESE_PREFIX							"Chinese."
-
 #define	ATTACHMENTSFILENAME						"Items\\Attachments.xml"
 #define	ATTACHMENTINFOFILENAME					"Items\\AttachmentInfo.xml"
 #define	ITEMSFILENAME							"Items\\Items.xml"
diff --git a/i18n/include/language.hpp b/i18n/include/language.hpp
index c1b3e468..bd895bcc 100644
--- a/i18n/include/language.hpp
+++ b/i18n/include/language.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <Types.h>
+
 namespace i18n {
 enum class Lang
 {
@@ -17,3 +19,5 @@ enum class Lang
 extern const i18n::Lang g_lang;
 
 extern const int MAX_MESSAGES_ON_MAP_BOTTOM;
+
+auto GetLanguagePrefix() -> const STR;
diff --git a/i18n/language.cpp b/i18n/language.cpp
index 1368db18..555b33c2 100644
--- a/i18n/language.cpp
+++ b/i18n/language.cpp
@@ -30,3 +30,25 @@ const int MAX_MESSAGES_ON_MAP_BOTTOM{
     9
 #endif
 };
+
+auto GetLanguagePrefix() -> const STR {
+  return
+#if defined(ENGLISH)
+  ""
+#elif defined(CHINESE)
+  "Chinese."
+#elif defined(DUTCH)
+  "Dutch."
+#elif defined(FRENCH)
+  "French."
+#elif defined(GERMAN)
+  "German."
+#elif defined(ITALIAN)
+  "Italian."
+#elif defined(POLISH)
+  "Polish."
+#elif defined(RUSSIAN)
+  "Russian."
+#endif
+  ;
+}