Improve language support, especially for non-Global regions

redstrate · redstrate · commit f49a5ac9dc66 · 2026-03-02T00:09:06.000-05:00
Up until now Novus assumed you wanted to read everything in English, but
this quickly falls apart once you load non-Global clients. I also
cleaned up non-latin character display in Armoury. Other places seemed
fine.

You can now select the language from the install configuration.
diff --git a/apps/armoury/include/gearview.h b/apps/armoury/include/gearview.h
@@ -15,7 +15,7 @@ struct ModelInfo {
 };
 
 struct GearInfo {
-    std::string name;
+    QString name;
     Slot slot;
     ModelInfo modelInfo;
     uint16_t icon;
diff --git a/apps/armoury/src/fullmodelviewer.cpp b/apps/armoury/src/fullmodelviewer.cpp
@@ -216,7 +216,7 @@ void FullModelViewer::reloadGear()
     } else {
         // smallclothes body
         GearInfo info = {};
-        info.name = "SmallClothes Body";
+        info.name = i18n("SmallClothes Body");
         info.slot = Slot::Body;
 
         gearView->addGear(info);
@@ -227,7 +227,7 @@ void FullModelViewer::reloadGear()
     } else {
         // smallclothes legs
         GearInfo info = {};
-        info.name = "SmallClothes Legs";
+        info.name = i18n("SmallClothes Legs");
         info.slot = Slot::Legs;
 
         gearView->addGear(info);
@@ -236,7 +236,7 @@ void FullModelViewer::reloadGear()
     // smallclothes hands
     {
         GearInfo info = {};
-        info.name = "SmallClothes Hands";
+        info.name = i18n("SmallClothes Hands");
         info.slot = Slot::Hands;
 
         gearView->addGear(info);
@@ -245,7 +245,7 @@ void FullModelViewer::reloadGear()
     // smallclothes hands
     {
         GearInfo info = {};
-        info.name = "SmallClothes Feet";
+        info.name = i18n("SmallClothes Feet");
         info.slot = Slot::Feet;
 
         gearView->addGear(info);
diff --git a/apps/armoury/src/gearlistmodel.cpp b/apps/armoury/src/gearlistmodel.cpp
@@ -3,6 +3,8 @@
 
 #include "gearlistmodel.h"
 
+#include "settings.h"
+
 #include <KLocalizedString>
 #include <QtConcurrent>
 #include <magic_enum.hpp>
@@ -14,7 +16,7 @@ GearListModel::GearListModel(physis_SqPackResource *data, QObject *parent)
     // smallclothes body
     {
         GearInfo info = {};
-        info.name = "SmallClothes Body";
+        info.name = i18n("SmallClothes Body");
         info.slot = Slot::Body;
 
         gears.push_back(info);
@@ -23,14 +25,14 @@ GearListModel::GearListModel(physis_SqPackResource *data, QObject *parent)
     // smallclothes legs
     {
         GearInfo info = {};
-        info.name = "SmallClothes Legs";
+        info.name = i18n("SmallClothes Legs");
         info.slot = Slot::Legs;
 
         gears.push_back(info);
     }
 
     m_exh = physis_exh_parse(data->platform, physis_sqpack_read(data, "exd/item.exh"));
-    m_sheet = physis_sqpack_read_excel_sheet(data, "Item", &m_exh, Language::English);
+    m_sheet = physis_sqpack_read_excel_sheet(data, "Item", &m_exh, getLanguage());
 
     for (unsigned int i = 0; i < m_sheet.page_count; i++) {
         for (unsigned int j = m_exh.pages[i].start_id; j < m_exh.pages[i].start_id + m_sheet.pages[i].entry_count; j++) {
@@ -48,7 +50,7 @@ GearListModel::GearListModel(physis_SqPackResource *data, QObject *parent)
                 }
 
                 GearInfo info = {};
-                info.name = row.columns[9].string._0;
+                info.name = QString::fromStdString(row.columns[9].string._0);
                 info.icon = row.columns[10].u_int16._0;
                 info.slot = slot;
                 info.modelInfo.primaryID = parts[0];
@@ -160,7 +162,7 @@ QVariant GearListModel::data(const QModelIndex &index, int role) const
         }
     } else if (item->type == TreeType::Item) {
         if (role == Qt::DisplayRole) {
-            return QLatin1String(item->gear->name.data());
+            return item->gear->name;
         } else if (role == Qt::DecorationRole) {
             // TODO: cache these images in memory
             const QString iconName = QString::number(item->gear->icon);
diff --git a/apps/armoury/src/gearview.cpp b/apps/armoury/src/gearview.cpp
@@ -104,7 +104,7 @@ void GearView::exportModel(const QString &fileName)
 
 void GearView::addGear(GearInfo &gear)
 {
-    qDebug() << "Adding gear" << gear.name.c_str();
+    qDebug() << "Adding gear" << gear.name;
 
     queuedGearAdditions.emplace_back(gear);
 
@@ -121,7 +121,7 @@ void GearView::addGear(GearInfo &gear)
 
 void GearView::removeGear(GearInfo &gear)
 {
-    qDebug() << "Removing gear" << gear.name.c_str();
+    qDebug() << "Removing gear" << gear.name;
 
     queuedGearRemovals.emplace_back(gear);
     gearDirty = true;
diff --git a/apps/armoury/src/singlegearview.cpp b/apps/armoury/src/singlegearview.cpp
@@ -105,7 +105,7 @@ SingleGearView::SingleGearView(physis_SqPackResource *data, FileCache &cache, QW
         QString path = QStringLiteral("%1/%2/%3/%4")
                            .arg(sourceDirectory)
                            .arg(QString::fromStdString(magic_enum::enum_name(currentGear->slot).data()))
-                           .arg(QString::fromStdString(currentGear->name))
+                           .arg(currentGear->name)
                            .arg(QStringLiteral("3D"));
 
         if (!QDir().exists(path))
@@ -144,7 +144,7 @@ SingleGearView::SingleGearView(physis_SqPackResource *data, FileCache &cache, QW
             QString path = QStringLiteral("%1/%2/%3/%4")
                                .arg(sourceDirectory)
                                .arg(QString::fromStdString(magic_enum::enum_name(currentGear->slot).data()))
-                               .arg(QString::fromStdString(currentGear->name))
+                               .arg(currentGear->name)
                                .arg(QStringLiteral("3D"));
 
             if (!QDir().exists(path))
@@ -175,7 +175,7 @@ SingleGearView::SingleGearView(physis_SqPackResource *data, FileCache &cache, QW
             QString path = QStringLiteral("%1/%2/%3/%4")
                                .arg(sourceDirectory)
                                .arg(QString::fromStdString(magic_enum::enum_name(currentGear->slot).data()))
-                               .arg(QString::fromStdString(currentGear->name))
+                               .arg(currentGear->name)
                                .arg(QStringLiteral("3D"));
 
             if (!QDir().exists(path))
diff --git a/apps/mapeditor/src/mainwindow.cpp b/apps/mapeditor/src/mainwindow.cpp
@@ -19,6 +19,7 @@
 #include "mapview.h"
 #include "scenepart.h"
 #include "scenestate.h"
+#include "settings.h"
 
 #include <KConfig>
 #include <KConfigGroup>
@@ -197,7 +198,7 @@ void MainWindow::openMap(const QString &basePath, int contentFinderCondition)
         qInfo() << "This map contains a duty! CF:" << contentFinderCondition;
 
         auto cfcExh = physis_exh_parse(m_data.platform, physis_sqpack_read(&m_data, "exd/ContentFinderCondition.exh"));
-        auto cfcSheet = physis_sqpack_read_excel_sheet(&m_data, "ContentFinderCondition", &cfcExh, Language::English);
+        auto cfcSheet = physis_sqpack_read_excel_sheet(&m_data, "ContentFinderCondition", &cfcExh, getLanguage());
 
         auto cfcRow = physis_excel_get_row(&cfcSheet, contentFinderCondition);
         auto instanceContentId = cfcRow.columns[3].u_int16._0;
diff --git a/apps/mapeditor/src/maplistwidget.cpp b/apps/mapeditor/src/maplistwidget.cpp
@@ -3,6 +3,8 @@
 
 #include "maplistwidget.h"
 
+#include "settings.h"
+
 #include <KLocalizedString>
 #include <QDialogButtonBox>
 #include <QLineEdit>
@@ -39,7 +41,7 @@ MapListWidget::MapListWidget(physis_SqPackResource *data, QWidget *parent)
     auto nameExh = physis_exh_parse(data->platform, physis_sqpack_read(data, "exd/PlaceName.exh"));
     auto territoryExh = physis_exh_parse(data->platform, physis_sqpack_read(data, "exd/TerritoryType.exh"));
 
-    auto nameSheet = physis_sqpack_read_excel_sheet(data, "PlaceName", &nameExh, Language::English);
+    auto nameSheet = physis_sqpack_read_excel_sheet(data, "PlaceName", &nameExh, getLanguage());
     auto territorySheet = physis_sqpack_read_excel_sheet(data, "TerritoryType", &territoryExh, Language::None);
 
     // TODO: figure out why row_count in EXH is wrong?!
diff --git a/apps/sdklauncher/include/settingswindow.h b/apps/sdklauncher/include/settingswindow.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include "enumedit.h"
 #include "settings.h"
 
 #include <QLineEdit>
@@ -28,6 +29,7 @@ class SettingsWindow : public QWidget
     QListWidget *m_installWidget;
     QLineEdit *m_labelEdit;
     QLineEdit *m_pathEdit;
+    EnumEdit<Language> *m_languageEdit;
     QList<GameInstall> m_installs;
     QPushButton *m_addButton;
     QPushButton *m_removeButton;
diff --git a/apps/sdklauncher/src/settingswindow.cpp b/apps/sdklauncher/src/settingswindow.cpp
@@ -53,6 +53,13 @@ SettingsWindow::SettingsWindow(QWidget *parent)
     });
     configureWidgetLayout->addRow(i18n("Game Path:"), m_pathEdit);
 
+    m_languageEdit = new EnumEdit<Language>();
+    connect(m_languageEdit, &EnumEdit<Language>::editingFinished, this, [this] {
+        auto &install = currentInstall();
+        install.language = m_languageEdit->value();
+    });
+    configureWidgetLayout->addRow(i18n("Language:"), m_languageEdit);
+
     // TODO: port to QDialogButtonBox
     auto bottomButtonLayout = new QHBoxLayout();
     layout->addLayout(bottomButtonLayout);
@@ -107,13 +114,15 @@ void SettingsWindow::refreshConfigureWidget(const QUuid uuid)
         if (install.uuid == uuid) {
             m_labelEdit->setText(install.label);
             m_pathEdit->setText(install.path);
+            m_languageEdit->setValue(install.language);
 
             valid = true;
         }
     }
 
     m_labelEdit->setEnabled(valid);
     m_pathEdit->setEnabled(valid);
+    m_languageEdit->setEnabled(valid);
     m_removeButton->setEnabled(m_installs.size() > 1);
 }
 
diff --git a/common/include/enumedit.h b/common/include/enumedit.h
@@ -26,6 +26,8 @@ class EnumEdit : public EditWidget
         for (auto [type, name] : magic_enum::enum_entries<E>()) {
             comboBox->addItem(QString::fromLatin1(name.data()));
         }
+
+        connect(comboBox, &QComboBox::currentIndexChanged, this, &EnumEdit::editingFinished);
     }
     ~EnumEdit() override = default;
 
@@ -40,6 +42,11 @@ class EnumEdit : public EditWidget
         comboBox->setCurrentIndex(-1);
     }
 
+    E value() const
+    {
+        return static_cast<E>(comboBox->currentIndex());
+    }
+
 private:
     QComboBox *comboBox = nullptr;
 };
diff --git a/common/include/settings.h b/common/include/settings.h
@@ -8,14 +8,17 @@
 #include "novuscommon_export.h"
 
 #include <QUuid>
+#include <physis.hpp>
 
 struct GameInstall {
     QUuid uuid;
     QString label;
     QString path;
+    Language language;
 };
 
 NOVUSCOMMON_EXPORT QList<GameInstall> getGameInstalls();
 NOVUSCOMMON_EXPORT void saveGameInstalls(QList<GameInstall> installs);
 NOVUSCOMMON_EXPORT QString getGameDirectory(bool prompt = true);
 NOVUSCOMMON_EXPORT bool addNewInstall();
+NOVUSCOMMON_EXPORT Language getLanguage();
diff --git a/common/src/settings.cpp b/common/src/settings.cpp
@@ -30,6 +30,7 @@ QList<GameInstall> getGameInstalls()
                 .uuid = uuid,
                 .label = kgroup.readEntry(QStringLiteral("Label")),
                 .path = kgroup.readEntry(QStringLiteral("Path")),
+                .language = static_cast<Language>(kgroup.readEntry(QStringLiteral("Language")).toInt()),
             });
         }
     }
