Experimental implementation of faction translation

MahBoiDeveloper · MahBoiDeveloper · commit 4b57e1dad68e · 2025-11-02T16:05:03.000+03:00
diff --git a/src/Faction.cpp b/src/Faction.cpp
@@ -3,25 +3,85 @@
 #include "Parsers/JSONFile.hpp"
 #include "Logger.hpp"
 #include "Faction.hpp"
+#include "Unsorted.hpp"
 
 Faction::Faction(const QString& _shortName, const QString& _displayName, const QString& _displayNameDescription)
     : shortName{_shortName}
     , displayName{_displayName}
     , displayNameDescription{_displayNameDescription}
-{}
+{
+}
 
 Faction::Faction(const QJsonObject& factionAsObject)
-    : shortName{factionAsObject["ShortName"].toString()}
-    , displayName{factionAsObject["DisplayName"].toString()}
-    , displayNameDescription{factionAsObject["DisplayNameDescription"].toString()}
+    : shortName{factionAsObject[PROGRAM_CONSTANTS->SHORT_NAME].toString()}
+    , displayName{factionAsObject[PROGRAM_CONSTANTS->DISPLAY_NAME].toString()}
+    , displayNameDescription{factionAsObject[PROGRAM_CONSTANTS->DISPLAY_NAME_DESCRIPTION].toString()}
     , techTree{ParseJsonObject(factionAsObject)}
-{}
+{
+    for (int currLng = 0; currLng < static_cast<int>(Languages::Count); currLng++)
+    {
+        QString _displayName = "";
+        QString _displayNameDescription = "";
+        Languages lng = static_cast<Languages>(currLng);
+        
+        if (lng != Languages::English)
+        {
+            auto translatedNames = factionAsObject[Unsorted::GetLanguageShortName(lng)].toObject();
+            
+            if (!translatedNames.isEmpty())
+            {
+                if (!translatedNames[PROGRAM_CONSTANTS->DISPLAY_NAME].isNull() 
+                    && !translatedNames[PROGRAM_CONSTANTS->DISPLAY_NAME].isUndefined())
+                {
+                    _displayName = translatedNames[PROGRAM_CONSTANTS->DISPLAY_NAME].toString();
+                }
+
+                if (!translatedNames[PROGRAM_CONSTANTS->DISPLAY_NAME_DESCRIPTION].isNull() 
+                    && !translatedNames[PROGRAM_CONSTANTS->DISPLAY_NAME_DESCRIPTION].isUndefined())
+                {
+                    _displayNameDescription = translatedNames[PROGRAM_CONSTANTS->DISPLAY_NAME_DESCRIPTION].toString();
+                }
+            }
+        }
+        else
+        {
+            continue;
+        }
+
+        localizedDisplay.insert(lng, {_displayName, _displayNameDescription});
+    }
+}
 
-const QString& Faction::GetShortName() const { return shortName; }
-const QString& Faction::GetDisplayName() const { return displayName; }
-const QString& Faction::GetDisplayNameDescription() const { return displayNameDescription; }
+const QString Faction::GetShortName() const { return shortName; }
+const QString Faction::GetDisplayName() const { return displayName; }
+const QString Faction::GetDisplayNameDescription() const { return displayNameDescription; }
 const QMap<Faction::GameObject, GameObjectTypes>& Faction::GetTechTree() const { return techTree; }
 
