Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 22:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #112073 from timothyqiu/make-csv-great-again

Browse source 
Improve CSV translations
This commit is contained in:
Thaddeus Crews 2025-10-27 10:01:50 -05:00
commit 5a257a904a
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
5 changed files with 218 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

20
core/string/optimized_translation.cpp
View file

@ -314,10 +314,24 @@ StringName OptimizedTranslation::get_plural_message(const StringName &p_src_text
return get_message(p_src_text, p_context);
}
Vector<String> OptimizedTranslation::_get_message_list() const {
WARN_PRINT_ONCE("OptimizedTranslation does not store the message texts to be translated.");
return {};
}
void OptimizedTranslation::get_message_list(List<StringName> *r_messages) const {
WARN_PRINT_ONCE("OptimizedTranslation does not store the message texts to be translated.");
}
int OptimizedTranslation::get_message_count() const {
WARN_PRINT_ONCE("OptimizedTranslation does not store the message texts to be translated.");
return 0;
}
void OptimizedTranslation::_get_property_list(List<PropertyInfo> *p_list) const {
p_list->push_back(PropertyInfo(Variant::PACKED_INT32_ARRAY, "hash_table"));
p_list->push_back(PropertyInfo(Variant::PACKED_INT32_ARRAY, "bucket_table"));
p_list->push_back(PropertyInfo(Variant::PACKED_BYTE_ARRAY, "strings"));
p_list->push_back(PropertyInfo(Variant::PACKED_INT32_ARRAY, "hash_table", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR));
p_list->push_back(PropertyInfo(Variant::PACKED_INT32_ARRAY, "bucket_table", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR));
p_list->push_back(PropertyInfo(Variant::PACKED_BYTE_ARRAY, "strings", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR));
p_list->push_back(PropertyInfo(Variant::OBJECT, "load_from", PROPERTY_HINT_RESOURCE_TYPE, "Translation", PROPERTY_USAGE_EDITOR));
}

27
core/string/optimized_translation.h
View file

@ -35,23 +35,35 @@
class OptimizedTranslation : public Translation {
GDCLASS(OptimizedTranslation, Translation);
//this translation uses a sort of modified perfect hash algorithm
//it requires hashing strings twice and then does a binary search,
//so it's slower, but at the same time it has an extremely high chance
//of catching untranslated strings
// This translation uses a sort of modified perfect hash algorithm
// it requires hashing strings twice and then does a binary search,
// so it's slower, but at the same time it has an extremely high chance
// of catching untranslated strings.
//load/store friendly types
// `hash_table[hash(0, text)]` produces a `bucket_table` index or 0xFFFFFFFF if not found.
Vector<int> hash_table;
// Continuous `Bucket`s in a flat layout.
Vector<int> bucket_table;
// Data for translated strings, UTF-8 encoded, either compressed or uncompressed.
Vector<uint8_t> strings;
struct Bucket {
// Number of `Elem` objects at `elem`.
int size;
// Use `hash(func, text)` to generate the unique `Elem::key` in this bucket.
uint32_t func;
struct Elem {
// Unique key for the text.
uint32_t key;
// Used to index into `strings`.
uint32_t str_offset;
// The string is not compressed if `comp_size` equals `uncomp_size`.
uint32_t comp_size;
uint32_t uncomp_size;
};
@ -71,6 +83,8 @@ class OptimizedTranslation : public Translation {
return d;
}
virtual Vector<String> _get_message_list() const override;
protected:
bool _set(const StringName &p_name, const Variant &p_value);
bool _get(const StringName &p_name, Variant &r_ret) const;
@ -83,5 +97,8 @@ public:
virtual Vector<String> get_translated_message_list() const override;
void generate(const Ref<Translation> &p_from);
virtual void get_message_list(List<StringName> *r_messages) const override;
virtual int get_message_count() const override;
OptimizedTranslation() {}
};