@@ -45,6 +46,7 @@ void saveGameInstalls(QList<GameInstall> installs)
         auto group = config.group(QStringLiteral("install-%1").arg(install.uuid.toString()));
         group.writeEntry(QStringLiteral("Path"), install.path);
         group.writeEntry(QStringLiteral("Label"), install.label);
+        group.writeEntry(QStringLiteral("Language"), static_cast<int>(install.language));
     }
 
     config.sync();
@@ -98,8 +100,27 @@ bool addNewInstall()
     KConfigGroup newGameInstall = config.group(QStringLiteral("install-%1").arg(uuid.toString()));
     newGameInstall.writeEntry(QStringLiteral("Path"), dir);
     newGameInstall.writeEntry(QStringLiteral("Label"), label);
+    newGameInstall.writeEntry(QStringLiteral("Language"), static_cast<int>(Language::English)); // TODO: don't assume English
 
     config.sync();
 
     return true;
 }
+
+Language getLanguage()
+{
+    KConfig config(QStringLiteral("novusrc"));
+
+    const KConfigGroup game = config.group(QStringLiteral("Game"));
+    if (game.hasKey(QStringLiteral("CurrentInstall"))) {
+        const auto uuid = game.readEntry(QStringLiteral("CurrentInstall"));
+        const auto installs = getGameInstalls();
+        for (auto install : installs) {
+            if (install.uuid == QUuid::fromString(uuid)) {
+                return install.language;
+            }
+        }
+    }
+
+    Q_UNREACHABLE(); // if you hit this, you did something wrong
+}
diff --git a/parts/exd/CMakeLists.txt b/parts/exd/CMakeLists.txt
@@ -15,7 +15,8 @@ target_link_libraries(exdpart
         Qt6::Core
         Qt6::Widgets
         magic_enum
-        rapidyaml)
+        rapidyaml
+        Novus::Common)
 target_include_directories(exdpart PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_compile_definitions(exdpart PRIVATE TRANSLATION_DOMAIN="novus")
 
diff --git a/parts/exd/exdpart.cpp b/parts/exd/exdpart.cpp
@@ -18,6 +18,7 @@
 
 #include "magic_enum.hpp"
 #include "schema.h"
+#include "settings.h"
 
 #include <QActionGroup>
 #include <QMenu>
@@ -27,6 +28,7 @@
 EXDPart::EXDPart(physis_SqPackResource *data, AbstractExcelResolver *resolver, QWidget *parent)
     : QWidget(parent)
     , data(data)
+    , m_preferredLanguage(getLanguage())
     , m_resolver(resolver)
 {
     auto layout = new QVBoxLayout();
@@ -198,8 +200,8 @@ Language EXDPart::getSuitableLanguage(const physis_EXH &pExh) const
         }
     }
 
