amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat: restore locale level translations for other packages (fixes #41)

Browse Source 
This is only a partial fix though, it basically restores the old behavior as a default. That doesn't help though with flipping the definitions to get stuff out of the UI Locale file though. So that'll have to come next for allowing wildcard resolutions to be done from the game(?) or maybe locale extension files?
This commit is contained in:
Brendan Hagan
2022-08-02 21:10:19 -04:00
parent d72c7ff7e6
commit e0d9e84740
5 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/field.cpp
+17 -14
View File
@@ -48,7 +48,7 @@ IMPLEMENT_REFLECTION(Field) {
}
REFLECT(name);
REFLECT_LOCALIZED(caption);
REFLECT_LOCALIZED(description);
REFLECT_LOCALIZED(description); // FIXME: This field is both unused and uninitialized.
REFLECT_N("icon", icon_filename);
REFLECT(editable);
REFLECT(save_value);
@@ -65,32 +65,35 @@ IMPLEMENT_REFLECTION(Field) {
}
void Field::after_reading(Version ver) {
name = canonical_name_form(name);
if(caption.default_.empty()) caption.default_ = name_to_caption(name);
if(card_list_name.default_.empty()) card_list_name.default_ = capitalize(caption.default_);
name = canonical_name_form(name);
if(caption.default_.empty()) caption.default_ = tr(package_relative_filename, name, name_to_caption);
if(card_list_name.default_.empty()) card_list_name.default_ = tr(package_relative_filename, caption.default_, capitalize);
}
template <>
intrusive_ptr<Field> read_new<Field>(Reader& reader) {
intrusive_ptr<Field> field;
// there must be a type specified
String type;
reader.handle(_("type"), type);
if (type == _("text")) return make_intrusive<TextField>();
else if (type == _("choice")) return make_intrusive<ChoiceField>();
else if (type == _("multiple choice")) return make_intrusive<MultipleChoiceField>();
else if (type == _("boolean")) return make_intrusive<BooleanField>();
else if (type == _("image")) return make_intrusive<ImageField>();
else if (type == _("symbol")) return make_intrusive<SymbolField>();
else if (type == _("color")) return make_intrusive<ColorField>();
else if (type == _("info")) return make_intrusive<InfoField>();
else if (type == _("package choice")) return make_intrusive<PackageChoiceField>();
if (type == _("text")) field = make_intrusive<TextField>();
else if (type == _("choice")) field = make_intrusive<ChoiceField>();
else if (type == _("multiple choice")) field = make_intrusive<MultipleChoiceField>();
else if (type == _("boolean")) field = make_intrusive<BooleanField>();
else if (type == _("image")) field = make_intrusive<ImageField>();
else if (type == _("symbol")) field = make_intrusive<SymbolField>();
else if (type == _("color")) field = make_intrusive<ColorField>();
else if (type == _("info")) field = make_intrusive<InfoField>();
else if (type == _("package choice")) field = make_intrusive<PackageChoiceField>();
else if (type.empty()) {
reader.warning(_ERROR_1_("expected key", _("type")));
throw ParseError(_ERROR_("aborting parsing"));
} else {
reader.warning(_ERROR_1_("unsupported field type", type));
throw ParseError(_ERROR_("aborting parsing"));
}
}
field->package_relative_filename = reader.getPackage()->relativeFilename().Clone();
return field;
}
// ----------------------------------------------------------------------------- : Style