Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 11:32:13 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #97923 from kisg/translation_server_siof_fix

Browse Source 
Make TranslationServer singleton variable inline.
This commit is contained in:
Thaddeus Crews 2024-11-12 12:13:01 -06:00
commit ebf49317a2
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/string/translation_server.cpp
View File

@ -411,8 +411,6 @@ StringName TranslationServer::translate_plural(const StringName &p_message, cons
return main_domain->translate_plural(p_message, p_message_plural, p_n, p_context);
}
TranslationServer *TranslationServer::singleton = nullptr;
bool TranslationServer::_load_translations(const String &p_from) {
if (ProjectSettings::get_singleton()->has_setting(p_from)) {
const Vector<String> &translation_names = GLOBAL_GET(p_from);

2
core/string/translation_server.h
View File

@ -50,7 +50,7 @@ class TranslationServer : public Object {
bool enabled = true;
static TranslationServer *singleton;
static inline TranslationServer *singleton = nullptr;
bool _load_translations(const String &p_from);
String _standardize_locale(const String &p_locale, bool p_add_defaults) const;