+const QString Faction::GetDisplayName(Languages lng) const
+{
+    QString ret;
+
+    if (lng != Languages::English)
+        ret = localizedDisplay.value(lng).first;
+    
+    if (ret == StringExt::EmptyString)
+        ret = displayName;
+
+    return ret;
+}
+const QString Faction::GetDisplayNameDescription(Languages lng) const 
+{
+    QString ret;
+
+    if (lng != Languages::English)
+        ret = localizedDisplay.value(lng).second;
+    
+    if (ret == StringExt::EmptyString)
+        ret = displayNameDescription;
+
+    return ret;
+}
+
 const QVector<QVector<Faction::Action>> Faction::GetKeyboardLayoutsByObjectName(const QString& objName) const
 {
     for(const Faction::GameObject& go : techTree.keys())
diff --git a/src/Faction.hpp b/src/Faction.hpp
@@ -27,6 +27,7 @@ class Faction
     QString displayName;
     QString displayNameDescription;
     QMap<GameObject, GameObjectTypes> techTree;
+    QMap<Languages, QPair<QString, QString>> localizedDisplay;
 public:
     inline static const int BASIC_FACTION_COUNT = 12;
 
@@ -38,11 +39,15 @@ class Faction
     Faction(const QJsonObject& factionAsObject);
 
     /// @brief Returns short faction name from field `ShortName` of TechTree.json.
-    const QString& GetShortName() const;
+    const QString GetShortName() const;
     /// @brief Returns another one short faction name from field `DisplayName` of TechTree.json.
-    const QString& GetDisplayName() const;
+    const QString GetDisplayName() const;
+    /// @brief Returns another one short faction name from field `DisplayName` of TechTree.json for the specific locale.
+    const QString GetDisplayName(Languages lng) const;
     /// @brief Returns long faction name from field `DisplayNameDescription` of TechTree.json.
-    const QString& GetDisplayNameDescription() const;
+    const QString GetDisplayNameDescription() const;
+    /// @brief Returns long faction name from field `DisplayNameDescription` of TechTree.json for the specific locale.
+    const QString GetDisplayNameDescription(Languages lng) const;
     /// @brief Returns link to the techTree field.
     const QMap<GameObject, GameObjectTypes>& GetTechTree() const;
     /// @brief Returns link to the keyboard layout vector searching by object name.
diff --git a/src/GUI/EditorWindow.cpp b/src/GUI/EditorWindow.cpp
@@ -49,6 +49,7 @@ EditorWindow::EditorWindow(QWidget* parent)
 
     QBoxLayout* ltFactions = nullptr;
     int factonsCount = FACTIONS_MANAGER->Count();
+    Languages language = PROGRAM_CONSTANTS->pSettingsFile->GetLanguage();
 
     if (factonsCount == Faction::BASIC_FACTION_COUNT)
     {
@@ -67,11 +68,13 @@ EditorWindow::EditorWindow(QWidget* parent)
             {
                 const Faction currFaction = FACTIONS_MANAGER->FindByIndex(sectionIndex + i);
 
-                QPushButton* factionButton = new QPushButton{currFaction.GetDisplayName()};
+                QPushButton* factionButton = new QPushButton{currFaction.GetDisplayName(language)};
+                factionButton->setToolTip(currFaction.GetDisplayNameDescription(language));
 
                 auto shortName = currFaction.GetShortName();
+
                 if (PROGRAM_CONSTANTS->USA_SHORT_NAMES.contains(shortName))
-                factionButton->setProperty("faction", "USA");
+                    factionButton->setProperty("faction", "USA");
 
                 if (PROGRAM_CONSTANTS->PRC_SHORT_NAMES.contains(shortName))
                     factionButton->setProperty("faction", "PRC");
@@ -389,7 +392,6 @@ QHBoxLayout* EditorWindow::CreateKeysOnKeyboard(const QString& str)
     return pKeys;
 }
 
-
 void EditorWindow::SetActionHotkey(const QString& fctShortName, const QString& goName, const QString& actName, const QString& hk)
 {
     Faction& fct = const_cast<Faction&>(FACTIONS_MANAGER->FindByShortName(fctShortName));
diff --git a/src/GUI/Translations/ru.ts b/src/GUI/Translations/ru.ts
@@ -22,99 +22,99 @@
 <context>
     <name>EditorWindow</name>
     <message>
-        <location filename="../EditorWindow.cpp" line="172"/>
+        <location filename="../EditorWindow.cpp" line="176"/>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="173"/>
+        <location filename="../EditorWindow.cpp" line="177"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="174"/>
+        <location filename="../EditorWindow.cpp" line="178"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="175"/>
+        <location filename="../EditorWindow.cpp" line="179"/>
         <source>Save As...</source>
         <translation>Сохранить как...</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="176"/>
+        <location filename="../EditorWindow.cpp" line="180"/>
         <source>Special</source>
         <translation>Дополнительно</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="192"/>
+        <location filename="../EditorWindow.cpp" line="196"/>
         <source>View</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="193"/>
+        <location filename="../EditorWindow.cpp" line="197"/>
         <source>Status Bar</source>
         <translation>Строка состояния</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="194"/>
+        <location filename="../EditorWindow.cpp" line="198"/>
         <source>Enable</source>
         <translation>Включить</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="195"/>
+        <location filename="../EditorWindow.cpp" line="199"/>
         <source>Disable</source>
         <translation>Отключить</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="199"/>
-        <location filename="../EditorWindow.cpp" line="512"/>
+        <location filename="../EditorWindow.cpp" line="203"/>
+        <location filename="../EditorWindow.cpp" line="515"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="203"/>
-        <location filename="../EditorWindow.cpp" line="477"/>
+        <location filename="../EditorWindow.cpp" line="207"/>
+        <location filename="../EditorWindow.cpp" line="480"/>
         <source>About</source>
         <translation>О программе</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="337"/>
+        <location filename="../EditorWindow.cpp" line="341"/>
         <source>Layout %1</source>
         <translation>Раскладка %1</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="457"/>
+        <location filename="../EditorWindow.cpp" line="460"/>
         <source>Authors: </source>
         <translation>Авторы: </translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="458"/>
+        <location filename="../EditorWindow.cpp" line="461"/>
         <source>Version: </source>
         <translation>Версия: </translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="459"/>
+        <location filename="../EditorWindow.cpp" line="462"/>
         <source>Program licensed with </source>
         <translation>Программа лицензирована под </translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="460"/>
+        <location filename="../EditorWindow.cpp" line="463"/>
         <source>GitHub repository:</source>
         <translation>Репозиторий на GitHub:</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="462"/>
+        <location filename="../EditorWindow.cpp" line="465"/>
         <source>Support development:</source>
         <translation>Поддержать разработку:</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="552"/>
+        <location filename="../EditorWindow.cpp" line="555"/>
         <source>Binary files</source>
         <translation>Двоичные файлы</translation>
     </message>
     <message>
-        <location filename="../EditorWindow.cpp" line="553"/>
+        <location filename="../EditorWindow.cpp" line="556"/>
         <source>Any files</source>
         <translation>Все файлы</translation>
     </message>
@@ -187,17 +187,17 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../../ProgramConstants.hpp" line="74"/>
+        <location filename="../../ProgramConstants.hpp" line="79"/>
         <source>Error with CSF file</source>
         <translation>Ошибка с CSF файлом</translation>
     </message>
     <message>
-        <location filename="../../ProgramConstants.hpp" line="75"/>
+        <location filename="../../ProgramConstants.hpp" line="80"/>
         <source>Cannot process the empty file.</source>
         <translation>Невозможно обработать пустой файл.</translation>
     </message>
     <message>
-        <location filename="../../ProgramConstants.hpp" line="76"/>
+        <location filename="../../ProgramConstants.hpp" line="81"/>
         <source>Unable to find selected CSF file.</source>
         <translation>Невозможно найти указанный CSF файл.</translation>
     </message>
@@ -206,52 +206,52 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../../ProgramConstants.hpp" line="77"/>
+        <location filename="../../ProgramConstants.hpp" line="82"/>
         <source>Choosen CSF file doesn&apos;t have CONTROLBAR category. Make sure that you are load correct file.</source>
         <translation>У выбранного CSF файла отсутствует категория CONTROLBAR. Проверьте, что вы загружаете правильный файл.</translation>
     </message>
     <message>
-        <location filename="../../ProgramConstants.hpp" line="78"/>
+        <location filename="../../ProgramConstants.hpp" line="83"/>
         <source>Choosen CSF file doesn&apos;t have OBJECT category. Make sure that you are load correct file.</source>
         <translation>У выбранного CSF файла отсутствует категория OBJECT. Проверьте, что вы загружаете правильный файл.</translation>
     </message>
     <message>
-        <location filename="../../ProgramConstants.hpp" line="79"/>
+        <location filename="../../ProgramConstants.hpp" line="84"/>
         <source>Unable to find &quot;generals.csf&quot; file in &quot;%1&quot; folder.</source>
         <translation>Невозможно найти &quot;generals.csf&quot; в папке &quot;%1&quot;.</translation>
     </message>
     <message>
-        <location filename="../../ProgramConstants.hpp" line="80"/>
+        <location filename="../../ProgramConstants.hpp" line="85"/>
         <source>Unable to find CSF file inside BIG archive &quot;%1&quot;</source>
         <translation>Невозможно найти CSF файл внутри BIG архива &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../../ProgramConstants.hpp" line="81"/>
+        <location filename="../../ProgramConstants.hpp" line="86"/>
         <source>Game files search error</source>
         <translation>Ошибка поиска по игровым файлам</translation>
     </message>
     <message>
-        <location filename="../../ProgramConstants.hpp" line="82"/>
+        <location filename="../../ProgramConstants.hpp" line="87"/>
         <source>Unable to find &quot;EnglishZH.big&quot; archive in &quot;%1&quot; folder.</source>
         <translation>Невозможно найти &quot;EnglishZH.big&quot; в папке &quot;%1&quot;.</translation>
     </message>
     <message>
-        <location filename="../../ProgramConstants.hpp" line="115"/>
+        <location filename="../../ProgramConstants.hpp" line="120"/>
         <source>Buildings</source>
         <translation>Здания</translation>
     </message>
     <message>
-        <location filename="../../ProgramConstants.hpp" line="116"/>
+        <location filename="../../ProgramConstants.hpp" line="121"/>
         <source>Infantry</source>
         <translation>Пехота</translation>
     </message>
     <message>
-        <location filename="../../ProgramConstants.hpp" line="117"/>
+        <location filename="../../ProgramConstants.hpp" line="122"/>
         <source>Vehicles</source>
         <translation>Техника</translation>
     </message>
     <message>
-        <location filename="../../ProgramConstants.hpp" line="118"/>
+        <location filename="../../ProgramConstants.hpp" line="123"/>
         <source>Aircrafts</source>
         <translation>Авиация</translation>
     </message>
diff --git a/src/ProgramConstants.hpp b/src/ProgramConstants.hpp
@@ -22,7 +22,7 @@ enum class GameObjectTypes
 class ProgramConstants
 {
 public:
-    inline static std::unique_ptr<ProgramConstants> Instance     = nullptr;
+    inline static std::unique_ptr<ProgramConstants> Instance      = nullptr;
     std::unique_ptr<Settings>                       pSettingsFile = nullptr;
 
     // Folders
@@ -51,6 +51,11 @@ class ProgramConstants
     const QString LOAD_TITLE              = SHORT_COMMON_TITLE + " — Load";
     const QString CREATE_TITLE            = SHORT_COMMON_TITLE + " — New Set Up";
 
+    // JSON mappings
+    const QString SHORT_NAME               = "ShortName";
+    const QString DISPLAY_NAME             = "DisplayName";
+    const QString DISPLAY_NAME_DESCRIPTION = "DisplayNameDescription";
+
     // Magic numbers that become known
     const double  START_WIDGET_SIZE_RATIO = 3./7.;
     const QSize   START_BUTTON_SIZE       = QSize(230, 110);
diff --git a/src/TechTree.json b/src/TechTree.json

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ EditorWindow::EditorWindow(QWidget* parent)`
`49`	`49`
`50`	`50`	`QBoxLayout* ltFactions = nullptr;`
`51`	`51`	`int factonsCount = FACTIONS_MANAGER->Count();`
	`52`	`+ Languages language = PROGRAM_CONSTANTS->pSettingsFile->GetLanguage();`
`52`	`53`
`53`	`54`	`if (factonsCount == Faction::BASIC_FACTION_COUNT)`
`54`	`55`	`{`
`@@ -67,11 +68,13 @@ EditorWindow::EditorWindow(QWidget* parent)`
`67`	`68`	`{`
`68`	`69`	`const Faction currFaction = FACTIONS_MANAGER->FindByIndex(sectionIndex + i);`
`69`	`70`
`70`		`- QPushButton* factionButton = new QPushButton{currFaction.GetDisplayName()};`
	`71`	`+ QPushButton* factionButton = new QPushButton{currFaction.GetDisplayName(language)};`
	`72`	`+ factionButton->setToolTip(currFaction.GetDisplayNameDescription(language));`
`71`	`73`
`72`	`74`	`auto shortName = currFaction.GetShortName();`
	`75`	`+`
`73`	`76`	`if (PROGRAM_CONSTANTS->USA_SHORT_NAMES.contains(shortName))`
`74`		`- factionButton->setProperty("faction", "USA");`
	`77`	`+ factionButton->setProperty("faction", "USA");`
`75`	`78`
`76`	`79`	`if (PROGRAM_CONSTANTS->PRC_SHORT_NAMES.contains(shortName))`
`77`	`80`	`factionButton->setProperty("faction", "PRC");`
`@@ -389,7 +392,6 @@ QHBoxLayout* EditorWindow::CreateKeysOnKeyboard(const QString& str)`
`389`	`392`	`return pKeys;`
`390`	`393`	`}`
`391`	`394`
`392`		`-`
`393`	`395`	`void EditorWindow::SetActionHotkey(const QString& fctShortName, const QString& goName, const QString& actName, const QString& hk)`
`394`	`396`	`{`
`395`	`397`	`Faction& fct = const_cast<Faction&>(FACTIONS_MANAGER->FindByShortName(fctShortName));`