-    // Then English
-    return Language::English;
+    // Then the default language
+    return getLanguage();
 }
 
 #include "moc_exdpart.cpp"
diff --git a/parts/exd/exdpart.h b/parts/exd/exdpart.h
@@ -40,7 +40,7 @@ class EXDPart : public QWidget
     QFormLayout *headerFormLayout = nullptr;
 
     Language getSuitableLanguage(const physis_EXH &pExh) const;
-    Language m_preferredLanguage = Language::English;
+    Language m_preferredLanguage;
     physis_EXH exh;
     QString m_name;
     AbstractExcelResolver *m_resolver = nullptr;
diff --git a/parts/scene/scenelistmodel.cpp b/parts/scene/scenelistmodel.cpp
@@ -260,7 +260,7 @@ void SceneListModel::addLayer(uint32_t index, SceneTreeInformation *fileItem, co
         const auto &object = layer.objects[z];
 
         QString objectName;
-        if (object.name) {
+        if (strlen(object.name) > 0) {
             objectName = QString::fromLatin1(object.name);
         } else {
             objectName = i18n("Unknown Object");
diff --git a/parts/scene/scenestate.cpp b/parts/scene/scenestate.cpp
@@ -6,6 +6,7 @@
 #include <KLocalizedString>
 
 #include "animation.h"
+#include "settings.h"
 
 #include <QFile>
 #include <QJsonArray>
@@ -26,7 +27,7 @@ SceneState::SceneState(physis_SqPackResource *resource, QObject *parent)
             if (!exh.p_ptr) {
                 qWarning() << "Failed to parse exd/enpcresident.exh";
             } else {
-                m_enpcResidentSheet = physis_sqpack_read_excel_sheet(resource, "ENpcResident", &exh, Language::English);
+                m_enpcResidentSheet = physis_sqpack_read_excel_sheet(resource, "ENpcResident", &exh, getLanguage());
             }
         }
     }
@@ -41,7 +42,7 @@ SceneState::SceneState(physis_SqPackResource *resource, QObject *parent)
             if (!exh.p_ptr) {
                 qWarning() << "Failed to parse exd/eobjname.exh";
             } else {
-                m_eobjNameSheet = physis_sqpack_read_excel_sheet(resource, "EObjName", &exh, Language::English);
+                m_eobjNameSheet = physis_sqpack_read_excel_sheet(resource, "EObjName", &exh, getLanguage());
             }
         }
     }
