diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-18 15:58:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-18 15:58:31 +0100 |
| commit | 5c2fe970b87f8e95306bad0f713567a150b1e442 (patch) | |
| tree | 206f18b3f17f5c68b664ba008f2403275b1fd583 /core/string/translation.cpp | |
| parent | 8eaea1db5336cab62cf469c9860f18d69b4be929 (diff) | |
| parent | 64140eaf4254a9d2e1fcd87451560f13959f1d24 (diff) | |
Merge pull request #46127 from reduz/reorganize-project-settings
Reorganize Project Settings
Diffstat (limited to 'core/string/translation.cpp')
| -rw-r--r-- | core/string/translation.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/string/translation.cpp b/core/string/translation.cpp index 5337d46aa3..0901944360 100644 --- a/core/string/translation.cpp +++ b/core/string/translation.cpp @@ -1191,14 +1191,14 @@ bool TranslationServer::_load_translations(const String &p_from) { } void TranslationServer::setup() { - String test = GLOBAL_DEF("locale/test", ""); + String test = GLOBAL_DEF("internationalization/locale/test", ""); test = test.strip_edges(); if (test != "") { set_locale(test); } else { set_locale(OS::get_singleton()->get_locale()); } - fallback = GLOBAL_DEF("locale/fallback", "en"); + fallback = GLOBAL_DEF("internationalization/locale/fallback", "en"); #ifdef TOOLS_ENABLED { String options = ""; @@ -1210,7 +1210,7 @@ void TranslationServer::setup() { options += locale_list[idx]; idx++; } - ProjectSettings::get_singleton()->set_custom_property_info("locale/fallback", PropertyInfo(Variant::STRING, "locale/fallback", PROPERTY_HINT_ENUM, options)); + ProjectSettings::get_singleton()->set_custom_property_info("internationalization/locale/fallback", PropertyInfo(Variant::STRING, "internationalization/locale/fallback", PROPERTY_HINT_ENUM, options)); } #endif } @@ -1307,11 +1307,11 @@ void TranslationServer::_bind_methods() { void TranslationServer::load_translations() { String locale = get_locale(); - _load_translations("locale/translations"); //all - _load_translations("locale/translations_" + locale.substr(0, 2)); + _load_translations("internationalization/locale/translations"); //all + _load_translations("internationalization/locale/translations_" + locale.substr(0, 2)); if (locale.substr(0, 2) != locale) { - _load_translations("locale/translations_" + locale); + _load_translations("internationalization/locale/translations_" + locale); } } |