aboutsummaryrefslogtreecommitdiff
path: root/core/translation.cpp
diff options
context:
space:
mode:
authorJuan Linietsky2017-01-05 09:16:00 -0300
committerJuan Linietsky2017-01-05 09:16:00 -0300
commit0f7af4ea51744cda23c4d3c7481f9c332973d1d4 (patch)
tree27b8914062558b5648655ccf3db13251d217af98 /core/translation.cpp
parent9e477babb3bf0ce5179395c2a5155a3f3cd36798 (diff)
downloadgodot-0f7af4ea51744cda23c4d3c7481f9c332973d1d4.tar.gz
godot-0f7af4ea51744cda23c4d3c7481f9c332973d1d4.tar.zst
godot-0f7af4ea51744cda23c4d3c7481f9c332973d1d4.zip
Diffstat (limited to 'core/translation.cpp')
-rw-r--r--core/translation.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/translation.cpp b/core/translation.cpp
index 9ac1d6a31..8e58b4556 100644
--- a/core/translation.cpp
+++ b/core/translation.cpp
@@ -1047,8 +1047,8 @@ TranslationServer *TranslationServer::singleton=NULL;
bool TranslationServer::_load_translations(const String& p_from) {
- if (Globals::get_singleton()->has(p_from)) {
- DVector<String> translations=Globals::get_singleton()->get(p_from);
+ if (GlobalConfig::get_singleton()->has(p_from)) {
+ DVector<String> translations=GlobalConfig::get_singleton()->get(p_from);
int tcount=translations.size();
@@ -1089,7 +1089,7 @@ void TranslationServer::setup() {
options+=locale_list[idx];
idx++;
}
- Globals::get_singleton()->set_custom_property_info("locale/fallback",PropertyInfo(Variant::STRING,"locale/fallback",PROPERTY_HINT_ENUM,options));
+ GlobalConfig::get_singleton()->set_custom_property_info("locale/fallback",PropertyInfo(Variant::STRING,"locale/fallback",PROPERTY_HINT_ENUM,options));
}
#endif
//load translations