@@ -56,7 +57,7 @@ SceneState::SceneState(physis_SqPackResource *resource, QObject *parent)
             if (!exh.p_ptr) {
                 qWarning() << "Failed to parse exd/bnpcname.exh";
             } else {
-                m_bnpcNameSheet = physis_sqpack_read_excel_sheet(resource, "BNpcName", &exh, Language::English);
+                m_bnpcNameSheet = physis_sqpack_read_excel_sheet(resource, "BNpcName", &exh, getLanguage());
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ void GearView::exportModel(const QString &fileName)`
`104`	`104`
`105`	`105`	`void GearView::addGear(GearInfo &gear)`
`106`	`106`	`{`
`107`		`- qDebug() << "Adding gear" << gear.name.c_str();`
	`107`	`+ qDebug() << "Adding gear" << gear.name;`
`108`	`108`
`109`	`109`	`queuedGearAdditions.emplace_back(gear);`
`110`	`110`
`@@ -121,7 +121,7 @@ void GearView::addGear(GearInfo &gear)`
`121`	`121`
`122`	`122`	`void GearView::removeGear(GearInfo &gear)`
`123`	`123`	`{`
`124`		`- qDebug() << "Removing gear" << gear.name.c_str();`
	`124`	`+ qDebug() << "Removing gear" << gear.name;`
`125`	`125`
`126`	`126`	`queuedGearRemovals.emplace_back(gear);`
`127`	`127`	`gearDirty = true;`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ class EnumEdit : public EditWidget`
`26`	`26`	`for (auto [type, name] : magic_enum::enum_entries<E>()) {`
`27`	`27`	`comboBox->addItem(QString::fromLatin1(name.data()));`
`28`	`28`	`}`
	`29`	`+`
	`30`	`+ connect(comboBox, &QComboBox::currentIndexChanged, this, &EnumEdit::editingFinished);`
`29`	`31`	`}`
`30`	`32`	`~EnumEdit() override = default;`
`31`	`33`
`@@ -40,6 +42,11 @@ class EnumEdit : public EditWidget`
`40`	`42`	`comboBox->setCurrentIndex(-1);`
`41`	`43`	`}`
`42`	`44`
	`45`	`+ E value() const`
	`46`	`+ {`
	`47`	`+ return static_cast<E>(comboBox->currentIndex());`
	`48`	`+ }`
	`49`	`+`
`43`	`50`	`private:`
`44`	`51`	`QComboBox *comboBox = nullptr;`
`45`	`52`	`};`