mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
fd2c74727e
squashed into a single commit because doing it in steps that all
compiled involved a lot of boilerplate that is pointless to commit to
the repository. GH still has the PR for reference.
g_lang, MAX_MESSAGES_ON_MAP_BOTTOM, and GetLanguagePrefix() were
compile-time constants selected by the ENGLISH/GERMAN/... build
define. They're now runtime, defaulting to the same per-exe value the
define used to pick, and overridable at startup from [Ja2 Settings]
LANGUAGE in Ja2.ini.
-
XMLTacticalMessages is filled at runtime from NewTacticalMessages.xml,
never from compiled-in per-language data: all 8 per-language definitions
were the identical all-zero { L"" }. Delete them and define one shared
buffer in Utils/XML_Language.cpp (the loader) instead of pointer-rebinding
it like the static tables — this drops 9 dead 800KB zero-buffers (8
namespaced copies in LanguageStrings.cpp plus the standalone one) and
leaves no bind-ordering hazard for the XML load path.
-
ExportStrings.cpp privately recompiled one language's full text table
by #including the raw _<LANG>Text.cpp inside namespace Loc, keyed off
the exe-level ENGLISH/GERMAN/... compile macro (whichever the build
happened to select). That's redundant with the pointer globals every
other subsystem already uses (Text.h / LanguageStrings.cpp).
Drop the private copy; the unqualified table names in Loc::ExportStrings
now resolve to the global pointer externs, which BindLanguageStrings has
already rebound to the runtime g_lang by the time this runs (EXPORT_STRINGS
ini flag, checked after GetRuntimeSettings in sgp.cpp). gs_Lang (used only
by Loc::Translate for the Polish/Russian byte remap on raw .edt exports) is
now derived from g_lang via ToLocLanguage, so the export always matches
whatever language is actually active instead of a compile-time pick.
-
Editor/popupmenu.cpp and Strategic/Scheduling.cpp kept their own
call-site extern of gszScheduleActions as CHAR16[NUM_SCHEDULE_ACTIONS][20]
after the real definition changed into a rebindable pointer
(CHAR16 (*)[20], LanguageStrings.cpp). MSVC decays the outer array
dimension when mangling globals, so both declarations produce the same
symbol (?gszScheduleActions@@3PAY0BE@_WA) and the mismatch linked
silently -- but the array-typed TUs then indexed the 4-byte pointer
slot itself as string data, so the editor schedule popup and the map
schedule message text read garbage.
-
add text.def to be single-source of truth on symbol names and use it
.much simpler, less error prone if adding more strings
-
add pseudo interface for language state. MAX_SAGES_ON_BOTTOM must always
change in lockstep with g_lang. this isn't foolproof but better
---------
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>
64 lines
2.0 KiB
C++
64 lines
2.0 KiB
C++
#include <language.hpp>
|
|
#include "DEBUG.H"
|
|
|
|
namespace {
|
|
// Cn+4 retired the per-exe ENGLISH/GERMAN/... compile definitions along with the CMake
|
|
// language axis, so the build default is now a fixed constant; the ini key (below)
|
|
// overrides it at runtime via g_lang/BindLanguageStrings.
|
|
constexpr i18n::Lang kBuildDefaultLang = i18n::Lang::en;
|
|
|
|
auto RowsForLang(i18n::Lang lang) -> int {
|
|
return lang == i18n::Lang::zh ? 6 : 9;
|
|
}
|
|
}
|
|
|
|
/* g_lang used to be a compile-time const picked by the ENGLISH/GERMAN/...
|
|
* define; it is now a runtime value that starts at the build's default and
|
|
* can be overridden at startup from the [Ja2 Settings] LANGUAGE ini key (see
|
|
* SetLanguageFromName / sgp.cpp GetRuntimeSettings). */
|
|
i18n::Lang g_lang = kBuildDefaultLang;
|
|
|
|
int MAX_MESSAGES_ON_MAP_BOTTOM = RowsForLang(g_lang);
|
|
|
|
auto ApplyLang(i18n::Lang lang = kBuildDefaultLang ) {
|
|
MAX_MESSAGES_ON_MAP_BOTTOM = RowsForLang(lang);
|
|
g_lang = lang;
|
|
}
|
|
|
|
auto SetLanguageFromName(std::string const& name) -> void {
|
|
static const struct { const STR name; i18n::Lang lang; } table[] = {
|
|
{ "ENGLISH", i18n::Lang::en },
|
|
{ "GERMAN", i18n::Lang::de },
|
|
{ "RUSSIAN", i18n::Lang::ru },
|
|
{ "DUTCH", i18n::Lang::nl },
|
|
{ "POLISH", i18n::Lang::pl },
|
|
{ "FRENCH", i18n::Lang::fr },
|
|
{ "ITALIAN", i18n::Lang::it },
|
|
{ "CHINESE", i18n::Lang::zh },
|
|
};
|
|
|
|
for (auto const& entry : table) {
|
|
if (_stricmp(name.c_str(), entry.name) == 0) {
|
|
ApplyLang(entry.lang);
|
|
return;
|
|
}
|
|
}
|
|
|
|
ApplyLang();
|
|
FastDebugMsg(String("SetLanguageFromName: unknown LANGUAGE value '%s', keeping build default", name.c_str()));
|
|
}
|
|
|
|
auto GetLanguagePrefix() -> const STR {
|
|
switch (g_lang) {
|
|
case i18n::Lang::en: return "";
|
|
case i18n::Lang::de: return "German.";
|
|
case i18n::Lang::ru: return "Russian.";
|
|
case i18n::Lang::nl: return "Dutch.";
|
|
case i18n::Lang::pl: return "Polish.";
|
|
case i18n::Lang::fr: return "French.";
|
|
case i18n::Lang::it: return "Italian.";
|
|
case i18n::Lang::zh: return "Chinese.";
|
|
}
|
|
return "";
|
|
}
|