diff options
| author | kobewi <kobewi4e@gmail.com> | 2022-08-08 00:52:20 +0200 |
|---|---|---|
| committer | kobewi <kobewi4e@gmail.com> | 2022-08-24 12:53:36 +0200 |
| commit | f7f4873ed08d6b465c8108f7ce0c1cb76f9caf2f (patch) | |
| tree | f5644c01ab66109f8f342d784c3a38240aa295ef /core/string | |
| parent | 0626ce50cfd35d1eb81c6c9627f8540be9636b4b (diff) | |
Replace Array return types with TypedArray 3
Diffstat (limited to 'core/string')
| -rw-r--r-- | core/string/translation.cpp | 8 | ||||
| -rw-r--r-- | core/string/translation.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/string/translation.cpp b/core/string/translation.cpp index b83b7c786f..4748f1a0cb 100644 --- a/core/string/translation.cpp +++ b/core/string/translation.cpp @@ -70,7 +70,7 @@ void Translation::_set_messages(const Dictionary &p_messages) { void Translation::set_locale(const String &p_locale) { locale = TranslationServer::get_singleton()->standardize_locale(p_locale); - if (OS::get_singleton()->get_main_loop() && TranslationServer::get_singleton()->get_loaded_locales().has(this)) { + if (OS::get_singleton()->get_main_loop() && TranslationServer::get_singleton()->get_loaded_locales().has(get_locale())) { OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_TRANSLATION_CHANGED); } } @@ -505,11 +505,11 @@ String TranslationServer::get_locale() const { return locale; } -Array TranslationServer::get_loaded_locales() const { - Array locales; +PackedStringArray TranslationServer::get_loaded_locales() const { + PackedStringArray locales; for (const Ref<Translation> &E : translations) { const Ref<Translation> &t = E; - ERR_FAIL_COND_V(t.is_null(), Array()); + ERR_FAIL_COND_V(t.is_null(), PackedStringArray()); String l = t->get_locale(); locales.push_back(l); diff --git a/core/string/translation.h b/core/string/translation.h index 20c6ebd5a5..3f97a8d4fc 100644 --- a/core/string/translation.h +++ b/core/string/translation.h @@ -145,7 +145,7 @@ public: String get_locale_name(const String &p_locale) const; - Array get_loaded_locales() const; + PackedStringArray get_loaded_locales() const; void add_translation(const Ref<Translation> &p_translation); void remove_translation(const Ref<Translation> &p_translation); |